summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/git/PatchsetReceivePack.java
Commit message (Collapse)AuthorAgeFilesLines
* Tag server-side merges when incremental push tags are enabledJames Moger2014-05-231-2/+6
|
* [findbugs] Null check on logging merge change in patchset receive packJames Moger2014-04-171-1/+3
|
* Improve ticket branch ref deletion push handlingJames Moger2014-04-141-0/+15
|
* Add PatchsetHook extensionsJames Moger2014-04-121-0/+33
|
* Fix incorrect REWIND labeling in reflog on all ticket pushesJames Moger2014-04-071-5/+18
|
* Configure Tickets close-on-push commit message regex (issue-404)James Moger2014-03-311-5/+14
|
* Fix close ticket on push by commit message parsing (issue-404)James Moger2014-03-281-1/+4
|
* Merged #30 "Watch list push parameters are not always honored"James Moger2014-03-121-3/+3
|\
| * Fix TicketModel modList bug when a field was set multiple timesJames Moger2014-03-121-3/+3
| |
* | Fix watch list verification on pushJames Moger2014-03-121-3/+9
|/
* Improve logging of received patchset commandJames Moger2014-03-121-0/+2
|
* DocumentationJames Moger2014-03-071-2/+1
|
* Revise push/mirror tickets branch triggeringJames Moger2014-03-061-3/+20
|
* Fire an event on received ticket branch updates to trigger reindexJames Moger2014-03-051-4/+6
| | | | | | | | It would be useful to be able to push a complete repository with a refs/gitblit/tickets branch and have Gitblit index all those tickets. Additionally, it would be nice for the mirroring service to recognize an incoming update to this ref and fire an event that can be processed by the BranchTicketService, if so configured, to reindex the tickets.
* Ticket tracker with patchset contributionsJames Moger2014-03-031-0/+1129
A basic issue tracker styled as a hybrid of GitHub and BitBucket issues. You may attach commits to an existing ticket or you can push a single commit to create a *proposal* ticket. Tickets keep track of patchsets (one or more commits) and allow patchset rewriting (rebase, amend, squash) by detecing the non-fast-forward update and assigning a new patchset number to the new commits. Ticket tracker -------------- The ticket tracker stores tickets as an append-only journal of changes. The journals are deserialized and a ticket is built by applying the journal entries. Tickets are indexed using Apache Lucene and all queries and searches are executed against this Lucene index. There is one trade-off to this persistence design: user attributions are non-relational. What does that mean? Each journal entry stores the username of the author. If the username changes in the user service, the journal entry will not reflect that change because the values are hard-coded. Here are a few reasons/justifications for this design choice: 1. commit identifications (author, committer, tagger) are non-relational 2. maintains the KISS principle 3. your favorite text editor can still be your administration tool Persistence Choices ------------------- **FileTicketService**: stores journals on the filesystem **BranchTicketService**: stores journals on an orphan branch **RedisTicketService**: stores journals in a Redis key-value datastore It should be relatively straight-forward to develop other backends (MongoDB, etc) as long as the journal design is preserved. Pushing Commits --------------- Each push to a ticket is identified as a patchset revision. A patchset revision may add commits to the patchset (fast-forward) OR a patchset revision may rewrite history (rebase, squash, rebase+squash, or amend). Patchset authors should not be afraid to polish, revise, and rewrite their code before merging into the proposed branch. Gitblit will create one ref for each patchset. These refs are updated for fast-forward pushes or created for rewrites. They are formatted as `refs/tickets/{shard}/{id}/{patchset}`. The *shard* is the last two digits of the id. If the id < 10, prefix a 0. The *shard* is always two digits long. The shard's purpose is to ensure Gitblit doesn't exceed any filesystem directory limits for file creation. **Creating a Proposal Ticket** You may create a new change proposal ticket just by pushing a **single commit** to `refs/for/{branch}` where branch is the proposed integration branch OR `refs/for/new` or `refs/for/default` which both will use the default repository branch. git push origin HEAD:refs/for/new **Updating a Patchset** The safe way to update an existing patchset is to push to the patchset ref. git push origin HEAD:refs/heads/ticket/{id} This ensures you do not accidentally create a new patchset in the event that the patchset was updated after you last pulled. The not-so-safe way to update an existing patchset is to push using the magic ref. git push origin HEAD:refs/for/{id} This push ref will update an exisitng patchset OR create a new patchset if the update is non-fast-forward. **Rebasing, Squashing, Amending** Gitblit makes rebasing, squashing, and amending patchsets easy. Normally, pushing a non-fast-forward update would require rewind (RW+) repository permissions. Gitblit provides a magic ref which will allow ticket participants to rewrite a ticket patchset as long as the ticket is open. git push origin HEAD:refs/for/{id} Pushing changes to this ref allows the patchset authors to rebase, squash, or amend the patchset commits without requiring client-side use of the *--force* flag on push AND without requiring RW+ permission to the repository. Since each patchset is tracked with a ref it is easy to recover from accidental non-fast-forward updates. Features -------- - Ticket tracker with status changes and responsible assignments - Patchset revision scoring mechanism - Update/Rewrite patchset handling - Close-on-push detection - Server-side Merge button for simple merges - Comments with Markdown syntax support - Rich mail notifications - Voting - Mentions - Watch lists - Querying - Searches - Partial miletones support - Multiple backend options