]> source.dussan.org Git - jgit.git/log
jgit.git
13 years agoInclude about.html files in maven build 94/3694/1
Matthias Sohn [Wed, 8 Jun 2011 20:42:20 +0000 (22:42 +0200)]
Include about.html files in maven build

Change-Id: Ifa96090eb0fc336ee8080385f48212b5158dd9f7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoPrepare post v1.0.0.201106081625-r builds 93/3693/1
Matthias Sohn [Thu, 9 Jun 2011 09:06:05 +0000 (11:06 +0200)]
Prepare post v1.0.0.201106081625-r builds

Change-Id: I5e6994844405f7839ad3b3439f98bcadb59d329b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoJGit v1.0.0.201106081625-r 89/3689/1 v1.0.0.201106081625-r
Matthias Sohn [Wed, 8 Jun 2011 20:42:20 +0000 (22:42 +0200)]
JGit v1.0.0.201106081625-r

Change-Id: I629990189083bab4737938ad712080fba7917582
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoAdd missing about.html files to all shipped bundles 85/3685/2
Matthias Sohn [Wed, 8 Jun 2011 19:51:51 +0000 (21:51 +0200)]
Add missing about.html files to all shipped bundles

Change-Id: I5a4ad9493da3816f21d9fdd0b5b977388d074500
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoPrepare post v1.0.0.201106071701-r builds 84/3684/1
Matthias Sohn [Wed, 8 Jun 2011 14:30:59 +0000 (16:30 +0200)]
Prepare post v1.0.0.201106071701-r builds

Change-Id: I67ee2912ef54462cf860dc4ec0a6334e9c619384
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoJGit v1.0.0.201106071701-r 76/3676/1 v1.0.0.201106071701-r
Matthias Sohn [Tue, 7 Jun 2011 21:04:55 +0000 (23:04 +0200)]
JGit v1.0.0.201106071701-r

Change-Id: Ic8f49336ba96c8dcf4bab2f74c0f1efc1ab55131
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoPrepare post v1.0.0.201106051725-r builds 51/3651/1
Matthias Sohn [Sun, 5 Jun 2011 23:17:16 +0000 (01:17 +0200)]
Prepare post v1.0.0.201106051725-r builds

Change-Id: I4839877e1a6fa7782f37423213af8d579727a494
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoJGit v1.0.0.201106051725-r 49/3649/1 v1.0.0.201106051725-r
Matthias Sohn [Sun, 5 Jun 2011 21:26:56 +0000 (23:26 +0200)]
JGit v1.0.0.201106051725-r

Change-Id: I39f4a23cf284505395d511dfedf02b7f5608df95
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoUpdate to eclipse.org's latest SUA 32/3632/2
Matthias Sohn [Thu, 2 Jun 2011 20:53:11 +0000 (22:53 +0200)]
Update to eclipse.org's latest SUA

Change-Id: I0d016ddaed85656c2e680d0bc99829c6ea13b968
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoPrepare post v1.0.0.201106011211-rc3 builds 19/3619/1
Matthias Sohn [Wed, 1 Jun 2011 16:55:11 +0000 (18:55 +0200)]
Prepare post v1.0.0.201106011211-rc3 builds

Change-Id: I4dec8eba7e35858aef65fcc10f91fad3fe5b52b9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoJGit v1.0.0.201106011211-rc3 18/3618/1 v1.0.0.201106011211-rc3
Matthias Sohn [Wed, 1 Jun 2011 16:22:44 +0000 (18:22 +0200)]
JGit v1.0.0.201106011211-rc3

Change-Id: I574a05200471c431b3a02ac6ff208dc6aa90f539
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoRemove incubation marker 99/3599/1
Matthias Sohn [Tue, 31 May 2011 20:53:53 +0000 (22:53 +0200)]
Remove incubation marker

Change-Id: I6018ce0cd3b7c8137e137848fe1f04551b257538
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoblame: Compute the origin of lines in a result file 97/3597/1
Shawn O. Pearce [Fri, 27 May 2011 22:27:17 +0000 (15:27 -0700)]
blame: Compute the origin of lines in a result file

BlameGenerator digs through history and discovers the origin of each
line of some result file.  BlameResult consumes the stream of regions
created by the generator and lays them out in a table for applications
to display alongside of source lines.

Applications may optionally push in the working tree copy of a file
using the push(String, byte[]) method, allowing the application to
receive accurate line annotations for the working tree version.  Lines
that are uncommitted (difference between HEAD and working tree) will
show up with the description given by the application as the author,
or "Not Committed Yet" as a default string.

