summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 2.4.0-SNAPSHOT buildsMatthias Sohn2013-02-142-33/+33
| | | | | Change-Id: I4ab2baeb5d598d40d5dadfccdfe75152a1b9b7bf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix Config.fromText to not skip a last line with no newlineDave Borowitz2013-02-081-0/+9
| | | | Change-Id: Id6da6ff19296410806282bb7419fd8455e8c5475
* Add getConflictingNames to RefDatabaseRobin Stocker2013-02-061-0/+148
| | | | | | | | | | | | | | | | | | 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-04114-674/+125
| | | | Change-Id: Iedb54eb9d8396bc3ae66d8754c1527fd9ca655f9
* 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-301-9/+67
| | | | | | | | | | | | 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
* Fix Check for FF_ONLY merges againRobin Rosenberg2013-01-291-22/+35
| | | | | | Added more FF-mode tests Change-Id: I33eed5737d9411cc1cf214da62ce719916a1b736
* Merge "Check for FF_ONLY merges correctly"Robin Rosenberg2013-01-281-0/+39
|\
| * Check for FF_ONLY merges correctlyRobin Rosenberg2013-01-291-0/+39
| | | | | | | | | | Bug: 398192 Change-Id: I1253c0ea0632185bbf9f77e32f13ba5842a6e18e
* | Merge changes Ife0cc2da,If38507efRobin Rosenberg2013-01-282-0/+446
|\ \ | | | | | | | | | | | | | | | * changes: Speed up PathFilterGroup for large sets of paths Add test case for PathFilterGroup
| * | Speed up PathFilterGroup for large sets of pathsRobin Rosenberg2013-01-211-0/+256
| | | | | | | | | | | | | | | | | | | | | 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
* / Enable marking entries using TreeFilters in DiffEntryRobin Stocker2013-01-231-1/+69
|/ | | | | | | | | | | | | | | | | | | | 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>
* Merge "Improve handling of checkout conflicts"Robin Rosenberg2013-01-201-48/+26
|\
| * Improve handling of checkout conflictsMarkus Duft2013-01-111-48/+26
| | | | | | | | | | | | | | 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-192-4/+124
|\ \ | | | | | | | | | | | | | | | * changes: Add conflicts message before footer Only replace the ChangeId in the footer, not in the body
| * | Add conflicts message before footerStefan Lay2013-01-191-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-4/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Fix patch application WRT windows line endings."Robin Rosenberg2013-01-194-0/+28
|\ \ \
| * | | Fix patch application WRT windows line endings.Markus Duft2013-01-194-0/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-4/+14
|\ \ \
| * | | Update DfsGarbageCollector to not read back a pack index.Colby Ranger2013-01-181-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+199
|\ \ \ \ | |/ / / |/| | |
| * | | Define a tree filter for user-visible changes between two indexesRobin Rosenberg2013-01-151-0/+199
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* / / Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-181-0/+69
|/ / | | | | | | | | | | | | | | 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
* / Fix concurrent creation of fan-out object directoriesRoberto Tyley2013-01-131-0/+77
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple threads attempted to insert loose objects into the same new fan-out directory, the creation of that directory was subject to a race condition that could lead to an unnecessary IOException being thrown - because an inserter could not 'create' a directory that had just been generated by a different thread. All we require is that the directory does indeed *exist*, so not being able to _create_ it is not actually a fatal problem. Setting 'skipExisting' to 'true' on the call to mkdir() fixes the issue. I found this issue as a real world occurrence while working on The BFG Repo Cleaner (https://github.com/rtyley/bfg-repo-cleaner), a tool which concurrently performs a lot of object creation. In order to demonstrate the problem here I've added a small test case which reliably reproduces the issue on the few different hardware systems I've tried. The error thrown when the race-condition arises is this: java.io.IOException: Creating directory /home/roberto/repo.git/objects/e6 failed at org.eclipse.jgit.util.FileUtils.mkdir(FileUtils.java:182) at org.eclipse.jgit.storage.file.ObjectDirectory.insertUnpackedObject(ObjectDirectory.java:590) at org.eclipse.jgit.storage.file.ObjectDirectoryInserter.insertOneObject(ObjectDirectoryInserter.java:113) at org.eclipse.jgit.storage.file.ObjectDirectoryInserter.insert(ObjectDirectoryInserter.java:91) at org.eclipse.jgit.lib.ObjectInserter.insert(ObjectInserter.java:329) Change-Id: I88eac49bc600c56ba9ad290e6133d8a7113125ab
* Accept '-' instead of space in enum config valuesShawn Pearce2013-01-111-1/+1
| | | | | | | | | This is necessary because some versions of JGit containing the flawed c98abc9c0586c73ef7df4172644b7dd21c979e9d were used in the wild and wrote bad configuration files. We now must accept this value in addition to the preferred case. Change-Id: I3ed5451735658df6381532499130e5186805024a
* Revert "Add additional FastForwardMode enums for different config contexts"Shawn Pearce2013-01-111-77/+2
| | | | | | This reverts commit c98abc9c0586c73ef7df4172644b7dd21c979e9d. Change-Id: I1d2a0de81eb17860ee36b6d3d3c00959b880fb85
* Fix enum parsing from Config filesShawn Pearce2013-01-111-0/+3
| | | | Change-Id: Ib0b86ceab070d46903de7b55f2fd441714855141
* Merge changes Ifc8fc3e5,I7c403b50Colby Ranger2013-01-102-3/+2
|\ | | | | | | | | | | * changes: Remove packIndex field from FileObjDatabase openPack method. Update DfsObjDatabase API to open/write by pack extension.
| * Remove packIndex field from FileObjDatabase openPack method.Colby Ranger2013-01-102-3/+2
| | | | | | | | | | | | | | | | | | | | | | Previously, the FileObjDatabase required both the pack file path and index file path to be passed to openPack(). A future change to add a bitmap index will add a .bitmap file parallel to the pack file (similar to the .idx file). Update the PackFile to support automatically loading pack index extensions based on the pack file path. Change-Id: Ifc8fc3e57f4afa177ba5a88df87334dbfa799f01
* | Peel tags during resolve of foo^Dave Borowitz2013-01-101-0/+2
|/ | | | | | | | | Once we start talking about parents of tags, we are in the commit graph, so treat all objects from this point as commits. This fixes spurious IncorrectObjectTypeExceptions on resolving expressions like tag^^. Change-Id: I29ece1fdb49c9c5b9ca415efcd1876bc72e97120
* Delete the iplog generator, cont'dRobin Rosenberg2013-01-091-1/+0
| | | | Change-Id: I1f5e8dad3f61fde0d0573817d10e25a7384885d2
* Delete the iplog generatorMatthias Sohn2013-01-092-12/+0
| | | | | | | | | | | It stopped working when we moved to the Eclipse foundation's Gerrit server since it doesn't use the Gerrit internal user store but LDAP. Instead, since 2.0, we use the Eclipse foundation's automatic IP log generator [1] to generate IP logs for releasing jgit and egit. [1] http://www.eclipse.org/projects/ip_log_selector.php Change-Id: I98dc65efb62909bc0258e6c680df0c93a57e9677 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Return info about config subsection when trying to get an invalid enumTomasz Zarna2013-01-081-0/+19
| | | | Change-Id: Id4a72a68bdbd485619f4801683d38ad98f9841a2
* Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-061-2/+77
| | | | | | | FastForwardMode should be represented by different enums 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: I3ecc16d48e715b81320b73ffae4caf3558f965f2
* Ignore removed files with an assume-valid index entryRobin Rosenberg2013-01-031-4/+9
| | | | | | Bug: 347067 Change-Id: I5472e69dc77e26b5f248a4a04295775cf5051215 Signed-off-by: Chris Aniszczyk <zx@twitter.com>
* Update the revert command and things relating to revertRobin Rosenberg2012-12-281-0/+208
| | | | | | | | | | | | | | | | | Cherry-pick has been fixed, but even though revert does basically the same thing, the fixes were not carried over here. - Recognize the revert-states, analogous to the cherry picking states - Make reset handle a revert-in-progress - Update REVERT_HEAD and MERGE_MSG when revert fails due to conflicts - Clear revert state on commit and reset - Format the message similarily to how cherry-pick does. This is not exactly how C Git does it. The interface is still not the same as for cherry-picking. Change-Id: I8ea956fcbc9526d62a2365360feea23a9280eba3 Signed-off-by: Chris Aniszczyk <zx@twitter.com>
* Hide deprecation warnings in some test classesRobin Rosenberg2012-12-274-0/+4
| | | | | | | | These test classes heavily rely on Tree and associated classes. They are convenient for building test cases and hence not yet replaced, but there is a deprecation warning at about every line, which is not helpful. Change-Id: Ia7cc8f3bb980dc03055b94748b6c7529a82ea5a5
* Declare essentially static methods as staticRobin Rosenberg2012-12-2738-72/+87
| | | | Change-Id: I83ca25fb569c0dbc36eb374d5437fcf2b65a6f68
* Add type argumente to some raw reclarationRobin Rosenberg2012-12-274-14/+16
| | | | Change-Id: Ief195fb5c55f75172f0428fdac8c8874292ae566
* Prepare 2.3.0 buildsMatthias Sohn2012-12-212-33/+33
| | | | | Change-Id: I0ca539e8cfe444f96c64dc56d1f0ef33b66e0cff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 2.2.0.201212191850-r buildsstable-2.2Matthias Sohn2012-12-212-2/+2
| | | | Change-Id: I1a0fe51c71551fcfc98f5dd435eb283fd661b77a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v2.2.0.201212191850-rv2.2.0.201212191850-rMatthias Sohn2012-12-202-2/+2
| | | | | Change-Id: Idc49f17d03886b6a1e61a94ff81e32625c8675d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* DirCacheIterator: Fix reset() and back()Robin Rosenberg2012-12-151-0/+128
| | | | | | | | | | | | | | reset() was broken and probably only worked when the position was at the beginning. More serious was that back() sometimes descended into the tree rather than skipping backward at the same level. Sometimes this would result in false conflicts, but one could suspect silent errors too. back() is called by the NamingConflictTreeWalk when looking for directory/file conflicts. Also added toString to DirCacheTree to simplify debugging. Bug: 396127 Change-Id: Iaa1b4e20e623d84c2e5ac26748f42e991080dbcd
* Support --cached in RmCommandRobin Stocker2012-12-031-1/+15
| | | | | | | | Also extend documentation and add examples. Bug: 395599 Change-Id: Id1ddbc9da787472f82e58834092bc073224b262b Signed-off-by: Chris Aniszczyk <zx@twitter.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 02:42:51 +0000