aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add a DiffFormatter which calculates a patch-idStefan Lay2011-05-241-0/+120
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Add CleanCommandTest and fix CleanCommandAbhishek Bhatnagar2011-05-241-0/+116
|/ | | | | | Bug: 334767 Change-Id: I0a836451ceb668f943b1f353dc65420157810b23 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add shortening of note ref names to NoteMapKevin Sawicki2011-05-231-0/+8
| | | | | Change-Id: I224190bbb41c7cbea38388d0148ecc6dc68f3a14 Signed-off-by: Kevin Sawicki <kevin@github.com>
* Merge "Remove rebase temporary files on checkout failure"Shawn Pearce2011-05-231-2/+39
|\
| * Remove rebase temporary files on checkout failureBernard Leach2011-05-231-2/+39
| | | | | | | | | | | | | | | | | | | | 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>
* | Add GitAddTaskKetan Padegaonkar2011-05-231-0/+1
|/ | | | | 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>
* Create a MergeResult for deleted/modified filesBernard Leach2011-05-191-0/+42
| | | | | | | | | | | | | | 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-191-7/+76
| | | | | | Bug: 338701 Change-Id: Id7cbce47131b459e632ddc2c9a94628c7d0b75cd Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Fix NPE in URIish when parsing an empty URIKetan Padegaonkar2011-05-191-0/+20
| | | | | Change-Id: Id1c42dc9843f62c581b9904b02150de53cf7777c 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>
* Fix path filtering in LogCommandPiotr Janik2011-05-181-1/+54
| | | | | | | 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-171-1/+19
|\
| * Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-171-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix diff bug on inserted lineShawn O. Pearce2011-05-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Fix diff when first text is the start of the other"Shawn Pearce2011-05-152-0/+66
|\ \
| * | Fix diff when first text is the start of the otherRobin Rosenberg2011-05-152-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | RevertCommand: Add "." after reverted commit idRobin Stocker2011-05-131-2/+5
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Formatter for relative datesMatthias Sohn2011-05-091-0/+126
| | | | | | | | | | | | | | | Change-Id: I78b307177c68c578e10101a0ee7b6306880a08f7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix getHumanishName broken for windows pathsStefan Lay2011-05-061-0/+11
| |/ |/| | | | | | | | | | | | | | | | | 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>
* | IndexDiff: conflicting files aren't properly shownBernard Leach2011-05-051-4/+79
| | | | | | | | | | | | | | | | | | | | 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>
* | Fix "into" part of merge message for HEADRobin Stocker2011-05-051-0/+9
|/ | | | | | | | | | | | | 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>
* Implemented merge for parallel delete/modificationBernard Leach2011-05-032-1/+64
| | | | | | | | | 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>
* Merge "Add path support to checkout command."Stefan Lay2011-05-031-0/+151
|\
| * Add path support to checkout command.Kevin Sawicki2011-05-031-0/+151
| | | | | | | | | | Change-Id: I89e8edfc6dd87d5bf8fd08704df2432720084330 Signed-off-by: Kevin Sawicki <kevin@github.com>
* | Qualify post-0.12 buildsMatthias Sohn2011-05-032-32/+32
| | | | | | | | | | Change-Id: I70fe2671321efb5c3d271121ce00299533d1b388 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-0.12'Matthias Sohn2011-05-032-32/+32
|\ \ | |/ |/| | | | | * stable-0.12: JGit 0.12.1
| * JGit 0.12.1v0.12.1stable-0.12Matthias Sohn2011-05-022-32/+32
| | | | | | | | | | Change-Id: Ia6e58b466fa3ef7ddd61b40f2ad44141fe8786c4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-0.12'Shawn O. Pearce2011-04-211-0/+13
|\| | | | | | | | | | | | | * stable-0.12: Fix sorting of names in RefDirectory Make running static checks configurable in maven build Add constants for gerrit change id configuration
| * Fix sorting of names in RefDirectoryShawn O. Pearce2011-04-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Added support to IndexDiff to return information on conflictsBernard Leach2011-04-191-0/+46
|/ | | | | Change-Id: I43c13eb72a44f80135c93525fce0c0280b0e64a2 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Hande latin-1 encodingLeonard Broman2011-04-111-0/+82
| | | | | | Bug: 342259 Change-Id: Ie285b8819b5ea6f9892ebafc4ebbd9c6d091d1fe Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add NotesCommand to the JGit APIChris Aniszczyk2011-04-101-0/+100
| | | | | | Bug: 334765 Change-Id: Ie0fb79671e7a741eb85651f507b8ade930bfcc20 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Create all test data in trash folderMatthias Sohn2011-04-101-1/+2
| | | | | | | | | This ensures that all test data is separated from project sources and cleaned up after the test. Previously the cloned bare test repository was created in org.eclipse.jgit.test/ and not deleted after the test run. Change-Id: I55110442e365fc8fe610f1c372f72a71ee6e1412 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add "Conflicts" section to merge message on conflictRobin Stocker2011-04-061-0/+32
| | | | | | | | The same as with cherry-pick, the commit message of a merge should include a "Conflicts" section when the merge resulted in conflicts. Change-Id: I6261dc898262322924af5ca1bef841a654b0df55 Signed-off-by: Robin Stocker <robin@nibor.org>
* Add CHERRY_PICK_HEAD for cherry-pick conflictsRobin Stocker2011-04-061-0/+52
| | | | | | | | | | | | | | | | | | | Add handling of CHERRY_PICK_HEAD file in .git (similar to MERGE_HEAD), which is written in case of a conflicting cherry-pick merge. It is used so that Repository.getRepositoryState can return the new states CHERRY_PICKING and CHERRY_PICKING_RESOLVED. These states, as well as CHERRY_PICK_HEAD can be used in EGit to properly show the merge tool. Also, in case of a conflict, MERGE_MSG is written with the original commit message and a "Conflicts" section appended. This way, the cherry-picked message is not lost and can later be re-used in the commit dialog. Bug: 339092 Change-Id: I947967fdc2f1d55016c95106b104c2afcc9797a1 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add parameters for timeout and branches to cloneStefan Lay2011-04-061-0/+26
| | | | | | | | | | | The timeout is also used in the FetchCommand called by the CloneCommand. The possibility to provide a list of branches to fetch initially is a feature offered by EGit. To implement it here is a prerequisite for EGit to be able to use the CloneCommand. Change-Id: I21453de22e9ca61919a7c3386fcc526024742f5f Signed-off-by: Stefan Lay <stefan.lay@sap.com>
* Try to checkout branch after cloningStefan Lay2011-04-062-4/+19
| | | | | | | | | When no branch was specified in the clone command, HEAD pointed to a commit after clone. Now the clone command tries to find a branch which points to the same commit and checks out this branch. Bug: 339354 Change-Id: Ie3844465329f213dee4a8868dbf434ac3ce23a08 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
* Merge "Add open(File) and wrap(Repository) to Git"Christian Halstrick2011-04-021-0/+112
|\
| * Add open(File) and wrap(Repository) to GitChristian Halstrick2011-04-021-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | When a new Git instance for an exisiting git repository should be created there are two use-cases: either the application has already a Repository instance in hand or the application knows where the repository resides in the filesystem. Two methods are added to explicitly support these use-cases: wrap(Repository db) and open(File gitDir) Change-Id: I2970e4aa8d4602cb1298f01e5b76bf0f96c492e5 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | RefDirectory: Use FileSnapshot for packed-refsShawn O. Pearce2011-04-011-0/+4
|/ | | | | | | | | Instead of tracking the length and modification time by hand, rely on FileSnapshot to tell RefDirectory when the $GIT_DIR/packed-refs file has been changed or should be re-read from disk. Change-Id: I067d268dfdca1d39c72dfa536b34e6a239117cc3 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Merge changes I2c8e917a,Ica9e50c0Shawn Pearce2011-04-011-6/+6
|\ | | | | | | | | | | * changes: Do not normalize URIishes Use Ignore to bypass unused test
| * Do not normalize URIishesRobin Rosenberg2011-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | We used to normalize URI's since it seems simple. This however causes inconsistencies to the user and to out tests. Just pass backslashes through and make sure our parser can handle them. Bug: 341062 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Change-Id: I2c8e917a086faabcd8749160c2acc9dd05a42838
| * Use Ignore to bypass unused testRobin Rosenberg2011-03-281-2/+2
| | | | | | | | | | Change-Id: Ica9e50c0d512865d217f55bf0d100f27878031b9 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | Merge "Detaching HEAD when checking out the same commit."Shawn Pearce2011-03-271-0/+17
|\ \
| * | Detaching HEAD when checking out the same commit.Sasa Zivkov2011-03-251-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detaching HEAD didn't work in some corner checkout cases. If, for example, HEAD is symbolic ref to refs/heads/master, refs/heads/master is ref to commit c0ffee... then: checkout c0ffee... would leave the HEAD unchanged. The same symptom occurs when checking out a remote tracking branch or a tag that references the same commit as refs/heads/master. In the above case, the RefUpdate class didn't have enough information to decide if the update needed to detach symbolic ref because it dealt only with new/old objectIDs. Therefore, this fix introduced the RefUpdate.detachingSymbolicRef flag. Bug: 315166 Change-Id: I085c98b77ea8f9104a213978ea0d4ac6fd58f49b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
* | | Merge "Fix: possible IndexOutOfBoundsException in ReflogReader"Shawn Pearce2011-03-271-0/+22
|\ \ \ | |_|/ |/| |
| * | Fix: possible IndexOutOfBoundsException in ReflogReaderMarc Strapetz2011-03-221-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.IndexOutOfBoundsException at java.nio.ByteBuffer.wrap(ByteBuffer.java:352) at org.eclipse.jgit.util.RawParseUtils.decodeNoFallback(RawParseUtils.java:913) at org.eclipse.jgit.util.RawParseUtils.decode(RawParseUtils.java:880) at org.eclipse.jgit.util.RawParseUtils.decode(RawParseUtils.java:839) at org.eclipse.jgit.storage.file.ReflogReader$Entry.<init>(ReflogReader.java:102) at org.eclipse.jgit.storage.file.ReflogReader.getReverseEntries(ReflogReader.java:183) at org.eclipse.jgit.storage.file.ReflogReader.getReverseEntries(ReflogReader.java:162) Change-Id: I22a18bc7193962e5018c40a75337f9976b585c40
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 01:32:40 +0000