summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* JGit v2.3.0.201302130906v2.3.0.201302130906Matthias Sohn2013-02-1339-39/+39
| | | | | Change-Id: If2e5fcbc01c2a7f058ef13d60b0bba5f77300d52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Replace explicit version by property where possibleMatthias Sohn2013-02-134-8/+8
| | | | | Change-Id: Ibb3b983d01133fd98477d9284118d8220846f0e9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add better documentation to DirCacheCheckoutChristian Halstrick2013-02-071-1/+139
| | | | | Change-Id: I282b702d9e4cb19063d8e9503604538f80e955b7 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* Prepare post 2.3rc1 buildsMatthias Sohn2013-02-0639-49/+49
| | | | Change-Id: I5c7daa5a735bfc2ecb9adc11c392b94d235102b6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v2.3.0.201302060400-rc1v2.3.0.201302060400-rc1Matthias Sohn2013-02-0639-50/+50
| | | | | Change-Id: Id1f1d174375f7399cee4c2eb23368d4dbb4c384a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add getConflictingNames to RefDatabaseRobin Stocker2013-02-062-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>
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-04115-109/+136
| | | | Change-Id: Iedb54eb9d8396bc3ae66d8754c1527fd9ca655f9
* Merge "Extract method to output the first header line of a git diff"Robin Rosenberg2013-02-021-6/+27
|\
| * Extract method to output the first header line of a git diffTobias Pfeifer2013-01-301-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>
* | Fixed problems occuring when changing user in gerrit configurationTobias Pfeifer2013-02-011-1/+1
| | | | | | | | | | Bug: 399238 Change-Id: I255634bc9b3681f292190051daed22a4771d6e57 Signed-off-by: Tobias Pfeifer <to.pfeifer@sap.com>
* | Update to latest orbit releaseMatthias Sohn2013-01-313-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>
* | Remove PathFilterGroupTest2Robin Rosenberg2013-01-301-254/+0
| | | | | | | | | | | | The test is not very useful for regression testing in its current form Change-Id: I19d1a29ff693397ac795d414b83411f32fae56d8
* | Remove debug printouts from PathFilterGroupTestRobin Rosenberg2013-01-301-2/+0
| | | | | | | | Change-Id: I4767e53efafe48d447ebe399fb2f8617072950ea
* | Fix stash apply using merge logicRobin Rosenberg2013-01-305-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
* | Merge "Align execution environment with JRE on the classpath in jgit.ant.test"Matthias Sohn2013-01-291-1/+1
|\ \ | |/ |/|
| * Align execution environment with JRE on the classpath in jgit.ant.testTomasz Zarna2013-01-281-1/+1
| | | | | | | | Change-Id: Ic11ddce81dbcc7d703742c7e86941d2f43668617
* | Fix Check for FF_ONLY merges againRobin Rosenberg2013-01-292-23/+36
| | | | | | | | | | | | Added more FF-mode tests Change-Id: I33eed5737d9411cc1cf214da62ce719916a1b736
* | Merge "Check for FF_ONLY merges correctly"Robin Rosenberg2013-01-282-2/+41
|\ \
| * | Check for FF_ONLY merges correctlyRobin Rosenberg2013-01-292-2/+41
| |/ | | | | | | | | Bug: 398192 Change-Id: I1253c0ea0632185bbf9f77e32f13ba5842a6e18e
* | Merge changes Ife0cc2da,If38507efRobin Rosenberg2013-01-284-30/+833
|\ \ | | | | | | | | | | | | | | | * changes: Speed up PathFilterGroup for large sets of paths Add test case for PathFilterGroup
| * | Speed up PathFilterGroup for large sets of pathsRobin Rosenberg2013-01-213-30/+643
| | | | | | | | | | | | | | | | | | | | | The ByteArraySet is a distorted copy of ObjectIdSubclassMap. Bug: 397185 Change-Id: Ife0cc2da6cc46431be94a6b14f64f6adbe983afb
| * | Add test case for PathFilterGroupRobin Rosenberg2013-01-211-0/+190
| |/ | | | | | | | | | | | | This is needed to prepare for optimization. Bug: 397185 Change-Id: If38507ef8cc5a161353cc07bf7cd1922f54d1f8a
* | Merge changes I25204d9e,Ia10d76e9Matthias Sohn2013-01-242-1/+14
|\ \ | | | | | | | | | | | | | | | * changes: Attempt to stabilize GCTest Attempt to stabilize FileTreeIterator test on Windows
| * | Attempt to stabilize GCTestRobin Rosenberg2013-01-231-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
| * | Attempt to stabilize FileTreeIterator test on WindowsRobin Rosenberg2013-01-231-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
* | Merge "Reduce memory held and speed up DfsGarbageCollector."Colby Ranger2013-01-222-7/+18
|\ \
| * | Reduce memory held and speed up DfsGarbageCollector.Colby Ranger2013-01-222-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
* | | Enable marking entries using TreeFilters in DiffEntryRobin Stocker2013-01-235-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>
* | | Add new committersMatthias Sohn2013-01-231-0/+6
| | | | | | | | | | | | | | | Change-Id: I5ef1edb8efc4668ef4731094ea6dbbcaf200195d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Update to jsch 0.1.46Matthias Sohn2013-01-232-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib7eb1ff175e3f9763653b0b0432b8ddc6b1c8938 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Fix NPE FS_Win32 when looking up git executable and home directory ↵Matthias Sohn2013-01-221-3/+13
|\ \ \ | |_|/ |/| | | | | avoiding redundant code"
| * | Fix NPE FS_Win32 when looking up git executable and home directoryTobias Pfeifer2013-01-101-3/+13
| | | | | | | | | | | | | | | | | | | | | avoiding redundant code Bug: 397336 Change-Id: I60e1baa52e00c5ec3915b859bfc6a4572611cc89
* | | Merge "Improve handling of checkout conflicts"Robin Rosenberg2013-01-204-50/+106
|\ \ \
| * | | Improve handling of checkout conflictsMarkus Duft2013-01-114-50/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This converts a checkout conflict exception into a RebaseResult / MergeResult containing the conflicting paths, which enables EGit (or others) to handle the situation in a user-friendly way Change-Id: I48d9bdcc1e98095576513a54a225a42409f301f3
* | | | Merge changes I7e7fae12,I87ecca00Robin Rosenberg2013-01-194-36/+212
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add conflicts message before footer Only replace the ChangeId in the footer, not in the body
| * | | | Add conflicts message before footerStefan Lay2013-01-192-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
| * | | | Only replace the ChangeId in the footer, not in the bodyStefan Lay2013-01-192-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>
* | | | | Merge "Use correct method link in Javadoc"Robin Rosenberg2013-01-192-4/+6
|\ \ \ \ \
| * | | | | Use correct method link in JavadocDani Megert2013-01-182-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7fb5a44910a4738bbb14ad025cee7cbedbba2d07 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
* | | | | | Merge "Fix patch application WRT windows line endings."Robin Rosenberg2013-01-195-7/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix patch application WRT windows line endings.Markus Duft2013-01-195-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
* | | | | Merge "Update DfsGarbageCollector to not read back a pack index."Colby Ranger2013-01-186-32/+89
|\ \ \ \ \
| * | | | | Update DfsGarbageCollector to not read back a pack index.Colby Ranger2013-01-186-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
* | | | | | Merge "Define a tree filter for user-visible changes between two indexes"Robin Rosenberg2013-01-182-0/+304
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Define a tree filter for user-visible changes between two indexesRobin Rosenberg2013-01-152-0/+304
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary purpose of the filter is to detect an index change that could possibly lead to a change in what files are visible in the staging view and decorations. Besides what TreeFilter.ANY_DIFF does for trees in general, this filter also looks at the assume-valid (CE_VALID) flag to see whether changes should be ignored or not. Change-Id: I13e9ed4ae62dc3851204fba598239edce07ca977
* | | | | Merge "Add additional FastForwardMode enums for different config contexts"Shawn Pearce2013-01-184-4/+182
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-184-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
* / / / Rename PackConstants to PackExt, a typed pack file extension.Colby Ranger2013-01-1711-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
* | | Remove getReverseIndexSize() from DfsPackDescription.Colby Ranger2013-01-152-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The method is used in only one location (DfsPackFile). Furthermore, PackIndex already does an explicit computation of the size in DfsPackFile. Simplify the DfsPackDescription by removing the method and do the calculation similar to PackIndex. Change-Id: I1391fdaaf7c2c3226d96ada1ae8647bcdff4794e
* | | Use file extension with DfsPackDescription get/set file size.Colby Ranger2013-01-156-40/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the size getters and setters had explicit methods for index and pack. Update the api to be based on the file extension. This will make it possible to support other extensions in the future, such as the forthcoming bitmap extensions. Change-Id: Iab9d4abe0af65b2fc71ad71ef1db0feb6b3b5c58
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 14:25:37 +0000