summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/git
Commit message (Collapse)AuthorAgeFilesLines
* Bump to JGit 4.0.0Luca Milanesio2015-06-121-2/+2
| | | | | JGit 4.0.0 fixes a memory leak but introduces a non-compatible change for closing the RevWalk: before it was release() but now is close()
* Respect repository default integration branch for new proposal ticketsJames Moger2014-09-261-0/+5
|
* Improve the error message when too many commits are pushed for a proposalJames Moger2014-09-261-6/+95
|
* Tag server-side merges when incremental push tags are enabledJames Moger2014-05-232-61/+91
|
* Ensure the repository model ref list is refreshed on ref creation or deletionJames Moger2014-05-071-0/+8
|
* [findbugs] Fix user assignment for clone permission check in repository resolverJames Moger2014-04-171-2/+1
|
* [findbugs] Null check on logging merge change in patchset receive packJames Moger2014-04-171-1/+3
|
* Organize importsJames Moger2014-04-171-3/+0
|
* Expose JGit 3.x receive pack settings as Gitblit settingsJames Moger2014-04-171-0/+11
|
* Improve ticket branch ref deletion push handlingJames Moger2014-04-141-0/+15
|
* Add PatchsetHook extensionsJames Moger2014-04-121-0/+33
|
* Allow ReceiveHook extensionsJames Moger2014-04-121-6/+45
|
* Allow specifying accepted PUSH transportsJames Moger2014-04-101-0/+46
|
* Rename & simplify SshSession->SshDaemonClientJames Moger2014-04-102-16/+15
|
* Revise SSH public key integration with AuthenticationManagerJames Moger2014-04-102-21/+3
|
* Refer to receive pack client requests as 'client'James Moger2014-04-101-9/+9
|
* Authenticate SSH upload packJames Moger2014-04-101-0/+8
|
* Move Git daemon into different packageJames Moger2014-04-106-631/+5
|
* SSHD: Add support for git pack commandsDavid Ostrovsky2014-04-102-0/+18
| | | | | | | | | | | Add git-upload-pack and git-receive-pack commands. Conflicts: src/main/java/com/gitblit/manager/ServicesManager.java src/main/java/com/gitblit/transport/ssh/CommandDispatcher.java src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java Change-Id: I8c057b41f1dfad6d004e6aa91f96c8c673be9be2
* 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
|
* Tweak the receive pack push permission check to be a methodJames Moger2014-03-121-1/+27
|
* DocumentationJames Moger2014-03-071-2/+1
|
* Revise push/mirror tickets branch triggeringJames Moger2014-03-063-6/+61
|
* Fire an event on received ticket branch updates to trigger reindexJames Moger2014-03-052-4/+15
| | | | | | | | 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-034-2/+1473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Do not log empty messages in the receive packJames Moger2014-02-281-2/+6
|
* Tweak info logging in GitblitReceivePack and open variable scopeJames Moger2013-12-301-7/+7
| | | | Change-Id: I11624daca0694dc1996795b31432274467f09228
* New canonical base url setting for repository urls and notificationsJames Moger2013-12-302-10/+6
| | | | Change-Id: I86a1eb61c2351d1cf3f6b3becf00f2a36d5c8ed6
* Rollback to Servlet 2.5James Moger2013-12-111-49/+0
| | | | | | | | | | | | | | | | | Combining Dagger and Servlet 3 works really well on stock Tomcat and Jetty but it is a troublesome combination on JEE containers with their own ideas on how to instantiate classes. JBoss AS 7 has been particularly nasty and it is just simpler to scaleback and stay with Servlet 2.5 than it is to fight all permuations of containers. Instead of using constructor DI, the servlets and filters each have an inject(ObjectGaph) method which is automatically called during initialization. Each servlet or filter is responsible for retrieving the required dependency from the graph. The Dagger object graph is created in the context listener and stuffed into the context as an attribute. Change-Id: Ib5714584fe73e2a6b9c6fda12af080a43356cbda
* Remove @Inject references because they confuse JEE containersJames Moger2013-12-101-2/+0
| | | | Change-Id: I2e4a8e7424e7c62d1e89ca62a91423fdf3e36ac8
* Refactor managers and authentication for federationJames Moger2013-11-291-2/+2
| | | | Change-Id: I5ff18b2768095fb14e7fbece2e756115829abbde
* Flattened IGitblitManager, GitblitManager, and GitBlit classesJames Moger2013-11-294-12/+12
| | | | Change-Id: Id6deb27306e0034898673bf5d5d76a4ed012ced6
* Serve repositories on /r in addition to /gitJames Moger2013-11-291-2/+0
| | | | Change-Id: I3cd332a6509e434d901e1b262600f4c8ce57752b
* Revised committer verification to require email addressJames Moger2013-11-291-12/+8
| | | | Change-Id: I5298c93e03099813f5713a4effd87913429aa3dc
* Refactor user services and separate authentication (issue-281)James Moger2013-11-291-5/+5
| | | | Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd
* Update unit tests for refactored architectureJames Moger2013-11-291-1/+1
| | | | Change-Id: I04639db977c515e5e1090ef8f0e1ce858820cb03
* Renamed Gitblit to GitBlit to not break existing Groovy hooksJames Moger2013-11-295-14/+14
| | | | Change-Id: Id5286ed1b9d7e92644cacf857096e6dd273c8f05
* Create a Gitblit aggregate manager delegate for git upload/receive tasksJames Moger2013-11-295-84/+38
| | | | Change-Id: I2c4a5ddf051f228c0bd949c6cd4fd44c3da81d26
* Use Dagger to inject managers into all filters and servletsJames Moger2013-11-296-63/+102
| | | | Change-Id: I9bb2cc0cbfac9841b13bed15a474fefb24355cd4
* Instantiate and register all servlets and filters from code (servlet 3)James Moger2013-11-261-0/+3
| | | | Change-Id: I6009e8e157232feab40ec275547a59e2cea23950
* Define manager interfaces and update all of Gitblit to use managersJames Moger2013-11-265-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | These manager interfaces define how the GitBlit singleton will eventually be split into smaller component managers. The Wicket app and all servlets have been updated to request the needed managers. There are _very_ few method signature changes - although there are a handful. This is a surgical sharding of responsibility based on a proof of concept refactor. Instead of random references to GittBlit.self() there are now precise references to the manager interface required to accomplish some task. Some tasks may require references to multiple managers. The code is now littered with calls to GitBlit.getManager(class) and those familiar with the code-base will no doubt notice the duplication of methods from IUserService in IUserManager and the addition of implementation methods in the GitBlit context class. When the GitBlit class is broken apart and the existing external authentication user service classes are refactored to AuthenticationService classes, this will again simplify and flatten. But in order to safely and cleanly modularize the stable code-base we will have to live with a little duplication for a short while. Change-Id: I7314ec8acaab2dcc6092785ed4434cc09fdbbe16
* Implement mirror executor (issue-5)James Moger2013-11-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | The mirror executor will fetch ref updates for repository mirrors. This feature is disabled by default and can be enabled by setting git.enableMirroring=true. The period between update checks is configurable, but it is global. An individual rpeository may not set it's own update schedule. Requirements: 1. you must manually clone the repository using native git git clone --mirror git://somewhere.com/myrepo.git 2. the "origin" remote must be the mirror source 3. the "origin" repository must be accessible without authentication OR the credentials must be embedded in the origin url (not recommended) Notes: 1. "origin" SSH urls are untested and not likely to work 2. mirrors cloned while Gitblit is running are likely to require clearing the gitblit cache (link on the repositories page of an administrator account) 3. Gitblit will automatically repair any invalid fetch refspecs with a "//" sequence. Change-Id: I4bbe3fb2df106366ae4c2313596d0fab0dfcac46
* Remove upload pack ref filteringJames Moger2013-10-251-43/+0
| | | | Change-Id: I7ffcbf00e70eea68803eb6c046d5ddca55503b8b
* Improve message logging in the receive packJames Moger2013-10-011-3/+11
| | | | Change-Id: I93dcdc72bfae0e0fac9a0f4872537a43bbd73d36
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 22:09:19 +0000