Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-02-21JGit v2.3.1.201302201838-rv2.3.1.201302201838-rMatthias Sohn39-212/+212
Change-Id: I0d79873137ad4042ecc2a0210fe1f6305608b851 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-20Merge "Accept Change-Id even if footer contains not well-formed entries" ↵Matthias Sohn2-21/+76
into stable-2.3
2013-02-20Accept Change-Id even if footer contains not well-formed entriesStefan Lay2-21/+76
Instead of only looking for a Change-Id in the last section if it consists only of well-formed "key: value" lines replace the last occurrence of a valid Change-Id line in the last section. Some tools require footer lines e.g. without a colon. Gerrit doesn't accept Change-Id lines in the footer if the Change-Id line doesn't start at the beginning of the line. Bug: 400818 Change-Id: Icce54872adc8c566994beea848448a2f7ca87085 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-19Fix false positives in hashing used by PathFilterGroupRobin Stocker2-1/+14
The ByteArraySet failed to check the length of the entry correctly leading to matches where no match should be. Bug: 401249 Change-Id: I925bc48d9cafcdf13e1a797bb09fc2555eb270c5 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2013-02-13Prepare post 2.3.0.201302130906 buildsMatthias Sohn39-39/+39
Change-Id: Ia11b4000557d0cf235c4e33cda4539cab25fef47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-13JGit v2.3.0.201302130906v2.3.0.201302130906Matthias Sohn39-39/+39
Change-Id: If2e5fcbc01c2a7f058ef13d60b0bba5f77300d52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-13Replace explicit version by property where possibleMatthias Sohn4-8/+8
Change-Id: Ibb3b983d01133fd98477d9284118d8220846f0e9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-06Add better documentation to DirCacheCheckoutChristian Halstrick1-1/+139
Change-Id: I282b702d9e4cb19063d8e9503604538f80e955b7 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
2013-02-06Prepare post 2.3rc1 buildsMatthias Sohn39-49/+49
Change-Id: I5c7daa5a735bfc2ecb9adc11c392b94d235102b6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-06JGit v2.3.0.201302060400-rc1Matthias Sohn39-50/+50
Change-Id: Id1f1d174375f7399cee4c2eb23368d4dbb4c384a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-06Add getConflictingNames to RefDatabaseRobin Stocker2-1/+188
This has the same logic as isNameConflicting, but instead of only returning a boolean, it returns a collection of names that conflict. It will be used in EGit to provide a better message to the user when validating a ref name, see Ibea9984121ae88c488858b8a8e73b593195b15e0. Existing implementations of isNameConflicting could be rewritten like this: return !getConflictingNames(name).isEmpty(); But I'm not sure about that, as isNameConflicting can be implemented in a faster way than getConflictingNames. Change-Id: I11e0ba2f300adb8b3612943c304ba68bbe73db8a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-02-04Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg115-109/+136
Change-Id: Iedb54eb9d8396bc3ae66d8754c1527fd9ca655f9
2013-02-02Merge "Extract method to output the first header line of a git diff"Robin Rosenberg1-6/+27
2013-02-01Fixed problems occuring when changing user in gerrit configurationTobias Pfeifer1-1/+1
Bug: 399238 Change-Id: I255634bc9b3681f292190051daed22a4771d6e57 Signed-off-by: Tobias Pfeifer <to.pfeifer@sap.com>
2013-01-31Update to latest orbit releaseMatthias Sohn3-31/+7
Update 3rd party dependencies to respective latest approved version. args4j 2.0.21 is not yet available on Maven central, hence compile against 2.0.12 and package 2.0.21 until 2.0.21 has been published on Maven central. Change-Id: I41a34485970af41b4b5b2404e3d29c98979ddb48 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-01-30Remove PathFilterGroupTest2Robin Rosenberg1-254/+0
The test is not very useful for regression testing in its current form Change-Id: I19d1a29ff693397ac795d414b83411f32fae56d8
2013-01-30Remove debug printouts from PathFilterGroupTestRobin Rosenberg1-2/+0
Change-Id: I4767e53efafe48d447ebe399fb2f8617072950ea
2013-01-30Fix stash apply using merge logicRobin Rosenberg5-235/+199
Instead of the complicated strange stuff, implement staah apply as cherry-pick. Provided there are no conflicts and it is requested that the index should be applied, perform yet another cherry-pick, but discard tha results thereof it that would result in conflicts. Bug: 376035 Change-Id: I553f3a753e0124b102a51f8edbb53ddeff2912e2
2013-01-30Extract method to output the first header line of a git diffTobias Pfeifer1-6/+27
In order to be able to determine the range of the first header line (e.g. "diff --git a/file1 b/file2") in subclasses, the code that formats the first header line is extracted. Required by egit's change: Ia61398146c0336ab332234f24d341561292554db Change-Id: I9dd5eb964ed8b6869745c3162159b7425ac2c44a Signed-off-by: Tobias Pfeifer <to.pfeifer@sap.com>
2013-01-29Merge "Align execution environment with JRE on the classpath in jgit.ant.test"Matthias Sohn1-1/+1
2013-01-29Fix Check for FF_ONLY merges againRobin Rosenberg2-23/+36
Added more FF-mode tests Change-Id: I33eed5737d9411cc1cf214da62ce719916a1b736
2013-01-29Merge "Check for FF_ONLY merges correctly"Robin Rosenberg2-2/+41
2013-01-29Merge changes Ife0cc2da,If38507efRobin Rosenberg4-30/+833
* changes: Speed up PathFilterGroup for large sets of paths Add test case for PathFilterGroup
2013-01-28Check for FF_ONLY merges correctlyRobin Rosenberg2-2/+41
Bug: 398192 Change-Id: I1253c0ea0632185bbf9f77e32f13ba5842a6e18e
2013-01-28Align execution environment with JRE on the classpath in jgit.ant.testTomasz Zarna1-1/+1
Change-Id: Ic11ddce81dbcc7d703742c7e86941d2f43668617
2013-01-24Merge changes I25204d9e,Ia10d76e9Matthias Sohn2-1/+14
* changes: Attempt to stabilize GCTest Attempt to stabilize FileTreeIterator test on Windows
2013-01-23Attempt to stabilize GCTestRobin Rosenberg1-0/+11
File system time stamps and System.currentTimeMillis() may not necessarily be running on the same clock so add some slack. Bug: 396662 Change-Id: I25204d9e3181e15368da2902447518c6ce205017
2013-01-23Attempt to stabilize FileTreeIterator test on WindowsRobin Rosenberg1-1/+3
My guess is that the higher resolution of timestamps provided by Java on Windows causes this test to occasionally fail. Bug: 396662 Change-Id: Ia10d76e95fe6156c7ad05972619160e461606805
2013-01-22Merge "Reduce memory held and speed up DfsGarbageCollector."Colby Ranger2-7/+18
2013-01-22Reduce memory held and speed up DfsGarbageCollector.Colby Ranger2-7/+18
getObjectList() returns a list of ObjectToPack. These can hold on to a lot of memory. Furthermore, binary searching for objects in a sorted array can be slow. Improve the speed and reduce the memory by creating a copy of the ObjectId and inserting it into an ObjectIdOwnerMap. Change-Id: Ib5aa5b7447e05938b47fa55812a87b9872c20ea7
2013-01-22Enable marking entries using TreeFilters in DiffEntryRobin Stocker5-4/+285
This adds a new optional TreeFilter[] argument to DiffEntry.scan. All filters will be checked during the scan to determine if an entry should be "marked" with regard to that filter. After having called scan, the user can then call isMarked(int) on the entries to find out whether they matched the TreeFilter with the passed index. An example use case for this is in the file diff viewer of EGit's History view, where we'd like to highlight entries that are matching the current filter. See EGit change I03da4b38d1591495cb290909f0e4c6e52270e97f. Bug: 393610 Change-Id: Icf911fe6fca131b2567514f54d66636a44561af1 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-01-22Add new committersMatthias Sohn1-0/+6
Change-Id: I5ef1edb8efc4668ef4731094ea6dbbcaf200195d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-01-22Update to jsch 0.1.46Matthias Sohn2-2/+2
Change-Id: Ib7eb1ff175e3f9763653b0b0432b8ddc6b1c8938 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-01-22Merge "Fix NPE FS_Win32 when looking up git executable and home directory ↵Matthias Sohn1-3/+13
avoiding redundant code"
2013-01-21Speed up PathFilterGroup for large sets of pathsRobin Rosenberg3-30/+643
The ByteArraySet is a distorted copy of ObjectIdSubclassMap. Bug: 397185 Change-Id: Ife0cc2da6cc46431be94a6b14f64f6adbe983afb
2013-01-21Add test case for PathFilterGroupRobin Rosenberg1-0/+190
This is needed to prepare for optimization. Bug: 397185 Change-Id: If38507ef8cc5a161353cc07bf7cd1922f54d1f8a
2013-01-20Merge "Improve handling of checkout conflicts"Robin Rosenberg4-50/+106
2013-01-19Merge changes I7e7fae12,I87ecca00Robin Rosenberg4-36/+212
* changes: Add conflicts message before footer Only replace the ChangeId in the footer, not in the body
2013-01-19Add conflicts message before footerStefan Lay2-6/+61
In case of a conflict during cherry-pick or revert the commit message was amended after the footer. This made the footer invalid. Many users do not understand that they have to edit the commit message in order to make it valid again. Change-Id: I7e7fae125129e2a0d8950510550acda766531835 Bug: 367416
2013-01-19Only replace the ChangeId in the footer, not in the bodyStefan Lay2-30/+151
Additionally expose methods to find the first footer line and to find the position of the ChangeId footer in the commit message in order to enable reuse of these methods introduced for the fix. Change-Id: I87ecca009ca3bff1ca0de3c436ebd95736bf5a10 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2013-01-19Merge "Use correct method link in Javadoc"Robin Rosenberg2-4/+6
2013-01-19Merge "Fix patch application WRT windows line endings."Robin Rosenberg5-7/+32
2013-01-19Fix patch application WRT windows line endings.Markus Duft5-7/+32
Previously the result of an application would have been \r\r\n in the case of windows line endings, as RawText does not touch the \r, and ApplyCommand adds "\r\n" if this is the ending of the first line in the target file. Only always adding \n should be ok, since \r\n would be the result if the file and the patch include windows line endings. Also add according test. Change-Id: Ibd4c4948d81bd1c511ecf5fd6c906444930d236e
2013-01-19Merge "Update DfsGarbageCollector to not read back a pack index."Colby Ranger6-32/+89
2013-01-19Update DfsGarbageCollector to not read back a pack index.Colby Ranger6-32/+89
Previously, the Dfs GC excluded objects from packs by passing a previously written index to the PackWriter. Reading back a file on Dfs is slow. Instead, allow the PackWriter to expose the objects included in a pack and forward that to invocations of excludeObjects() . Change-Id: I377cb4ab07f62cf790505e1eeb0b2efe81897c79
2013-01-19Merge "Define a tree filter for user-visible changes between two indexes"Robin Rosenberg2-0/+304
2013-01-18Merge "Add additional FastForwardMode enums for different config contexts"Shawn Pearce4-4/+182
2013-01-18Add additional FastForwardMode enums for different config contextsTomasz Zarna4-4/+182
FastForwardMode is represented by different strings depending on context it is set or get from. E.g. FastForwardMode.FF_ONLY for branch.<name>.mergeoptions is "--ff-only" but for merge.ff it is "only". Change-Id: I39ae93578e4783de80ebf4af29ae23b3936eec47
2013-01-18Use correct method link in JavadocDani Megert2-4/+6
Change-Id: I7fb5a44910a4738bbb14ad025cee7cbedbba2d07 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2013-01-17Rename PackConstants to PackExt, a typed pack file extension.Colby Ranger11-55/+88
PackConstants previously contained string values for the pack and pack index extension. Change PackConstant to be PackExt, a typed wrapper around the string pack file extension. Change-Id: I86ac4db6da8f33aa42d6f37cfcc119e819444318

Back to the top