summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add GitAddTaskKetan Padegaonkar2011-05-234-1/+156
| | | | | Change-Id: Ia9a3c9f4728e13d1e62f530b1d843d09afb4eb42 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add LsRemoteCommandTestChris Aniszczyk2011-05-191-0/+160
| | | | | | Bug: 343801 Change-Id: I4a91d93428bbf7f74033fcea5823266fa52d7a0c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add LsRemoteCommand to JGit APIChristoph Brill2011-05-194-0/+200
| | | | | | | Bug: 343801 Change-Id: Ic651e8e09143e15ed459461b50b2222e13da56c4 Also-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add org.eclipse.jgit.ant.test to parent pom.xmlChris Aniszczyk2011-05-192-0/+103
| | | | | Change-Id: I3fd0b509e03cbd5f2bf3bd6377287dab14e8728e Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add GitCloneTaskTestKetan Padegaonkar2011-05-195-4/+145
| | | | | Change-Id: Iec8cd032d8d659a896d909f9094f76b7d35147e6 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Create a MergeResult for deleted/modified filesBernard Leach2011-05-192-0/+54
| | | | | | | | | | | | | | 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>
* Add reset with paths support to ResetCommandBernard Leach2011-05-192-8/+154
| | | | | | Bug: 338701 Change-Id: Id7cbce47131b459e632ddc2c9a94628c7d0b75cd Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Fix NPE in URIish when parsing an empty URIKetan Padegaonkar2011-05-193-0/+36
| | | | | Change-Id: Id1c42dc9843f62c581b9904b02150de53cf7777c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add org.eclipse.jgit.ant.testKetan Padegaonkar2011-05-198-0/+67
| | | | | Change-Id: I9bfb1298864294b8ce29b91660f1cf8316e5f620 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add tests for change If203ce5Bernard Leach2011-05-182-0/+171
| | | | | | Bug: 344779 Change-Id: I1628984479d93665bf4987d6a4ff8e67ad73eb36 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Implement rebase ff for upstream branches with merge commitsChris Aniszczyk2011-05-182-53/+64
| | | | | | | | | | | 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>
* Fix path filtering in LogCommandPiotr Janik2011-05-182-2/+58
| | | | | | | Bug: 346257 Change-Id: Ib897e1b4962162da9670164479a844aeea7dfcd1 Signed-off-by: Piotr Janik <janikpiotrek@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Merge "Optimize MergeAlgorithm if ours or theirs is empty"Robin Rosenberg2011-05-172-1/+50
|\
| * Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-172-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Fix diff bug on inserted line"Stefan Lay2011-05-162-2/+10
|\ \
| * | Fix diff bug on inserted lineShawn O. Pearce2011-05-162-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add getConflicting() method in Status APIPiotr Janik2011-05-161-0/+8
|/ / | | | | | | | | | | | | Bug: 345899 Change-Id: I133b9dd3e9a9c3c749547a884df3ce371929f38e Signed-off-by: Piotr Janik <janikpiotrek@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Merge "Fix diff when first text is the start of the other"Shawn Pearce2011-05-153-1/+67
|\ \
| * | Fix diff when first text is the start of the otherRobin Rosenberg2011-05-153-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Add test for reflog part of ResetCommand"Chris Aniszczyk2011-05-131-0/+33
|\ \ \
| * | | Add test for reflog part of ResetCommandRobin Rosenberg2011-05-131-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reflog message fix was done in I4f1c3cd6b2cf543be213f061afb94223062dde51 Change-Id: I44817ccf4bf226ed3e4ce6fb2d923e88788221dd Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | | Add RebaseResult.FAST_FORWARD_RESULTChris Aniszczyk2011-05-131-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | RevertCommand: Add "." after reverted commit idRobin Stocker2011-05-132-3/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Update tycho version to 0.12Chris Aniszczyk2011-05-121-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Update findbugs-maven-plugin to the official 2.3.2 releaseChris Aniszczyk2011-05-101-14/+1
| | | | | | | | | | | | Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Merge "Formatter for relative dates"Christian Halstrick2011-05-094-0/+292
|\ \ \
| * | | Formatter for relative datesMatthias Sohn2011-05-094-0/+292
| | | | | | | | | | | | | | | | | | | | Change-Id: I78b307177c68c578e10101a0ee7b6306880a08f7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Remove unused serialVersionUID from non-serializable classes.Kevin Sawicki2011-05-082-2/+0
|/ / / | | | | | | | | | | | | Change-Id: I819e2ca88577382b54d38b7a1247e94a5127ef9e Signed-off-by: Kevin Sawicki <kevin@github.com>
* | / Fix getHumanishName broken for windows pathsStefan Lay2011-05-062-1/+18
| |/ |/| | | | | | | | | | | | | | | | | 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>
* | Merge "IndexDiff: conflicting files aren't properly shown"Chris Aniszczyk2011-05-052-10/+88
|\ \
| * | IndexDiff: conflicting files aren't properly shownBernard Leach2011-05-052-10/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Correct tabs in top-level pom.xmlShawn O. Pearce2011-05-051-2/+2
|/ / | | | | | | | | Change-Id: I55900b335f2056093e0a32086afb429a4bc183d3 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Update IP log to include Ant 1.8.2 (CQ 5111)Shawn O. Pearce2011-05-051-0/+6
| | | | | | | | | | Change-Id: I953720b88d34e74509b115dcd2c1eb48d3587484 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Ignore submodule commits during checkoutRobin Rosenberg2011-05-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Fix "into" part of merge message for HEAD"Shawn Pearce2011-05-052-2/+10
|\ \
| * | Fix "into" part of merge message for HEADRobin Stocker2011-05-052-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Store Git on any DHTShawn O. Pearce2011-05-05123-3/+21717
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add org.eclipse.jgit.ant to parent pom.xmlChris Aniszczyk2011-05-051-1/+2
|/ / | | | | | | | | | | Bug: 321237 Change-Id: Idd106f2700740db07f41f6d31f50d6b2a30fa732 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Fix error handling in RepositoryFilter"Chris Aniszczyk2011-05-051-3/+6
|\ \
| * | Fix error handling in RepositoryFilterShawn O. Pearce2011-05-041-3/+6
| |/ | | | | | | | | | | | | | | | | | | 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>
* / Add pom.xml to org.eclipse.jgit.antChris Aniszczyk2011-05-051-0/+114
|/ | | | | | | | Also-by: Ketan Padegaonkar <KetanPadegaonkar@gmail.com> Bug: 321237 CQ: 5111 Change-Id: Ie93b85df76fcb5c077b93f01ed1959eaeffb3c20 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Present reset in the reflog like C Git does nowadaysRobin Rosenberg2011-05-041-2/+1
| | | | | | | Confirmed for v1.7.4.1 Change-Id: I4f1c3cd6b2cf543be213f061afb94223062dde51 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* Implemented merge for parallel delete/modificationBernard Leach2011-05-033-1/+87
| | | | | | | | | 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>
* Add better exception handling for the git-init ant taskKetan Padegaonkar2011-05-031-3/+8
| | | | | Change-Id: Ia935720fc9c09b427abb84be038c4dc74610850c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Merge "Attempt to make git prefix detection more reliable"Chris Aniszczyk2011-05-031-3/+55
|\
| * Attempt to make git prefix detection more reliableRobin Rosenberg2011-05-021-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add path support to checkout command."Stefan Lay2011-05-032-3/+235
|\ \
| * | Add path support to checkout command.Kevin Sawicki2011-05-032-3/+235
| |/ | | | | | | | | Change-Id: I89e8edfc6dd87d5bf8fd08704df2432720084330 Signed-off-by: Kevin Sawicki <kevin@github.com>
* | Qualify post-0.12 buildsMatthias Sohn2011-05-0331-201/+201
| | | | | | | | | | Change-Id: I70fe2671321efb5c3d271121ce00299533d1b388 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-0.12'Matthias Sohn2011-05-0330-199/+199
|\ \ | | | | | | | | | | | | * stable-0.12: JGit 0.12.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 16:20:15 +0000