 Ticket tracker with patchset contributions
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
10 jaren geleden |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185 |
- #
- # Gitblit project descriptor
- #
-
- # Specify minimum Moxie version required to build
- requires: 0.9.3
-
- # Project Metadata
- name: Gitblit
- description: pure Java Git solution
- groupId: com.gitblit
- artifactId: gitblit
- version: 1.6.1-SNAPSHOT
- inceptionYear: 2011
-
- # Current stable release
- releaseVersion: 1.6.0
- releaseDate: 2014-06-16
-
- # Project urls
- url: 'http://gitblit.com'
- issuesUrl: 'http://code.google.com/p/gitblit/issues/list'
- socialNetworkUrl: 'https://plus.google.com/114464678392593421684'
- forumUrl: 'http://groups.google.com/group/gitblit'
- mavenUrl: 'http://gitblit.github.io/gitblit-maven'
-
- # Licenses section included for POM generation
- licenses:
- - {
- name: Apache ASL v2.0
- url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
- }
-
- # Developers section included for POM generation
- developers:
- - {
- id: james
- name: James Moger
- url: 'https://plus.google.com/u/0/116428776452027956920'
- organization: VAS
- organizationUrl: 'http://www.vas.com'
- roles: developer
- }
-
- # SCM section included for POM generation
- scm: {
- connection: 'scm:git:git://github.com/gitblit/gitblit.git'
- developerConnection: 'scm:git:https://github.com/gitblit/gitblit.git'
- url: 'https://github.com/gitblit/gitblit'
- tag: HEAD
- }
-
- # Mainclass is used for setting jar manifests and using the mx:run target
- mainclass: com.gitblit.GitBlitServer
-
- # Moxie supports multiple source directories and allows you to assign
- # a scope to each directory.
- sourceDirectories:
- - compile 'src/main/java'
- - compile 'src/main/bugtraq'
- - compile 'src/main/dagger' apt
- - test 'src/test/java'
- - test 'src/test/bugtraq'
- # Moxie supports one site-scoped directory for mx:doc
- - site 'src/site'
-
- resourceDirectories:
- - compile 'src/main/resources'
- - site 'src/site/resources'
-
- # compile for Java 7 class format
- tasks: {
- 'mx:javac' : {
- source: 1.7
- target: 1.7
- compiler: javac1.7
- encoding: UTF-8
- # stop complaints about bootstrap classpath when compiling with Java 7
- compilerArgs: '-Xlint:-options'
- }
- }
-
- # Generate Eclipse project files.
- # Generate IntelliJ IDEA module files.
- # Generate a distribution Maven POM (not suitable for building with Maven).
- apply: eclipse, intellij, pom
-
- # Copy all retrieved dependencies to the "ext" directory.
- # Generated IDE settings (.classpath, etc) will use the artifacts
- # from this project-relative directory. This allows the IDE settings
- # to be version-controlled and shared.
- dependencyDirectory: ext
-
- # Register the Eclipse JGit Maven repositories
- registeredRepositories:
- - { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' }
- - { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' }
-
- # Source all dependencies from the following repositories in the specified order
- repositories: central, eclipse-snapshots, eclipse
-
- # Convenience properties for dependencies
- properties: {
- jetty.version : 9.1.4.v20140401
- wicket.version : 1.4.21
- lucene.version : 4.6.0
- jgit.version : 3.3.1.201403241930-r
- groovy.version : 1.8.8
- bouncycastle.version : 1.49
- selenium.version : 2.28.0
- wikitext.version : 1.4
- sshd.version: 0.11.0
- mina.version: 2.0.7
- }
-
- # Dependencies
- #
- # May be tagged with ":label" notation to group dependencies.
- #
- # "@extension" fetches the artifact with the specified extension
- # and ignores all transitive dependencies.
- #
- # "!groupId" or "!groupId:artifactId" excludes all matching transitive
- # dependencies in that dependency's dependency graph.
- #
-
- dependencies:
- # Dagger dependency injection library (annotation processor)
- - compile 'com.squareup.dagger:dagger:1.1.0' :war apt
- - compile 'com.squareup.dagger:dagger-compiler:1.1.0' :war optional apt
- # Standard dependencies
- - compile 'com.intellij:annotations:12.0' :war
- - compile 'log4j:log4j:1.2.17' :war :fedclient :authority
- - compile 'org.slf4j:slf4j-api:1.7.5' :war :fedclient :authority
- - compile 'org.slf4j:slf4j-log4j12:1.7.5' :war :fedclient :authority
- - compile 'com.sun.mail:javax.mail:1.5.1' :war :authority
- - compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
- - compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
- - compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
- - compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito
- - compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
- - compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
- - compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
- - compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
- - compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
- - compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
- - compile 'org.pegdown:pegdown:1.4.2' :war
- - compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
- - compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war
- - compile 'org.fusesource.wikitext:textile-core:${wikitext.version}' :war
- - compile 'org.fusesource.wikitext:tracwiki-core:${wikitext.version}' :war
- - compile 'org.fusesource.wikitext:mediawiki-core:${wikitext.version}' :war
- - compile 'org.fusesource.wikitext:confluence-core:${wikitext.version}' :war
- - compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority !junit
- - compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority !junit
- - compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
- - compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
- - compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority
- - compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock
- - compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock
- - compile 'rome:rome:0.9' :war :manager :api
- - compile 'com.google.code.gson:gson:1.7.2' :war :fedclient :manager :api
- - compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war
- - compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war
- - compile 'org.apache.ivy:ivy:2.2.0' :war
- - compile 'com.toedter:jcalendar:1.3.2' :authority
- - compile 'org.apache.commons:commons-compress:1.4.1' :war
- - compile 'commons-io:commons-io:2.2' :war
- - compile 'com.force.api:force-partner-api:24.0.0' :war
- - compile 'org.freemarker:freemarker:2.3.19' :war
- - compile 'com.github.dblock.waffle:waffle-jna:1.5' :war
- - compile 'org.kohsuke:libpam4j:1.7' :war
- - compile 'args4j:args4j:2.0.26' :war :fedclient :authority
- - compile 'commons-codec:commons-codec:1.7' :war
- - compile 'redis.clients:jedis:2.3.1' :war
- - compile 'ro.fortsoft.pf4j:pf4j:0.8.0' :war
- - compile 'org.apache.tika:tika-core:1.5' :war
- - test 'junit'
- # Dependencies for Selenium web page testing
- - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
- - test 'org.seleniumhq.selenium:selenium-support:${selenium.version}' @jar
- - test 'org.seleniumhq.selenium:selenium-firefox-driver:${selenium.version}'
- # Dependencies with the "build" scope are retrieved
- # and injected into the Ant runtime classpath
- - build 'jacoco'
|