Applications may also run the BlameGenerator in reverse mode using the
reverse(AnyObjectId, AnyObjectId) method instead of push().  When
running in the reverse mode the generator annotates lines by the
commit they are removed in, rather than the commit they were added in.
This allows a user to discover where a line disappeared from when they
are looking at an older revision in the repository.  For example:

  blame --reverse 16e810b2..master -L 1080, org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
           (                                              1080)   }
  2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1081)
  2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1082)   /**
  2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1083)    * Kick the timestamp of a local file.

Above we learn that line 1080 (a closing curly brace of the prior
method) still exists in branch master, but the Javadoc comment below
it has been removed by Christian Halstrick on May 20th as part of
commit 2302a6d3.  This result differs considerably from that of C
Git's blame --reverse feature.  JGit tells the reader which commit
performed the delete, while C Git tells the reader the last commit
that still contained the line, leaving it an exercise to the reader
to discover the descendant that performed the removal.

This is still only a basic implementation.  Quite notably it is
missing support for the smart block copy/move detection that the C
implementation of `git blame` is well known for.  Despite being
incremental, the BlameGenerator can only be run once.  After the
generator runs it cannot be reused.  A better implementation would
support applications browsing through history efficiently.

In regards to CQ 5110, only a little of the original code survives.

CQ: 5110
Bug: 306161
Change-Id: I84b8ea4838bb7d25f4fcdd540547884704661b8f
Signed-off-by: Kevin Sawicki <kevin@github.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoDHT: Support removing a repository name 92/3592/1
Shawn O. Pearce [Fri, 27 May 2011 00:25:59 +0000 (17:25 -0700)]
DHT: Support removing a repository name

The first step to deleting a repository from the DHT storage is to
remove the name binding in the RepositoryIndexTable, making the
repository unavailable for lookup.

Change-Id: I469bf92f4bf2f555a15949569b21937c14cb142b
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoDHT: Fix thread-safety issue in AbstractWriteBuffer 91/3591/1
Shawn O. Pearce [Fri, 27 May 2011 00:19:30 +0000 (17:19 -0700)]
DHT: Fix thread-safety issue in AbstractWriteBuffer

There is a data corruption issue with the 'running' list if a
background thread schedules something onto the buffer while the
application thread is also using it.

Change-Id: I5ba78b98b6632965d677a9c8f209f0cf8320cc3d
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agojgit.sh: Implement pager support 90/3590/1
Shawn O. Pearce [Sun, 29 May 2011 20:05:03 +0000 (13:05 -0700)]
jgit.sh: Implement pager support

If the command is either `diff` or `log`, there is often a lot of
lines of output. Run these commands through $GIT_PAGER, $PAGER, or
`less` in order to make it easier to browse the output on a terminal.

Change-Id: I18b87ea4acf404b94788f2ac2101812bd13e6a0f
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoChange EditList to extend ArrayList 89/3589/1
Shawn O. Pearce [Sun, 29 May 2011 19:24:27 +0000 (12:24 -0700)]
Change EditList to extend ArrayList

There is no reason for this type to contain an ArrayList and try to
hide the implementation. It only slows down execution by adding an
extra layer of method dispatch to each invocation.

Instead subclass from ArrayList.

Change-Id: Ifbb9c7060c2fe3d5a7397c1aa85fbade14088637
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoEnsure the HTTP request is fully consumed 88/3588/1
Shawn O. Pearce [Fri, 27 May 2011 19:04:19 +0000 (12:04 -0700)]
Ensure the HTTP request is fully consumed

Some servlet containers require the servlet to read the EOF marker
from the input stream before a response can be output if the stream
is using "Transfer-Encoding: chunked"... which is typical for any
sort of large push to a repository over smart HTTP.

Ensure the EOF is always read by the PackParser when it is handling
the stream, and fail fast if there is more data present than expected
since this does indicate a protocol error.

Also ensure the EOF is read by UploadPack before it starts to output
a partial response using packing progress meters.

Change-Id: I131db9dea20b2324cb7c3272a814f21296bc64bd
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoMake sure test repositories are closed 87/3587/1
Christian Halstrick [Tue, 24 May 2011 07:36:45 +0000 (09:36 +0200)]
Make sure test repositories are closed

Some repositories created during tests are not added to the 'toClose'
list in LocalDiskRepositoryTestCase. Therefore when the tests end
we may have open FileHandles and on Windows this may cause the
tests to fail because we can't delete those files.

This is fixed by adding the possibility to explicitly add
repositories to the list of repos which are closed automatically.

Change-Id: I1261baeef4c7d9aaedd7c34b546393bfa005bbcc
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
13 years agoFix CloneCommand not to fetch into remote tracking branches when bare 86/3586/1
Christian Halstrick [Mon, 23 May 2011 22:45:21 +0000 (00:45 +0200)]
Fix CloneCommand not to fetch into remote tracking branches when bare

When cloning into a bare repository we should not create remote
tracking branches (e.g refs/remotes/origin/testX). Branches of the
remote repository should but fetched into into branches of the same
name (e.g refs/heads/testX). Also add the noCheckout option which
would prevent checkout after fetch.

Change-Id: I5d4cc0389f3f30c53aa0065f38119af2a1430909
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
13 years agoMerge 'Fix usage of FileSnapshot in RefDirectory' into stable-1.0 84/3584/1
Shawn O. Pearce [Tue, 31 May 2011 15:33:57 +0000 (08:33 -0700)]
Merge 'Fix usage of FileSnapshot in RefDirectory' into stable-1.0

* commit '475461d05266fe13b05bc2c6645b9ef928521b4c':
  Fix usage of FileSnapshot in RefDirectory

Change-Id: Ie65bd8b36f4c6a91602a94e9b54a04a4fb335897

13 years agoFix usage of FileSnapshot in RefDirectory 81/3581/1
Christian Halstrick [Mon, 30 May 2011 22:22:40 +0000 (00:22 +0200)]
Fix usage of FileSnapshot in RefDirectory

RefDirectory was not using FileSnapshot correctly in all places. This
is fixed with this commit. Additionally the constructors for the
different types of refs have been changed to take a FileSnapshot
instead of a modification time.

Change-Id: Ifb6a59e87e8b058a398c38cdfb9d648f0bad4bf8
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
13 years agoUpdate Eclipse IP log for 1.0 33/3533/1
Matthias Sohn [Wed, 25 May 2011 18:12:21 +0000 (20:12 +0200)]
Update Eclipse IP log for 1.0

CQ "4876" is jgit's CQ for usage of protobuf, CQ "5135"
is the corresponding Orbit CQ.

Change-Id: I300cf2b5758c7da9c18494325f2f38bb3744e459
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoMerge "Use the stored password instead of prompting for it all the time"
Matthias Sohn [Wed, 25 May 2011 16:08:17 +0000 (12:08 -0400)]
Merge "Use the stored password instead of prompting for it all the time"

13 years agoDHT: Add sequence RefData 21/3521/3
Shawn O. Pearce [Fri, 13 May 2011 16:16:58 +0000 (09:16 -0700)]
DHT: Add sequence RefData

RefData now uses a sequence number as part of the field, ensuring
that updates always increase the sequence number by one whenever
a reference is modified.

Attaching a sequence number to RefData will help with storing
reference log entries during updates. As the sequence number should
be unique within the reference name space, log entries can be keyed
by the sequence number and remain unique.  Making this work over
reference delete-create cycles will require an additional RefTable
API to return the oldest sequence number previously used in the
reference log to seed the recreated reference.

Change-Id: I11cfff2a96ef962e57f29925a3eef41bdbf9f9bb
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoDHT: Replace TinyProtobuf with Google Protocol Buffers 45/3345/7
Shawn O. Pearce [Fri, 13 May 2011 14:44:42 +0000 (07:44 -0700)]
DHT: Replace TinyProtobuf with Google Protocol Buffers

The standard Google distribution of Protocol Buffers in Java is better
maintained than TinyProtobuf, and should be faster for most uses.  It
does use slightly more memory due to many of our key types being
stored as strings in protobuf messages, but this is probably worth the
small hit to memory in exchange for better maintained code that is
easier to reuse in other applications.

Exposing all of our data members to the underlying implementation
makes it easier to develop reporting and data mining tools, or to
expand out a nested structure like RefData into a flat format in a SQL
database table.

Since the C++ `protoc` tool is necessary to convert the protobuf
script into Java code, the generated files are committed as part of
the source repository to make it easier for developers who do not have
this tool installed to still build the overall JGit package and make
use of it.  Reviewers will need to be careful to ensure that any edits
made to a *.proto file come in a commit that also updates the
generated code to match.

CQ: 5135
Change-Id: I53e11e82c186b9cf0d7b368e0276519e6a0b2893
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoDHT: Remove per-process ChunkCache 41/3341/4
Shawn O. Pearce [Thu, 5 May 2011 18:18:54 +0000 (11:18 -0700)]
DHT: Remove per-process ChunkCache

Performance testing has indicated the per-process ChunkCache isn't
very effective for the DHT storage implementation.  If a server is
using the DHT storage backend, it is most likely part of a larger
cluster where requests are distributed in a round-robin fashion
between the member servers.

In such a scenario there is insufficient data locality between
requests to get a good hit ratio on the per-process ChunkCache.  A low
hit ratio means the cache is actually hurting performance by eating up
memory that could otherwise be used for transient request data, and
increasing pressure on the GC when it needs to find free space.

Remove all of the ChunkCache code.  Installations that want to cache
(to reduce database usage) should wrap their Database with a
CacheDatabase and use a network based CacheServer.

I left the ChunkCache in the original DHT storage commit because I
wanted to document in the history of the project that its probably
worth *not* having, but leave open a door for someone to revert this
change if they find otherwise at a later date.

Change-Id: I364d0725c46c5a19f7443642a40c89ba4d3fdd29
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge "Let RefDirectory use FileSnapShot to handle fast updates"
Chris Aniszczyk [Wed, 25 May 2011 13:46:49 +0000 (09:46 -0400)]
Merge "Let RefDirectory use FileSnapShot to handle fast updates"

13 years agoAdd a DiffFormatter which calculates a patch-id 86/3486/4
Stefan Lay [Tue, 24 May 2011 08:38:59 +0000 (01:38 -0700)]
Add a DiffFormatter which calculates a patch-id

Adds a class which can be used to calculates a SHA1 of the diff
associated with a patch, similar to git patch-id.

In this version whitespace is not ignored.

Change-Id: I421d15ea905e23df543082786786841cbe3ef10d
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd CleanCommandTest and fix CleanCommand 17/3517/5
Abhishek Bhatnagar [Tue, 24 May 2011 18:45:05 +0000 (14:45 -0400)]
Add CleanCommandTest and fix CleanCommand

Bug: 334767
Change-Id: I0a836451ceb668f943b1f353dc65420157810b23
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd CleanCommand to JGit API 84/3484/6
Abhishek Bhatnagar [Fri, 20 May 2011 16:01:37 +0000 (12:01 -0400)]
Add CleanCommand to JGit API

Bug: 334767
Change-Id: I2650c77bc4af2d8f401bbcce5384b44ff2a64ba2
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoUse the stored password instead of prompting for it all the time 22/2722/4
Carsten Pfeiffer [Mon, 23 May 2011 22:17:01 +0000 (00:17 +0200)]
Use the stored password instead of prompting for it all the time

EGit change Iba3b87293c22e5fe7d989fc312184aa7463c4387 is also required
to make this work for EGit.

Change-Id: Iedc80e133e66d72e78ff0980b6e12634f75eca36
Signed-off-by: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoLet RefDirectory use FileSnapShot to handle fast updates 81/3481/3
Christian Halstrick [Fri, 20 May 2011 09:18:20 +0000 (11:18 +0200)]
Let RefDirectory use FileSnapShot to handle fast updates

Since this change may affect performance and memory consumption on every
access to a loose ref I explicitly made it a RFC to collect opinions.

Previously RefDirectory.scanRef() was not detecting an update of a
loose ref when the update didn't changed the modification time of
the backing file. RefDirectory cached loose refs and the way to detect
outdated cache entries was to compare lastmodification timestamp on the
file representing the ref. If two updates to the same ref happen faster
than the filesystem-timer granularity (for linux this is 2 seconds)
there is the possiblity that we don't detect the update.

Because of this bug EGit's PushOperationTest only works with 2 second
sleeps inside.

This change let RefDirectory use FileSnapshot to detect such situations.
FileSnapshot helps to remember when a file was last read from disk and
therefore enables to decide when to load a file from disk although
modification time has not changed.

Change-Id: I03b9a137af097ec69c4c5e2eaa512d2bdd7fe080
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd shortening of note ref names to NoteMap 04/3504/3
Kevin Sawicki [Mon, 23 May 2011 18:39:33 +0000 (11:39 -0700)]
Add shortening of note ref names to NoteMap

Change-Id: I224190bbb41c7cbea38388d0148ecc6dc68f3a14
Signed-off-by: Kevin Sawicki <kevin@github.com>
13 years agoMerge "Remove rebase temporary files on checkout failure"
Shawn Pearce [Mon, 23 May 2011 15:33:49 +0000 (11:33 -0400)]
Merge "Remove rebase temporary files on checkout failure"

13 years agoAdd GitAddTask 79/3479/2
Ketan Padegaonkar [Fri, 20 May 2011 09:15:00 +0000 (14:45 +0530)]
Add GitAddTask

Change-Id: Ia9a3c9f4728e13d1e62f530b1d843d09afb4eb42
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoRemove rebase temporary files on checkout failure 99/3499/2
Bernard Leach [Sun, 22 May 2011 14:20:32 +0000 (00:20 +1000)]
Remove rebase temporary files on checkout failure

A checkout conflict during rebase setup should leave the repository
in SAFE state which means ensuring that the rebase temporary files
need to be removed.

Bug: 346813
Change-Id: If8b758fde73ed5a452a99a195a844825a03bae1a
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd LsRemoteCommandTest 74/3474/3
Chris Aniszczyk [Thu, 19 May 2011 19:39:19 +0000 (14:39 -0500)]
Add LsRemoteCommandTest

Bug: 343801
Change-Id: I4a91d93428bbf7f74033fcea5823266fa52d7a0c
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd LsRemoteCommand to JGit API 46/3346/4
Christoph Brill [Thu, 19 May 2011 19:38:39 +0000 (14:38 -0500)]
Add LsRemoteCommand to JGit API

Bug: 343801
Change-Id: Ic651e8e09143e15ed459461b50b2222e13da56c4
Also-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd org.eclipse.jgit.ant.test to parent pom.xml 71/3471/3
Chris Aniszczyk [Thu, 19 May 2011 16:20:19 +0000 (11:20 -0500)]
Add org.eclipse.jgit.ant.test to parent pom.xml

Change-Id: I3fd0b509e03cbd5f2bf3bd6377287dab14e8728e
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd GitCloneTaskTest 68/3468/2
Ketan Padegaonkar [Thu, 19 May 2011 08:32:02 +0000 (14:02 +0530)]
Add GitCloneTaskTest

Change-Id: Iec8cd032d8d659a896d909f9094f76b7d35147e6
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoCreate a MergeResult for deleted/modified files 09/3409/3
Bernard Leach [Fri, 13 May 2011 05:59:57 +0000 (15:59 +1000)]
Create a MergeResult for deleted/modified files

Change Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d added merge
support for when OURS or THEIRS was simultaneously deleted
and modified.  That changeset however did not add create an
entry in the conflicts table so clients would see a CONFLICTING
result but getConflicts() would return null.

This change creates a MergeResult for the conflicting file.

Bug: 345684
Change-Id: I52acb81c1729b49c9fb3e7a477c6448d8e55c317
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd reset with paths support to ResetCommand 53/3453/3
Bernard Leach [Thu, 19 May 2011 11:04:20 +0000 (21:04 +1000)]
Add reset with paths support to ResetCommand

Bug: 338701
Change-Id: Id7cbce47131b459e632ddc2c9a94628c7d0b75cd
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoFix NPE in URIish when parsing an empty URI 66/3466/2
Ketan Padegaonkar [Thu, 19 May 2011 07:38:26 +0000 (13:08 +0530)]
Fix NPE in URIish when parsing an empty URI

Change-Id: Id1c42dc9843f62c581b9904b02150de53cf7777c
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd org.eclipse.jgit.ant.test 65/3465/2
Ketan Padegaonkar [Thu, 19 May 2011 06:28:28 +0000 (11:58 +0530)]
Add org.eclipse.jgit.ant.test

Change-Id: I9bfb1298864294b8ce29b91660f1cf8316e5f620
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd tests for change If203ce5 56/3456/2
Bernard Leach [Wed, 18 May 2011 16:41:18 +0000 (11:41 -0500)]
Add tests for change If203ce5

Bug: 344779
Change-Id: I1628984479d93665bf4987d6a4ff8e67ad73eb36
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoImplement rebase ff for upstream branches with merge commits 36/3336/8
Chris Aniszczyk [Wed, 18 May 2011 16:39:33 +0000 (11:39 -0500)]
Implement rebase ff for upstream branches with merge commits

Change Ib9898fe0f982fa08e41f1dca9452c43de715fdb6 added support for
the 'cherry-pick' fast forward case where the upstream commit history
does not include any merge commits.  This change adds support for the
case where merge commits exist and the local branch has no changes.

Bug: 344779
Change-Id: If203ce5aa1b4e5d4d7982deb621b710e71f4ee10
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoFix path filtering in LogCommand 55/3455/3
Piotr Janik [Wed, 18 May 2011 14:22:08 +0000 (16:22 +0200)]
Fix path filtering in LogCommand

Bug: 346257
Change-Id: Ib897e1b4962162da9670164479a844aeea7dfcd1
Signed-off-by: Piotr Janik <janikpiotrek@gmail.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge "Optimize MergeAlgorithm if ours or theirs is empty"
Robin Rosenberg [Tue, 17 May 2011 12:54:18 +0000 (08:54 -0400)]
Merge "Optimize MergeAlgorithm if ours or theirs is empty"

13 years agoOptimize MergeAlgorithm if ours or theirs is empty 10/3410/3
Christian Halstrick [Tue, 17 May 2011 08:59:17 +0000 (10:59 +0200)]
Optimize MergeAlgorithm if ours or theirs is empty

Previously when merging two contents with a non-empty base and one of
the contents was empty (size == 0) and the other was modified there
was a potentially expensive calculation until we finally always come
to the same result -> the complete non-deleted content should collide
with the empty content.

This proposal adds an optimization to detect empty input content and
to produce the appropriate result immediatly.

Change-Id: Ie6a837260c19d808f0e99173f570ff96dd22acd3
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
13 years agoMerge "Fix diff bug on inserted line"
Stefan Lay [Tue, 17 May 2011 01:15:25 +0000 (21:15 -0400)]
Merge "Fix diff bug on inserted line"

13 years agoFix diff bug on inserted line 35/3435/1
Shawn O. Pearce [Mon, 16 May 2011 18:28:23 +0000 (11:28 -0700)]
Fix diff bug on inserted line

For the following patch on the linux 2.6.32 tag:
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -685,6 +685,7 @@ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sc

 static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
 {
+#if 0
 #ifdef CONFIG_SCHED_DEBUG
        s64 d = se->vruntime - cfs_rq->min_vruntime;

@@ -694,6 +695,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct
sched
        if (d > 3*sysctl_sched_latency)
                schedstat_inc(cfs_rq, nr_spread_over);
 #endif
+#endif
 }

 static void

JGit produced an incorrect diff, attempting to add a new "}" instead
of the new "#endif" at the end of the hunk. This was caused by a prior
fix for bug 328895 where we wanted to "slide" a diff down in the file
when adding a new method/function and want to show the closing curly
brace as being added after the new method, rather than added onto the
end of the prior function or method just before the insertion point.

Bug: 345956
Change-Id: I32b9e24f1e2980258b1b39dd1807919ab1c5f9b2
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAdd getConflicting() method in Status API 33/3433/2
Piotr Janik [Mon, 16 May 2011 10:51:05 +0000 (12:51 +0200)]
Add getConflicting() method in Status API

Bug: 345899
Change-Id: I133b9dd3e9a9c3c749547a884df3ce371929f38e
Signed-off-by: Piotr Janik <janikpiotrek@gmail.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge "Fix diff when first text is the start of the other"
Shawn Pearce [Sun, 15 May 2011 19:17:52 +0000 (15:17 -0400)]
Merge "Fix diff when first text is the start of the other"

13 years agoFix diff when first text is the start of the other 56/3356/6
Robin Rosenberg [Sun, 15 May 2011 18:34:05 +0000 (20:34 +0200)]
Fix diff when first text is the start of the other

The problem occurred when the first text ends in the middle
of the last line of the other text and the first text has no
end of line.

Bug: 344975
Change-Id: I1f0dd9f8062f2148a7c1341c9122202e082ad19d
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
13 years agoMerge "Add test for reflog part of ResetCommand"
Chris Aniszczyk [Fri, 13 May 2011 22:05:58 +0000 (18:05 -0400)]
Merge "Add test for reflog part of ResetCommand"

13 years agoAdd test for reflog part of ResetCommand 14/3414/2
Robin Rosenberg [Wed, 4 May 2011 22:26:39 +0000 (00:26 +0200)]
Add test for reflog part of ResetCommand

The reflog message fix was done in
I4f1c3cd6b2cf543be213f061afb94223062dde51

Change-Id: I44817ccf4bf226ed3e4ce6fb2d923e88788221dd
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
13 years agoAdd RebaseResult.FAST_FORWARD_RESULT 13/3413/1
Chris Aniszczyk [Fri, 13 May 2011 14:56:09 +0000 (09:56 -0500)]
Add RebaseResult.FAST_FORWARD_RESULT

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoRevertCommand: Add "." after reverted commit id 11/3411/1
Robin Stocker [Fri, 13 May 2011 11:39:54 +0000 (13:39 +0200)]
RevertCommand: Add "." after reverted commit id

This makes the message look the same as in C Git (the "."):

  This reverts commit <sha1>.

Change-Id: I4c254c122277b127e7b039c0d1c7f7a0d691530d
Signed-off-by: Robin Stocker <robin@nibor.org>
13 years agoUpdate tycho version to 0.12 74/3374/3
Chris Aniszczyk [Tue, 10 May 2011 20:05:09 +0000 (15:05 -0500)]
Update tycho version to 0.12

Following migration instructions [1].

[1] http://dev.eclipse.org/mhonarc/lists/tycho-user/msg00080.html

Change-Id: I9e54f3e7e96892b64546270cbdf0308046e1d40c
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoUpdate findbugs-maven-plugin to the official 2.3.2 release 76/3376/1
Chris Aniszczyk [Tue, 10 May 2011 20:43:40 +0000 (15:43 -0500)]
Update findbugs-maven-plugin to the official 2.3.2 release

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge "Formatter for relative dates"
Christian Halstrick [Mon, 9 May 2011 13:23:37 +0000 (09:23 -0400)]
Merge "Formatter for relative dates"

13 years agoFormatter for relative dates 61/3361/4
Matthias Sohn [Mon, 9 May 2011 12:46:38 +0000 (14:46 +0200)]
Formatter for relative dates

Change-Id: I78b307177c68c578e10101a0ee7b6306880a08f7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoRemove unused serialVersionUID from non-serializable classes. 65/3365/1
Kevin Sawicki [Mon, 9 May 2011 00:51:45 +0000 (17:51 -0700)]
Remove unused serialVersionUID from non-serializable classes.

Change-Id: I819e2ca88577382b54d38b7a1247e94a5127ef9e
Signed-off-by: Kevin Sawicki <kevin@github.com>
13 years agoFix getHumanishName broken for windows paths 98/3198/6
Stefan Lay [Fri, 6 May 2011 08:42:51 +0000 (10:42 +0200)]
Fix getHumanishName broken for windows paths

Since d1718a the method getHumanishName was broken on windows since
the URIish is not normalized anymore. For a path like
"C:\gitRepositories\egit" the whole path was returned instead of
"egit".

Bug: 343519
Change-Id: I95056009072b99d32f288966302d0f8188b47836
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
13 years agoMerge "IndexDiff: conflicting files aren't properly shown"
Chris Aniszczyk [Thu, 5 May 2011 19:34:49 +0000 (15:34 -0400)]
Merge "IndexDiff: conflicting files aren't properly shown"

13 years agoCorrect tabs in top-level pom.xml 42/3342/2
Shawn O. Pearce [Thu, 5 May 2011 18:47:57 +0000 (11:47 -0700)]
Correct tabs in top-level pom.xml

Change-Id: I55900b335f2056093e0a32086afb429a4bc183d3
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoIndexDiff: conflicting files aren't properly shown 95/3295/3
Bernard Leach [Fri, 29 Apr 2011 09:42:10 +0000 (19:42 +1000)]
IndexDiff: conflicting files aren't properly shown

Before this change any files in the conflicting set would
also be listed in the the other IndexDiff Sets which is
confusing.  With this change a conflicting file will not
be included in any of the other sets.

Change-Id: Ife9f2652685220bcfddc1f9820423acdcd5acfdc
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoUpdate IP log to include Ant 1.8.2 (CQ 5111) 40/3340/1
Shawn O. Pearce [Thu, 5 May 2011 17:58:03 +0000 (10:58 -0700)]
Update IP log to include Ant 1.8.2 (CQ 5111)

Change-Id: I953720b88d34e74509b115dcd2c1eb48d3587484
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoIgnore submodule commits during checkout 03/3303/3
Robin Rosenberg [Sun, 1 May 2011 21:17:57 +0000 (23:17 +0200)]
Ignore submodule commits during checkout

Submodules are supposed to be handled by separate operations, so
we should ignore them on checkout, just like C Git does.

This fix does not add submodule support. We just try harder
to ignore them.

Bug: 343566
Change-Id: I2c5ae1024ea7bb57adf27072da6acc9643018eda
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
13 years agoMerge "Fix "into" part of merge message for HEAD"
Shawn Pearce [Thu, 5 May 2011 17:38:40 +0000 (13:38 -0400)]
Merge "Fix "into" part of merge message for HEAD"

13 years agoStore Git on any DHT 95/2295/24
Shawn O. Pearce [Wed, 2 Mar 2011 23:23:30 +0000 (15:23 -0800)]
Store Git on any DHT

jgit.storage.dht is a storage provider implementation for JGit that
permits storing the Git repository in a distributed hashtable, NoSQL
system, or other database.  The actual underlying storage system is
undefined, and can be plugged in by implementing 7 small interfaces:

  *  Database
  *  RepositoryIndexTable
  *  RepositoryTable
  *  RefTable
  *  ChunkTable
  *  ObjectIndexTable
  *  WriteBuffer

The storage provider interface tries to assume very little about the
underlying storage system, and requires only three key features:

  *  key -> value lookup (a hashtable is suitable)
  *  atomic updates on single rows
  *  asynchronous operations (Java's ExecutorService is easy to use)

Most NoSQL database products offer all 3 of these features in their
clients, and so does any decent network based cache system like the
open source memcache product.  Relying only on key equality for data
retrevial makes it simple for the storage engine to distribute across
multiple machines.  Traditional SQL systems could also be used with a
JDBC based spi implementation.

Before submitting this change I have implemented six storage systems
for the spi layer:

  * Apache HBase[1]
  * Apache Cassandra[2]
  * Google Bigtable[3]
  * an in-memory implementation for unit testing
  * a JDBC implementation for SQL
  * a generic cache provider that can ride on top of memcache

All six systems came in with an spi layer around 1000 lines of code to
implement the above 7 interfaces.  This is a huge reduction in size
compared to prior attempts to implement a new JGit storage layer.  As
this package shows, a complete JGit storage implementation is more
than 17,000 lines of fairly complex code.

A simple cache is provided in storage.dht.spi.cache.  Implementers can
use CacheDatabase to wrap any other type of Database and perform fast
reads against a network based cache service, such as the open source
memcached[4].  An implementation of CacheService must be provided to
glue this spi onto the network cache.

[1] https://github.com/spearce/jgit_hbase
[2] https://github.com/spearce/jgit_cassandra
[3] http://labs.google.com/papers/bigtable.html
[4] http://memcached.org/

Change-Id: I0aa4072781f5ccc019ca421c036adff2c40c4295
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAdd org.eclipse.jgit.ant to parent pom.xml 37/3337/3
Chris Aniszczyk [Thu, 5 May 2011 16:33:16 +0000 (18:33 +0200)]
Add org.eclipse.jgit.ant to parent pom.xml

Bug: 321237
Change-Id: Idd106f2700740db07f41f6d31f50d6b2a30fa732
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoFix "into" part of merge message for HEAD 38/3338/2
Robin Stocker [Thu, 5 May 2011 15:33:01 +0000 (17:33 +0200)]
Fix "into" part of merge message for HEAD

Merging into a non-master branch would result in the following message:

  Merge branch 'a' into HEAD

Now the merge message is correct:

  Merge branch 'a' into b

Change-Id: I488f97190e4c1711c23a7a3cbd64f8b13a87bbac
Signed-off-by: Robin Stocker <robin@nibor.org>
13 years agoMerge "Fix error handling in RepositoryFilter"
Chris Aniszczyk [Thu, 5 May 2011 14:35:55 +0000 (10:35 -0400)]
Merge "Fix error handling in RepositoryFilter"

13 years agoAdd pom.xml to org.eclipse.jgit.ant 73/3273/4
Chris Aniszczyk [Wed, 27 Apr 2011 20:59:14 +0000 (15:59 -0500)]
Add pom.xml to org.eclipse.jgit.ant

Also-by: Ketan Padegaonkar <KetanPadegaonkar@gmail.com>
Bug: 321237
CQ: 5111
Change-Id: Ie93b85df76fcb5c077b93f01ed1959eaeffb3c20
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoFix error handling in RepositoryFilter 35/3335/1
Shawn O. Pearce [Wed, 4 May 2011 21:55:53 +0000 (14:55 -0700)]
Fix error handling in RepositoryFilter

The filter did not correctly match smart HTTP client requests,
so it always fell back on HTTP status codes for errors. This
usually causes a smart client to retry a dumb request, which
is not what the server wants.

Change-Id: I42592378dc42fbe308ef30a2923786c690f668a9
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoPresent reset in the reflog like C Git does nowadays 28/3328/1
Robin Rosenberg [Mon, 2 May 2011 23:13:21 +0000 (01:13 +0200)]
Present reset in the reflog like C Git does nowadays

Confirmed for v1.7.4.1

Change-Id: I4f1c3cd6b2cf543be213f061afb94223062dde51
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
13 years agoImplemented merge for parallel delete/modification 94/3294/2
Bernard Leach [Fri, 29 Apr 2011 09:37:00 +0000 (19:37 +1000)]
Implemented merge for parallel delete/modification

Duplicates cgit behaviour for merging the case where
OURS is deleted and THEIRS is modified as well as
OURS is modified and THEIRS id deleted.

Change-Id: Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd better exception handling for the git-init ant task 13/3313/2
Ketan Padegaonkar [Mon, 2 May 2011 16:48:27 +0000 (09:48 -0700)]
Add better exception handling for the git-init ant task

Change-Id: Ia935720fc9c09b427abb84be038c4dc74610850c
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge "Attempt to make git prefix detection more reliable"
Chris Aniszczyk [Tue, 3 May 2011 16:53:49 +0000 (12:53 -0400)]
Merge "Attempt to make git prefix detection more reliable"

13 years agoMerge "Add path support to checkout command."
Stefan Lay [Tue, 3 May 2011 15:39:11 +0000 (11:39 -0400)]
Merge "Add path support to checkout command."

13 years agoAdd path support to checkout command. 80/3280/18
Kevin Sawicki [Tue, 3 May 2011 15:07:15 +0000 (08:07 -0700)]
Add path support to checkout command.

Change-Id: I89e8edfc6dd87d5bf8fd08704df2432720084330
Signed-off-by: Kevin Sawicki <kevin@github.com>
13 years agoQualify post-0.12 builds 17/3317/1
Matthias Sohn [Mon, 2 May 2011 22:19:54 +0000 (00:19 +0200)]
Qualify post-0.12 builds

Change-Id: I70fe2671321efb5c3d271121ce00299533d1b388
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoMerge branch 'stable-0.12' 16/3316/1
Matthias Sohn [Mon, 2 May 2011 22:11:47 +0000 (00:11 +0200)]
Merge branch 'stable-0.12'

* stable-0.12:
  JGit 0.12.1

13 years agoAttempt to make git prefix detection more reliable 61/3261/4
Robin Rosenberg [Mon, 2 May 2011 20:35:54 +0000 (22:35 +0200)]
Attempt to make git prefix detection more reliable

This fix makes sure the readPipe methods drains the stderr
pipe and close the subprocess' stdin stream before reading
the process outputs.

I never managed to repeat the reported problem myself, so this
may help in diagnosing the probelm on other peoples machines.

Bug: 337533
Change-Id: I299555f09768c34d5868327e574326946ee265e1

13 years agoAdd better javadoc to the git-init ant task 12/3312/2
Ketan Padegaonkar [Mon, 2 May 2011 16:44:34 +0000 (09:44 -0700)]
Add better javadoc to the git-init ant task

Change-Id: If41e5a9ab37533cce10ea1c1925d7bd3ece586ea
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoJGit 0.12.1 10/3310/1 stable-0.12 v0.12.1
Matthias Sohn [Mon, 2 May 2011 16:24:45 +0000 (18:24 +0200)]
JGit 0.12.1

Change-Id: Ia6e58b466fa3ef7ddd61b40f2ad44141fe8786c4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoAdd GitCheckoutTask to org.eclipse.jgit.ant 78/3278/4
Ketan Padegaonkar [Tue, 26 Apr 2011 16:41:56 +0000 (09:41 -0700)]
Add GitCheckoutTask to org.eclipse.jgit.ant

Bug: 321237
Change-Id: I5c4753f7b99d0be002b32e403f5dfff9353c57b0
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd GitCloneTask to org.eclipse.jgit.ant 77/3277/3
Ketan Padegaonkar [Tue, 26 Apr 2011 16:33:52 +0000 (09:33 -0700)]
Add GitCloneTask to org.eclipse.jgit.ant

Bug: 321237
Change-Id: I605da8150048158d918c577ef8ca4f6edbed0133
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoAdd org.eclipse.jgit.ant 06/3306/3
Ketan Padegaonkar [Mon, 25 Apr 2011 17:24:48 +0000 (10:24 -0700)]
Add org.eclipse.jgit.ant

Adds the initial project and a GitInitTask.

Bug: 321237
Change-Id: I06b94e0b42b20ecf51f86845e47d49913f3513c4
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge branch 'stable-0.12' 15/3215/1
Shawn O. Pearce [Thu, 21 Apr 2011 23:33:56 +0000 (16:33 -0700)]
Merge branch 'stable-0.12'

* stable-0.12:
  Implement the no-done capability

13 years agoImplement the no-done capability 16/2716/9
Shawn O. Pearce [Tue, 15 Mar 2011 01:18:49 +0000 (18:18 -0700)]
Implement the no-done capability

Smart HTTP clients may request both multi_ack_detailed and no-done in
the same request to prevent the client from needing to send a "done"
line to the server in response to a server's "ACK %s ready".

For smart HTTP, this can save 1 full HTTP RPC in the fetch exchange,
improving overall latency when incrementally updating a client that
has not diverged very far from the remote repository.

Unfortuantely this capability cannot be enabled for the traditional
bi-directional connections.  multi_ack_detailed has the client sending
more "have" lines at the same time that the server is creating the
"ACK %s ready" and writing out the PACK stream, resulting in some race
conditions and/or deadlock, depending on how the pipe buffers are
implemented.  For very small updates, a server might actually be able
to send "ACK %s ready", then the PACK, and disconnect before the
client even finishes sending its first batch of "have" lines.  This
may cause the client to fail with a broken pipe exception.  To avoid
all of these potential problems, "no-done" is restricted only to the
smart HTTP variant of the protocol.

Change-Id: Ie0d0a39320202bc096fec2e97cb58e9efd061b2d
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoMerge branch 'stable-0.12' 12/3212/1
Shawn O. Pearce [Thu, 21 Apr 2011 22:41:10 +0000 (15:41 -0700)]
Merge branch 'stable-0.12'

* stable-0.12:
  Fix sorting of names in RefDirectory
  Make running static checks configurable in maven build
  Add constants for gerrit change id configuration

13 years agoFix sorting of names in RefDirectory 08/3208/1
Shawn O. Pearce [Thu, 21 Apr 2011 19:40:26 +0000 (12:40 -0700)]
Fix sorting of names in RefDirectory

RefDirectory did not correctly follow the contract of RefList.  The
contract says if you use add() method of RefList builder, you MUST
sort() it afterwards, and later every other method assumes that list
is properly sorted (especially the binary search in the find() and
get() methods).  Instead RefDirectory class tried to scan the refs
recursively while sorting every folder in the process before
processing and did not call sort().

For example, when scanning the contents of refs/tags project1 string
is smaller than project1-*, so it will recursively go into the folder
and add these tags first and only then will add project-* ones. This
will result in a broken list (any project1-* string is less than
project1/* one, but they all appear after them in the list), that's
why binary search will fail making loose RefList and the whole local
RefMap completely unusable.

Change-Id: Ibad90017e3b2435b1396b69a22520db4b1b022bb
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoEnabled unit tests in HttpClientTests 96/3196/1
Christian Halstrick [Tue, 12 Apr 2011 15:21:27 +0000 (17:21 +0200)]
Enabled unit tests in HttpClientTests

Change-Id: I92ae117f1dcfc569e27c66c191e090a60fbe2bb6
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
13 years agoAdded support to IndexDiff to return information on conflicts 05/3105/4
Bernard Leach [Tue, 19 Apr 2011 21:51:40 +0000 (07:51 +1000)]
Added support to IndexDiff to return information on conflicts

Change-Id: I43c13eb72a44f80135c93525fce0c0280b0e64a2
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years agoMerge "Make running static checks configurable in maven build" into stable-0.12
Shawn Pearce [Mon, 18 Apr 2011 15:46:47 +0000 (11:46 -0400)]
Merge "Make running static checks configurable in maven build" into stable-0.12

13 years agoMake running static checks configurable in maven build 47/3147/2
Matthias Sohn [Sat, 16 Apr 2011 00:08:24 +0000 (02:08 +0200)]
Make running static checks configurable in maven build

In order to run the static checks run:

mvn -P static-checks clean install

Change-Id: I14077498a04be986ded123ddbfc97da8f9bc3130
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
13 years agoAdd constants for gerrit change id configuration 19/3119/1
Stefan Lay [Thu, 14 Apr 2011 15:25:22 +0000 (17:25 +0200)]
Add constants for gerrit change id configuration

Change-Id: I22fc46dff6cc5dfd975f6e82161d265781778cde
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>