aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
Commit message (Collapse)AuthorAgeFilesLines
* Add getters to RepoProject.Yuxuan 'fishy' Wang2015-05-261-6/+6
| | | | | Change-Id: I74ded6c2c3f5985568cd77bd8799b45017fb1d09 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Cleanup code and Eclipse compile errors in new gitrepo APIAndrey Loskutov2015-05-241-2/+0
| | | | | | | | | | | | Commit d3348e introduced few errors in Eclipse. This commit cleans up the new API: - fixes API error in RepoCommand after moving IncludedFileReader type - fixes unused imports in RepoCommand & RepoCommandTest - fix javadoc errors in ManifestParser & RepoProject - makes three (implicitly final) fields in ManifestParser final. Change-Id: I4185f451d97039d155391f62815bb9d3afe39fa6 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* Merge "Refactor to expose ManifestParser."Shawn Pearce2015-05-222-0/+114
|\
| * Refactor to expose ManifestParser.Yuxuan 'fishy' Wang2015-05-222-0/+114
| | | | | | | | | | | | | | | | | | | | The repo xml manifest parser used in RepoCommand could also be useful for others, so refactor to make it public. Also this breaks backward compatibility slightly. Change-Id: I5001bd2fe77541109fe32dbe2597a065e6ad585e Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | Split discoverGitPrefix() code out into discoverGitExe()Sebastian Schuberth2015-05-212-4/+4
|/ | | | | Change-Id: I700540eec06efb24eeb09bfcb40420820c32d156 Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Replace deprecated release() methods by close()Matthias Sohn2015-05-2130-385/+313
| | | | | | | | See the discussion [1] in the Gerrit mailing list. [1] https://groups.google.com/forum/#!topic/repo-discuss/RRQT_xCqz4o Change-Id: I2c67384309c5c2e8511a7d0d4e088b4e95f819ff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix memory leak in dfs.DeltaBaseCaseShawn Pearce2015-05-111-0/+152
| | | | | | | | | | | | | | The LRU chain management code was broken leading to situations where the chain was incomplete. This prevented the cache from removing items when it exceeded its memory target, causing a leak. One case was repeated hit on the head of the chain. moveToHead(e) was invoked linking the head back to itself in a cycle orphaning the rest of the table. Add some unit tests to cover this and a few other paths. Change-Id: Ib27486eaa1b1d2bf1c745a56d0a5832bfb029322
* FS_POSIX: Rework umask detection to make it settableShawn Pearce2015-05-101-41/+16
| | | | | | | | | | | | | | | | | Avoid always calling `sh -c umask` on startup, instead deferring the invocation until the first time a working tree file needs to use the execute bit. This allows servers using bare repos to avoid a costly fork+exec for a value that is never used. Store the umask as an int instead of two Boolean. This is slightly smaller memory (one int vs. two references) and makes it easier for an application to force setting the umask to a value that overrides whatever the shell told JGit. Simplify the code to bail by returning early when canExecute is false, which is the common case for working tree files. Change-Id: Ie713647615bc5bdf5d71b731a6748c28ea21c900
* ObjectWalk: make setRetainBody(false) the defaultShawn Pearce2015-05-101-5/+5
| | | | | | | | | | | | | | | Despite being the primary author of RevWalk and ObjectWalk I still fail to remember to setRetainBody(false) in application code using an ObjectWalk to examine the graph. Document the default for RevWalk is setRetainBody(true), where the application usually wants the commit bodies to display or inspect. Change the default for ObjectWalk to setRetainBody(false), as nearly all callers want only the graph shape and do not need the larger text inside a commit body. This allows some code in JGit to be simplified. Change-Id: I367e42209e805bd5e1f41b4072aeb2fa98ec9d99
* Merge changes I62befa4a,Ia9c3d123,I7fcf6534Shawn Pearce2015-05-095-602/+72
|\ | | | | | | | | | | | | * changes: Delete deprecated PackWriter.preparePack() methods Delete deprecated class IgnoreRule Delete deprecated checkoutEntry() methods in DirCacheCheckout
| * Delete deprecated class IgnoreRuleMatthias Sohn2015-04-255-602/+72
| | | | | | | | | | | | Was replaced by FastIgnoreRule in 3.6 Change-Id: Ia9c3d1231a5d97f3f5bddc81113954c9f9d8ee1e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add fsck.allowInvalidPersonIdent to accept invalid author/committersShawn Pearce2015-04-301-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A larger than expected number of real-world repositories found on the Internet contain invalid author, committer and tagger lines in their history. Many of these seem to be caused by users misusing the user.name and user.email fields, e.g.: [user] name = Au Thor <author@example.com> email = author@example.com that some version of Git (or a reimplementation thereof) copied directly into the object header. These headers are not valid and are rejected by a strict fsck, making it impossible to transfer the repository with JGit/EGit. Another form is an invalid committer line with double negative for the time zone, e.g. committer Au Thor <a@b> 1288373970 --700 The real world is messy. :( Allow callers and users to weaken the fsck settings to accept these sorts of breakages if they really want to work on a repo that has broken history. Most routines will still function fine, however commit timestamp sorting in RevWalk may become confused by a corrupt committer line and sort commits out of order. This is mostly fine if the corrupted chain is shorter than the slop window. Change-Id: I6d529542c765c131de590f4f7ef8e7c1c8cb9db9
* | Merge branch 'stable-3.7'Matthias Sohn2015-04-271-15/+0
|\ \ | |/ |/| | | | | | | | | | | | | * stable-3.7: Prepare 3.7.2-SNAPSHOT builds JGit v3.7.1.201504261725-r Revert "Let ObjectWalk.markUninteresting also mark the root tree as" Change-Id: If1b62ff695e063d797c3d13c43e488ca56f29cbe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.7.2-SNAPSHOT buildsstable-3.7Matthias Sohn2015-04-272-40/+40
| | | | | | | | | | Change-Id: Ia42a665e76953b643a080b58d2cd4526575ddf2e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.7.1.201504261725-rv3.7.1.201504261725-rMatthias Sohn2015-04-262-2/+2
| | | | | | | | | | Change-Id: I80639e317df80c103aef5cad75ad9079d43fb9d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge "Revert "Let ObjectWalk.markUninteresting also mark the root tree as"" ↵Matthias Sohn2015-04-261-15/+0
| |\ | | | | | | | | | into stable-3.7
| | * Revert "Let ObjectWalk.markUninteresting also mark the root tree as"David Ostrovsky2015-04-261-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Iff2de881 tried to fix missing tree ..." but introduced severe performance degradation (>10x in some cases) when acting as server (git push) and as client (replication). IOW cure is worse than the disease. This reverts commit c4797fe98655b3d52d0a90ba44fce6e053db3b8b. Change-Id: I4e6056eb352d51277867f857a0cab380eca153ac Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | Do not add a newline at the end if neither merged side had oneAndré de Oliveira2015-03-272-12/+54
| | | | | | | | | | | | | | | | | | Bug: 390833 Change-Id: I29f7b79b241929877c93ac485c677487a91bb77b Signed-off-by: André de Oliveira <andre.oliveira@liferay.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Make RepositoryState.REBASING_MERGE reachable again.Laurent Delaigue2015-03-272-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a non interactive rebase is launched, stopping after a conflict should set the repository state to RepositoryState.REBASING_MERGE instead of RepositoryState.REBASING_INTERACTIVE. Bug: 452623 Change-Id: Ie885aab6d71dabd158a718af0d14fff643c9b850 Also-by: Arthur Daussy <arthur.daussy@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix RecursiveMerger in case of multiple, independent base commitsChristian Halstrick2015-03-251-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When RecursiveMerger found that there are multiple base-commits for the commits to be merged it tries to temporarily merge the base commits. But if these base commits have no common predecessor there was a bug in JGit leading to a NPE. This commit fixes this by enforcing that an empty tree is used as base when merging two unrelated base commits. This logic was already there when merging two commits which have no common predecessor (ThreeWayMerger.mergeBase()). But the code which was computing a new temporary base commit in case of criss-cross merges didn't take care to pick an empty tree when no common predecessor can be found. Bug: 462671 Change-Id: Ibd96302f5f81383f36d3b1e3edcbf5822147b1a4
* | | TestRepository: Add a cherryPick methodDave Borowitz2015-03-231-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CherryPickCommand only works on a non-bare repository, as it must modify the working tree and index in case of a merge conflict. In tests, being able to recover from a merge conflict is less important, as the caller should be able to control the full contents of files in advance of the cherry-pick. Change-Id: Ic332e44df1308b9336e884666b08c1f6db64513d
* | | Merge bundle org.eclipse.jgit.java7 into org.eclipse.jgitMatthias Sohn2015-03-2310-17/+1177
| | | | | | | | | | | | | | | | | | | | | As we moved minimum Java version to 7 we don't need a separate bundle and feature for JGit features depending on Java 7 anymore. Change-Id: Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Revert "CommitBuilder should check for duplicate parents"Jonathan Nieder2015-03-182-108/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6bc48cdc62287934ce1b7003280b19a5994e7668. Until git v1.7.10.2~29^2~1 (builtin/merge.c: reduce parents early, 2012-04-17), C git merge would make merge commits with duplicate parents when asked to with a series of commands like the following: git checkout origin/master git merge --no-ff origin/master Nowadays "git merge" removes redundant parents more aggressively (whenever one parent is an ancestor of another and not just when duplicates exist) but merges with duplicate parents are still permitted and can be created with git fast-import or git commit-tree and history viewers need to be able to cope with them. CommitBuilder is an interface analagous to commit-tree, so it should allow duplicate parents. (That said, an option to automatically remove redundant parents would be useful.) Reported-by: Dave Borowitz <dborowitz@google.com> Change-Id: Ia682238397eb1de8541802210fa875fdd50f62f0 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | TemporaryBuffer: Allow presizing block pointer listDave Borowitz2015-03-181-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers may wish to use TemporaryBuffer as an essentially unbounded buffer by passing Integer.MAX_VALUE as the size. (This makes it behave like ByteArrayOutputStream, only without requiring contiguous memory.) Unfortunately, it was always allocating an array in the backing block pointer list to hold enough blocks to MAX_VALUE--all 262,016 of them. It wasn't allocating the blocks themselves, but this array was still extremely wasteful, using about 2MiB of memory on a 64-bit system. Tweak the interface to specify an estimated size, and only allocate the block pointer list enough entries to hold that size. It's an ArrayList, so if that estimate was wrong, it'll grow. We assume the cost of finding enough contiguous memory to grow that array is acceptable. While we're in there, fix an off-by-one error: due to integer division we were undercounting the number of blocks needed to store n bytes of data as (n / SZ). Change-Id: I794eca3ac4472bcc605b3641e177922aca92b9c0
* | | CommitBuilder should check for duplicate parentsChristian Halstrick2015-03-122-26/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the parents of a commit with setParentIds() or addParentId() it should be checked that we don't have duplicate parents. An IllegalArgumentException should be thrown in this case. Change-Id: I9fa9f31149b7732071b304bca232f037146de454 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | | TestRepository: Allow setting explicit Change-IdDave Borowitz2015-03-121-0/+11
| | | | | | | | | | | | | | | | | | | | | This includes both leaving existing Change-Ids alone (as, for example Gerrit's commit-msg hook does) and programmatically setting a value. Change-Id: Iaaffb0107ae27de24df1f0e95a8d628fb8ea5364
* | | TestRepository: Ignore existing Change-Id in messageDave Borowitz2015-03-121-0/+10
| | | | | | | | | | | | Change-Id: I343c3065fa369ef8aab2b033ac1e392b28d10daf
* | | TestRepository: Support committing to unborn symrefDave Borowitz2015-03-121-0/+10
| | | | | | | | | | | | Change-Id: I6bcee635adda7c929f6fa68ef20438fe77e49184
* | | TestRepository: Add methods to amend commits or refsDave Borowitz2015-03-121-1/+105
| | | | | | | | | | | | Change-Id: I47082416f6e281262b160ba15272258f9109abd1
* | | TestRepository: Add a reset method to move HEAD aroundDave Borowitz2015-03-121-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | This flushed out a number of bugs in the way DfsRefUpdate, or at least the InMemoryRepository implementation, processes symrefs. These have been fixed, to an extent, in InMemoryRepository, but other implementations may still suffer from these bugs. Change-Id: Ifd12115a0060b9ff45a88d305b72f91ca0472f9a
* | | TestRepository: Optionally insert Change-Id in commit messageDave Borowitz2015-03-121-0/+88
| | | | | | | | | | | | | | | | | | Copied the implementation from CommitCommand. Change-Id: Iade0e2d70bde70cfa830fe23bcc41959b011a14a
* | | Merge "ArchiveCommand: Allow to pass options to underlying stream"Shawn Pearce2015-03-111-3/+38
|\ \ \
| * | | ArchiveCommand: Allow to pass options to underlying streamDavid Ostrovsky2015-02-201-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current ArchiveCommand design doesn't allow to pass in options to underlying stream implementations. To overcome this, client has to implement custom format implementation (it cannot be derived from the existing one, because the classes are marked as final), and set the options using ThreadLocal, before the method ArchiveOutputStream createArchiveOutputStream(OutputStream s) is get called. This change extends the ArchiveCommand.Format by allowing to pass option map during creation of ArchiveOutputStream. ArchiveCommand is extended correspondingly. That way client can easily pass options to the underlying streams: Map<String, Object> level = ImmutableMap.<String, Object> of( "level", new Integer(9)); new ArchiveCommand(repo) .setFormat("zip") .setFormatOptions(level) .setTree(tree) .setPaths(paths) .setPrefix(prefix) .setOutputStream(sidebandOut) .call(); Change-Id: I1d92a1e5249117487da39d19c7593e4b812ad97a Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | | Add "--long" option to JGit describeChristian Halstrick2015-03-091-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native git supports "git describe --long". This will enforce returning a long description of a commit even if a tag is directly pointing to the commit (in contrast to just returning the tag name as it is now). This commit teaches JGits DescribeCommand and the describe command in the pgm package to support "--long". Bug: 460991 Change-Id: I65e179b79e89049c6deced3c71cb3ebb08ed0a8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Add an in-process pack transport for use in testsDave Borowitz2015-02-272-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for testing arbitrary sets of push/fetch hooks (e.g. PreReceiveHook) without depending on either an external protocol (e.g. HTTP) or the local filesystem. Change-Id: I4ba2fff9c8a484f990dea05e14b0772deddb7411
* | | | Merge branch 'stable-3.7'Matthias Sohn2015-02-271-0/+17
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | * stable-3.7: Prepare 3.7.1-SNAPSHOT builds JGit v3.7.0.201502260915-r Read user.name and email from environment first Provide more details in exceptions thrown when packfile is invalid Change-Id: I427f861c6bc94da5e3e05dbbebbf0ad15719a323 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * / Prepare 3.7.1-SNAPSHOT buildsMatthias Sohn2015-02-272-40/+40
| |/ | | | | | | | | Change-Id: I2e97610ea9e552e5800e7ca895fd193c8bc507aa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.7.0.201502260915-rv3.7.0.201502260915-rMatthias Sohn2015-02-262-2/+2
| | | | | | | | | | Change-Id: Iec17746cad81cfb1d775e782b30f9d8a13c938b6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Read user.name and email from environment firstMatthias Sohn2015-02-241-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to [1] user name and email are taken first from the environment variables: GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL In case (some of) these environment variables are not set, the information is taken from the git configuration. JGit doesn not yet support the environment variables GIT_AUTHOR_DATE and GIT_COMMITTER_DATE. [1] https://www.kernel.org/pub/software/scm/git/docs/git-commit-tree.html#_commit_information Bug: 460586 Change-Id: I3ba582b4ae13674cf319652b5b13ebcbb96dd8ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Move console classes to pgm bundleMatthias Sohn2015-02-103-13/+0
| | | | | | | | | | | | | | | | | | Since we updated minimum Java version to Java 7 the console bundle doesn't need to be a separate bundle anymore. Move the contained classes to the pgm bundle which is using these classes. Change-Id: If8e6f2d7405fdfe6f4b178673b4ccf99c67d4b64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Set minimum required Java version to Java 7Matthias Sohn2015-02-093-5/+5
| | | | | | | | | | | | Bug: 458475 Change-Id: Iea8f2236d4e6a94a8d14bb8cc685006ea3fd1bb7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-3.7'Matthias Sohn2015-02-041-0/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: Add option --orphan for checkout Prepare post 3.7.0.201502031740-rc1 builds JGit v3.7.0.201502031740-rc1 Support for the pre-commit hook Fix FileUtils.testRelativize_mixedCase which failed on Mac OS X Add a hook test Introduce hook support into the FS implementations If a pack isn't found on disk remove it from pack list Conflicts: org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF Change-Id: I936acd24d47b911fa30ab29856094e1b2c6ac3db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.7.0.201502031740-rc1 buildsMatthias Sohn2015-02-042-2/+2
| | | | | | | | Change-Id: Id3728e771a4441757de016cc9d68055f668126b0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.7.0.201502031740-rc1v3.7.0.201502031740-rc1Matthias Sohn2015-02-032-2/+2
| | | | | | | | | | Change-Id: Ia2ea65945b7e1d4120da3d6e6c9f6d5fdb642ae6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix FileUtils.testRelativize_mixedCase which failed on Mac OS XMatthias Sohn2015-02-021-19/+8
| | | | | | | | | | | | | | HFS is case insensitive hence expecting it to return the result for case sensitive filesystem doesn't work. Change-Id: I292eab78e50711529a0412f9a54e174a3ac16109 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Introduce hook support into the FS implementationsLaurent Goubet2015-02-021-0/+79
| | | | | | | | | | | | | | | | | | | | | | This introduces the background plumbing necessary to run git hooks from JGit. This implementation will be OS-dependent as it aims to be compatible with existing hooks, mostly written in Shell. It is compatible with unix systems and windows as long as an Unix emulator such as Cygwin is in its PATH. Change-Id: I1f82a5205138fd8032614dd5b52aef14e02238ed Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 4.0.0-SNAPSHOT buildsMatthias Sohn2015-01-272-40/+40
|/ | | | | Change-Id: I414ba8ccc82866d3107ba7083a567ea70c879bdf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix RawText.getLineDelimiter() for empty first lineFrank Wagner2015-01-171-0/+7
| | | | | | Bug: 456776 Change-Id: Iae50be89ea6d5aee33bd938a937ac5ca578aabca Signed-off-by: Frank Wagner <frank.wagner@fr.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add basic support for .gitattributesArthur Daussy2015-01-076-0/+1250
| | | | | | | | | | | | | | | | | | | | | | Core classes to parse and process .gitattributes files including support for reading attributes in WorkingTreeIterator and the dirCacheIterator. The implementation follows the git ignore implementation. It supports lazy reading attributes while walking the working tree. Bug: 342372 CQ: 9078 Change-Id: I05f3ce1861fbf9896b1bcb7816ba78af35f3ad3d Also-by: Marc Strapetz <marc.strapetz@syntevo.com> Also-by: Gunnar Wagenknecht <gunnar@wagenknecht.org> Also-by: Arthur Daussy <arthur.daussy@obeo.fr> Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org> Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com> Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* AIOOB in ChangeIdUtil.indexOfChangeId if amended message is a newlineAndrey Loskutov2015-01-061-0/+4
| | | | | Bug: 456792 Change-Id: Idf38a0db7dc72d672ff185dcac2f41f0012a6673 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>