]> source.dussan.org Git - jgit.git/log
jgit.git
9 years agoAllow trailing newlines in receive-pack 65/49965/5
Dave Borowitz [Wed, 10 Jun 2015 19:47:04 +0000 (12:47 -0700)]
Allow trailing newlines in receive-pack

C git's receive-pack.c strips trailing newlines in command lists when
present[1], although send-pack.c does not send them, at least in the
case of command lists[2]. Change JGit to match this behavior.
Add tests.

This also fixes parsing of commands in the push cert, which, unlike
commands sent in the non-push case, always have trailing newlines.

[1] https://github.com/git/git/blob/7974889a053574e449b55ca543a486e38e74864f/builtin/receive-pack.c#L1380
where packet_read_line chomps newlines:
https://github.com/git/git/blob/7974889a053574e449b55ca543a486e38e74864f/pkt-line.c#L202

[2] https://github.com/git/git/blob/7974889a053574e449b55ca543a486e38e74864f/send-pack.c#L470

Change-Id: I4bca6342a7482a53c9a5815a94b3c181a479d04b

9 years agoMerge changes I38e1798e,Id1fe1c20,I945ba188,I2c6be9cb
Jonathan Nieder [Wed, 10 Jun 2015 20:40:10 +0000 (16:40 -0400)]
Merge changes I38e1798e,Id1fe1c20,I945ba188,I2c6be9cb

* changes:
  Allow setting detail message and cause when constructing most exceptions
  Use message from ServiceNotAuthorizedException, ServiceNotEnabledException
  dumb HTTP: Clarify AsIsFilter by introducing req and res locals
  Clarify description of ServiceNotAuthorizedException

9 years agoMerge "UploadPack: Use reachable-sha1-in-want configuration"
Shawn Pearce [Wed, 10 Jun 2015 02:14:35 +0000 (22:14 -0400)]
Merge "UploadPack: Use reachable-sha1-in-want configuration"

9 years agoAdd missing imports for javadoc to ObjectCountCallback 81/49881/1
Jonathan Nieder [Wed, 10 Jun 2015 01:36:58 +0000 (18:36 -0700)]
Add missing imports for javadoc to ObjectCountCallback

Change-Id: I24780a28c01047654d81af09045d88c6a84950b6
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoMerge "Fix public API issues introduced in I1baeedcc6946."
Jonathan Nieder [Wed, 10 Jun 2015 00:45:15 +0000 (20:45 -0400)]
Merge "Fix public API issues introduced in I1baeedcc6946."

9 years agoFix public API issues introduced in I1baeedcc6946. 72/49872/3
Yuxuan 'fishy' Wang [Wed, 10 Jun 2015 00:07:55 +0000 (17:07 -0700)]
Fix public API issues introduced in I1baeedcc6946.

Move ObjectCountCallback and WriteAbortedException to package
org.eclipse.jgit.transport, so that they'll become public API.

Change-Id: I95e3cfaa49f3f7371e794d5c253cf6981f87cae0
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
9 years agoDocument empty catch block to silence warning 68/49868/2
Matthias Sohn [Tue, 9 Jun 2015 23:39:52 +0000 (01:39 +0200)]
Document empty catch block to silence warning

Change-Id: I643f916e394ca95272b58d0b5826e81cc1092f2f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge "Fix imports in BundleWriter"
Jonathan Nieder [Wed, 10 Jun 2015 00:12:05 +0000 (20:12 -0400)]
Merge "Fix imports in BundleWriter"

9 years agoFix imports in BundleWriter 66/49866/2
Matthias Sohn [Tue, 9 Jun 2015 23:27:19 +0000 (01:27 +0200)]
Fix imports in BundleWriter

Change-Id: I5eb186ad27c93feab2664fcbcc9ca0b617a15462
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge "Add missing javadoc @param for new method setObjectCountCallback()"
Jonathan Nieder [Tue, 9 Jun 2015 23:47:02 +0000 (19:47 -0400)]
Merge "Add missing javadoc @param for new method setObjectCountCallback()"

9 years agoMerge "Revert "Config: Distinguish between empty and null strings""
Jonathan Nieder [Tue, 9 Jun 2015 23:45:33 +0000 (19:45 -0400)]
Merge "Revert "Config: Distinguish between empty and null strings""

9 years agoAdd missing javadoc @param for new method setObjectCountCallback() 65/49865/2
Matthias Sohn [Tue, 9 Jun 2015 23:24:03 +0000 (01:24 +0200)]
Add missing javadoc @param for new method setObjectCountCallback()

Change-Id: I91acdc3680bde09ae5809c14460500223a410395
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoRemove no longer used API warning filter for FileUtil 64/49864/1
Matthias Sohn [Tue, 9 Jun 2015 23:21:21 +0000 (01:21 +0200)]
Remove no longer used API warning filter for FileUtil

Change-Id: Ic13943139f23cdb1eac840417de43796236d578f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoRevert "Config: Distinguish between empty and null strings" 62/49862/3
Jonathan Nieder [Tue, 9 Jun 2015 22:54:52 +0000 (15:54 -0700)]
Revert "Config: Distinguish between empty and null strings"

This reverts commit 96eb3ee3976e7e9e3e118851fa614cce8a1f7d88, which
broke Gerrit tests that set a config value to 'null', serialize the
result, deserialize, and expect 'null' from Config.getString[1].

The intent of that commit was to make it possible to distinguish between
an absent and an empty config value, which we'll have to do with a new
method.

Revert the behavior change.  Keep the tests from 428cb23f2de8, since
they test the behavior more precisely than the old tests did.

[1] https://gerrit-review.googlesource.com/68452

Change-Id: Ie8042f380ea0e34e3203e1991aa0feb2e6e44641
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoFix a javadoc typo in RepoProject. 56/49856/1
Yuxuan 'fishy' Wang [Tue, 9 Jun 2015 21:24:36 +0000 (14:24 -0700)]
Fix a javadoc typo in RepoProject.

Change-Id: I3ea25c157b9e11a46a140d2c3ab9373d1596c163
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
9 years agoCallback in PackWriter & BundleWriter. 86/49486/6
Yuxuan 'fishy' Wang [Thu, 4 Jun 2015 23:43:24 +0000 (16:43 -0700)]
Callback in PackWriter & BundleWriter.

Added callback in PackWriter and BundleWriter for the caller to get the
count of objects to write, and a chance to abort the write operation.

Change-Id: I1baeedcc6946b1093652de4a707fe597a577e526
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
9 years agoUploadPack: Use reachable-sha1-in-want configuration 52/49652/2
Fredrik Medley [Fri, 29 May 2015 18:04:50 +0000 (20:04 +0200)]
UploadPack: Use reachable-sha1-in-want configuration

C git 2.5 supports setting the equivalent of
RequestPolicy.REACHABLE_COMMIT with uploadpack.allowreachablesha1inwant.
Parse this into TransportConfig and use it from UploadPack. An explicitly
set RequestPolicy overrides the config, and the policy may still be
upgraded on a unidirectional connection to avoid races.

Change-Id: Id39771a6e42d8082099acde11249306828a053c0
Signed-off-by: Fredrik Medley <fredrik.medley@gmail.com>
9 years agoMerge branch 'stable-4.0' 02/49802/2
Matthias Sohn [Tue, 9 Jun 2015 14:56:16 +0000 (16:56 +0200)]
Merge branch 'stable-4.0'

* stable-4.0:
  Prepare 4.0.1-SNAPSHOT builds
  JGit v4.0.0.201506090130-r
  Update build to use Tycho 0.23

Change-Id: I732b601c198ad1a50aa7ba3c1d1fb516b10912b5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoPrepare 4.0.1-SNAPSHOT builds 87/49787/1
Matthias Sohn [Tue, 9 Jun 2015 13:17:22 +0000 (15:17 +0200)]
Prepare 4.0.1-SNAPSHOT builds

Change-Id: I51d03d1a47d1e3cd453701e397750749867028a2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoJGit v4.0.0.201506090130-r 29/49729/1 v4.0.0.201506090130-r
Matthias Sohn [Tue, 9 Jun 2015 05:29:27 +0000 (07:29 +0200)]
JGit v4.0.0.201506090130-r

Change-Id: I01ad84fc74555656c42934cd62a85269a7030557
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoAdd missing # to javadoc comment 90/49690/1
Jonathan Nieder [Mon, 8 Jun 2015 17:47:15 +0000 (10:47 -0700)]
Add missing # to javadoc comment

Change-Id: I351cee0ba2e77e3360846ac0c5368da3a322725c
Reported-by: Markus Keller <markus_keller@ch.ibm.com>
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoUpdate build to use Tycho 0.23 42/49642/1
Matthias Sohn [Mon, 8 Jun 2015 10:59:28 +0000 (12:59 +0200)]
Update build to use Tycho 0.23

see https://wiki.eclipse.org/Tycho/Release_Notes/0.23

Change-Id: I70e6711294e2a92efa77fd9dd1c906c449c9b4db
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoAllow lookup of multiple exact refs in one shot 77/49577/2
Jonathan Nieder [Fri, 5 Jun 2015 23:08:55 +0000 (16:08 -0700)]
Allow lookup of multiple exact refs in one shot

exactRef(ref1, ref2, ref3) requests multiple specific refs in a single
lookup, which may be faster in some backends than looking them up one by
one.

firstExactRef generalizes getRef by finding the first existing ref from
the list of refs named.  Its main purpose is for the default
implementation of getRef (finding the first existing ref in a search
path).  Hopefully it can be useful for other operations that look for
refs in a search path (e.g., git log --notes=<name>), too.

Change-Id: I5c6fcf1d3920f6968b8b97f3d4c3a267258c4b86
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoIntroduce exactRef to read a ref whose exact name is known 48/49548/4
Jonathan Nieder [Fri, 5 Jun 2015 21:14:55 +0000 (14:14 -0700)]
Introduce exactRef to read a ref whose exact name is known

Unlike getRef(name), the new exactRef method does not walk the search
path.  This should produce a less confusing result than getRef when the
exact ref name is known: it will not try to resolve refs/foo/bar to
refs/heads/refs/foo/bar even when refs/foo/bar does not exist.

It can be faster than both getRefs(ALL).get(name) and getRef(name)
because it only needs to examine a single ref.

A follow-up change will introduce a findRef synonym to getRef and
deprecate getRef to make the choice a caller is making more obvious
(exactRef or findRef, with the same semantics as getRefs(ALL).get and
getRefs(ALL).findRef).

Change-Id: If1bd09bcfc9919e7976a4d77f13184ea58dcda52
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoMerge "Restore checkObjectCollisions flag"
Shawn Pearce [Thu, 4 Jun 2015 20:35:50 +0000 (16:35 -0400)]
Merge "Restore checkObjectCollisions flag"

9 years agoRestore checkObjectCollisions flag 72/49472/2
David Pletcher [Thu, 4 Jun 2015 18:48:32 +0000 (11:48 -0700)]
Restore checkObjectCollisions flag

I am developing an offline pack verification feature based on
PackParser. The birthday collision check is a prohibitive obstacle
to performance at scale because it interacts with the repository
to perform collision checks. This CL restores the checkObjectCollisions
flag that was removed in 9638e0aa87614a6fb4f109bbeac0cde3462b9769,
while changing the flag getter and setter to protected from public as a
precaution against misuse.

Change-Id: I363cd0c9de57c5e8659cdfe2d51b17823f4fe793
Signed-off-by: David Pletcher <dpletcher@google.com>
9 years agoConfig: Allow ending a file with "=" and no newline 70/49470/1
Dave Borowitz [Thu, 4 Jun 2015 18:48:46 +0000 (11:48 -0700)]
Config: Allow ending a file with "=" and no newline

This is a perfectly valid construction according to C git:

$ echo -en '[a]\nx =' > foo.config
$ git config -f foo.config a.x; echo $?

0

Change-Id: Icfcf8304adb43c79e2b8b998f8d651b2a94f6acb

9 years agoConfig: Distinguish between empty and null strings 69/49469/1
Dave Borowitz [Thu, 4 Jun 2015 18:35:24 +0000 (11:35 -0700)]
Config: Distinguish between empty and null strings

The C git API and command line tools distinguish between a key having
the empty string as a value and no key being present in the config
file:

$ echo -e '[a]\nx =' > foo.config
$ git config -f foo.config a.x; echo $?

0
$ git config -f foo.config a.y; echo $?
1

Make JGit make the same distinction. This is in line with the current
Javadoc of getString, which claims to return "a String value from the
config, null if not found". It is more reasonable to interpret "x ="
in the above example as "found" rather than "missing".

We need to maintain the special handling of a key name with no "="
resolving to a boolean true, but "=" with an empty string is still not
a valid boolean.

Change-Id: If0dbb7470c524259de0b167148db87f81be2d04a

9 years agoMerge branch 'stable-4.0' 06/49406/1
Jonathan Nieder [Wed, 3 Jun 2015 19:26:54 +0000 (12:26 -0700)]
Merge branch 'stable-4.0'

* stable-4.0:
  Revert "Fix unchecked conversion warning in MergeFormatter"
  Delete deprecated TemporaryBuffer.LocalFile constructors
  Delete deprecated FileUtils.setExecute(File, boolean)
  Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)
  Delete deprecated UploadPackMayNotContinueException
  Delete deprecated TransferConfig.isFsckObjects()
  Delete deprecated TextBuiltin.out
  Delete deprecated Merger.getBaseCommit()

Change-Id: Id23a39cc6a3cd122ff1738cb85b7451bbfd8af5f
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoRevert "Fix unchecked conversion warning in MergeFormatter" 00/49400/1
Shawn Pearce [Wed, 3 Jun 2015 18:31:31 +0000 (14:31 -0400)]
Revert "Fix unchecked conversion warning in MergeFormatter"

This reverts commit 6d4ebd168da236c5753f237e77b2dfcbb4e42065.

Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4

9 years agoDelete deprecated TemporaryBuffer.LocalFile constructors 39/49339/1
Matthias Sohn [Sat, 25 Apr 2015 22:49:24 +0000 (00:49 +0200)]
Delete deprecated TemporaryBuffer.LocalFile constructors

Change-Id: I5fdbf997ebcbe48e86f4c41c6b2643f47054b0c3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated FileUtils.setExecute(File, boolean) 38/49338/1
Matthias Sohn [Fri, 24 Apr 2015 23:08:42 +0000 (01:08 +0200)]
Delete deprecated FileUtils.setExecute(File, boolean)

Change-Id: Ifa63e3743fb4de25e074404c301f860a1ffb5e02
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean) 37/49337/1
Matthias Sohn [Fri, 24 Apr 2015 23:07:20 +0000 (01:07 +0200)]
Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)

Change-Id: I687c392e5a625fd66c45998c94373aa59921b986
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated UploadPackMayNotContinueException 36/49336/1
Matthias Sohn [Fri, 24 Apr 2015 23:05:40 +0000 (01:05 +0200)]
Delete deprecated UploadPackMayNotContinueException

Change-Id: Id298fc860684d2a2288769282fd8ce4475009dc8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated TransferConfig.isFsckObjects() 35/49335/1
Matthias Sohn [Fri, 24 Apr 2015 23:04:54 +0000 (01:04 +0200)]
Delete deprecated TransferConfig.isFsckObjects()

Change-Id: Ib7f36282d69a3298b1ac177ae17af0f80d64964f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated TextBuiltin.out 34/49334/1
Matthias Sohn [Fri, 24 Apr 2015 23:03:58 +0000 (01:03 +0200)]
Delete deprecated TextBuiltin.out

Change-Id: I184c2f0e0203fa95e0a117391bae93da0d23a435
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated Merger.getBaseCommit() 33/49333/1
Matthias Sohn [Fri, 24 Apr 2015 23:01:41 +0000 (01:01 +0200)]
Delete deprecated Merger.getBaseCommit()

Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUpdate PackWriter.Statistics.getBitmapIndexMises() 89/49289/2
Terry Parker [Wed, 3 Jun 2015 02:40:14 +0000 (19:40 -0700)]
Update PackWriter.Statistics.getBitmapIndexMises()

Return -1 from PackWriter.Statistics.getBitmapIndexMises() when no
bitmap indices were found, to differentiate it from the case where
the bitmap indices contained all of the want/have commits.

Change-Id: I78d4600b462c19f62b347217a0b2c19eaaf3a14b
Signed-off-by: Terry Parker <tparker@google.com>
9 years agoAllow setting detail message and cause when constructing most exceptions 80/49280/1
Jonathan Nieder [Tue, 2 Jun 2015 23:52:21 +0000 (16:52 -0700)]
Allow setting detail message and cause when constructing most exceptions

In particular, this means a RepositoryResolver, UploadPackFactory, or
ReceivePackFactory can set a detail message for
ServiceNotAuthorizedException or ServiceNotEnabledException with
information for the client about why access is not allowed.

Change-Id: I38e1798e1e9d09b5e75cefacd9d85f25729235a9
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoUse message from ServiceNotAuthorizedException, ServiceNotEnabledException 79/49279/1
Jonathan Nieder [Tue, 2 Jun 2015 23:40:23 +0000 (16:40 -0700)]
Use message from ServiceNotAuthorizedException, ServiceNotEnabledException

When sending an error response due to ServiceNotAuthorizedException or
ServiceNotEnabledException, usually we send a default message.  In the
ServiceNotEnabledException case, we use

403 Git access forbidden

except in a dumb-HTTP-specific filter where we use the servlet
container's default 403 response:

403 Forbidden

In the ServiceNotAuthorizedException case, we use the servlet
container's default 401 response:

401 Unauthorized

There is one exception: a ServiceNotEnabledException when handling a
smart HTTP /info/refs request uses the message from the exception:

403 Service not enabled

Be more consistent by always using the message from the exception.  This
way, authors of a RepositoryResolver, UploadPackFactory, or
ReceivePackFactory can provide a more detailed message when appropriate.
The defaults are

401 Unauthorized
403 Service not enabled

Change-Id: Id1fe1c2042fb96487c3671c1965c8a65c4b8e1b8
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agodumb HTTP: Clarify AsIsFilter by introducing req and res locals 78/49278/1
Jonathan Nieder [Tue, 2 Jun 2015 23:14:19 +0000 (16:14 -0700)]
dumb HTTP: Clarify AsIsFilter by introducing req and res locals

No functional change.

Change-Id: I945ba18879c360f433e026aa125ef3f9f6a75793
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoClarify description of ServiceNotAuthorizedException 77/49277/1
Jonathan Nieder [Tue, 2 Jun 2015 23:13:16 +0000 (16:13 -0700)]
Clarify description of ServiceNotAuthorizedException

This exception's detail message states

Service not permitted

and according to the Javadoc it indicates that the current user does not
have access to the service.  In practice, though, callers handle this
exception by presenting a '401 Unauthorized' response to the client,
meaning that the user is unauthenticated and should authenticate.

Clarify the documentation and detail message to match the practice.

The exception message is not used anywhere except logs.  No
client-visible effect intended.

Change-Id: I2c6be9cb74af932f0dcb121a381a64f2ad876766
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoPrepare 4.1.0-SNAPSHOT builds 68/49268/2
Matthias Sohn [Tue, 2 Jun 2015 22:26:18 +0000 (00:26 +0200)]
Prepare 4.1.0-SNAPSHOT builds

Change-Id: I03d08b8e2d3400d4b5cdb4ab541b312870776843
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge branch 'stable-4.0' 67/49267/1
Matthias Sohn [Tue, 2 Jun 2015 22:25:18 +0000 (00:25 +0200)]
Merge branch 'stable-4.0'

* stable-4.0:
  Prepare post 4.0-RC3 builds
  JGit v4.0.0.201506020755-rc3

Change-Id: I3387e5d90a24645cba736a2d0739fb95cd557049
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoPrepare post 4.0-RC3 builds 54/49254/1
Matthias Sohn [Tue, 2 Jun 2015 21:11:57 +0000 (23:11 +0200)]
Prepare post 4.0-RC3 builds

Change-Id: I74469f1243503098fb05b5ddec3fa609132debab
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoJGit v4.0.0.201506020755-rc3 98/49198/1 v4.0.0.201506020755-rc3
Matthias Sohn [Tue, 2 Jun 2015 11:55:16 +0000 (13:55 +0200)]
JGit v4.0.0.201506020755-rc3

Change-Id: I31c6177d19cba228aa67b2b5c3e0d82c38395cda
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge branch 'master' into stable-4.0 46/49146/1
Matthias Sohn [Mon, 1 Jun 2015 22:13:07 +0000 (00:13 +0200)]
Merge branch 'master' into stable-4.0

* master:
  Add more reports to maven site
  Update project meta-data in pom.xml used for site generation
  Update dependencies to the versions used in target platform
  Update 4.5 target platform to use final Mars Orbit repository
  Compare API changes in clirr report against 3.7.0
  Fix CommitCommand.setOnly()
  Add "src" folder to source folders of org.eclipse.jgit.test
  Improve exception thrown when pull can't find advertised ref
  Silence unchecked conversion warning in TransportSftp
  Silence deprecation warning in WindowCacheConfig
  Silence deprecation warning in DirCacheCheckout
  Fix unchecked conversion warning in MergeFormatter
  Fix hidden field warnings in bundle org.eclipse.jgit
  Close WindowCursor using try-with-resources in UnpackedObject
  Fix WindowCursor memory leak.
  archive: Drop unnecessary empty comments and 'final' qualifiers on locals
  Close 'out' consistently in ArchiveCommand.call
  Fix that exceptions in ReceivePack cause Invalid Channel 101 exceptions
  Better report too large pack-files from PushCommand
  FS: Extract GobblerThread into a private static class
  Add bitmap index misses to PackWriter.Statistics
  Enable public access to SimilarityIndex scoring function
  Add getters to RepoProject.
  Silence unused object warning in MyersDiff
  Silence resource leak warnings where caller is responsible to close
  Silence false potential null pointer access warnings
  Fix potential null pointer access in IndexDiffFilter
  Add tests for ObjectFilter
  Expose Sets helper to tests outside org.eclipse.jgit.api

Change-Id: I34b2bb45f51ed6f52a6bb1215de654ebb2ffde10
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoAdd more reports to maven site 92/49092/3
Matthias Sohn [Fri, 29 May 2015 14:37:20 +0000 (16:37 +0200)]
Add more reports to maven site

Add the following additional reports:
- cross-reference report
- API changes report using clirr
- findbugs report
- surefire-report

Run
$ mvn test install site:site site:stage
to generate and stage the site

Also see
https://wiki.eclipse.org/EGit/Contributor_Guide#JGit_3

Change-Id: Ibb6a2e13e128d7728b3c632cc16bf79716dc75f5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUpdate project meta-data in pom.xml used for site generation 91/49091/1
Matthias Sohn [Fri, 29 May 2015 12:39:33 +0000 (14:39 +0200)]
Update project meta-data in pom.xml used for site generation

- Update list of committers
- Update scm information
- Expose jgit hudson for Maven site
- Name our project's organization
- Scm URL should point to a web-enabled view on the repository
- Extract tycho-extras version used during signing to a property

Change-Id: If32bed323ec283b5e83d28ffe8775220f7c4cecd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUpdate dependencies to the versions used in target platform 90/49090/1
Matthias Sohn [Mon, 1 Jun 2015 09:37:38 +0000 (11:37 +0200)]
Update dependencies to the versions used in target platform

- update com.jcraft.jsch to 0.1.51
- update javax.servlet to 3.1.0

Change-Id: Ie536182d1efc6dcc3abd03f8a9acd013adcbf2a8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUpdate 4.5 target platform to use final Mars Orbit repository 89/49089/1
Matthias Sohn [Mon, 1 Jun 2015 14:00:06 +0000 (16:00 +0200)]
Update 4.5 target platform to use final Mars Orbit repository

Change-Id: Ie8ff09e6b054e5fae0786557b8fe831eb9e82dd2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoCompare API changes in clirr report against 3.7.0 88/49088/1
Matthias Sohn [Fri, 29 May 2015 12:31:31 +0000 (14:31 +0200)]
Compare API changes in clirr report against 3.7.0

Change-Id: Id819fd700ed44cdc3cdbe33a4bb9ee52a6fbbd41
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFix CommitCommand.setOnly() 75/48075/2
Christian Halstrick [Mon, 18 May 2015 10:48:08 +0000 (12:48 +0200)]
Fix CommitCommand.setOnly()

When CommitCommand.setOnly(path) is used a temporary index has to be
created containing only modifications for the specified pathes. The
process to fill this temporary index was broken because filling the
index was stopped when we reached the first untracked file. Instead the
process to fill the temporary index should continue until we processed
all pathes.

Bug: 451465
Change-Id: I22af50d70bd3b81e7c056358724956122b0d158d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge changes Ib7d18bb2,I3dc8e0b4,I923b65ef,I9e021ba2,I4e79cefe
Shawn Pearce [Sun, 31 May 2015 23:41:52 +0000 (19:41 -0400)]
Merge changes Ib7d18bb2,I3dc8e0b4,I923b65ef,I9e021ba2,I4e79cefe

* changes:
  Improve exception thrown when pull can't find advertised ref
  Silence unchecked conversion warning in TransportSftp
  Silence deprecation warning in WindowCacheConfig
  Silence deprecation warning in DirCacheCheckout
  Fix hidden field warnings in bundle org.eclipse.jgit

9 years agoAdd "src" folder to source folders of org.eclipse.jgit.test 24/48924/2
Matthias Sohn [Fri, 29 May 2015 08:17:15 +0000 (10:17 +0200)]
Add "src" folder to source folders of org.eclipse.jgit.test

Otherwise MergeCommandTest using Sets doesn't compile in Eclipse since
adbcbc79 moved Sets from the "tst" to the "src" folder.

Change-Id: I661b987513365a8af0b568ec95b0898e5758f59f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoImprove exception thrown when pull can't find advertised ref 35/45835/7
Matthias Sohn [Wed, 15 Apr 2015 06:40:05 +0000 (08:40 +0200)]
Improve exception thrown when pull can't find advertised ref

- throw an API exception instead of an internal exception to allow
applications to handle this problem
- improve error message to give hints about possible root causes

Bug: 464660
Change-Id: Ib7d18bb2eeeac0fc218daea375b290ea5034bda1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence unchecked conversion warning in TransportSftp 10/45710/7
Matthias Sohn [Sat, 11 Apr 2015 23:27:12 +0000 (01:27 +0200)]
Silence unchecked conversion warning in TransportSftp

Change-Id: I3dc8e0b483072bdf193ae4190a60d1867ebefd12
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence deprecation warning in WindowCacheConfig 08/45708/7
Matthias Sohn [Sat, 11 Apr 2015 23:08:48 +0000 (01:08 +0200)]
Silence deprecation warning in WindowCacheConfig

Change-Id: I923b65efeaacc5e9cc8aecc754ab8d8e63ccd2e5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence deprecation warning in DirCacheCheckout 07/45707/7
Matthias Sohn [Sat, 11 Apr 2015 23:01:14 +0000 (01:01 +0200)]
Silence deprecation warning in DirCacheCheckout

Change-Id: I9e021ba2e0d1317bd98e86f832d55787ed6b0a63
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFix unchecked conversion warning in MergeFormatter 09/45709/7
Matthias Sohn [Sat, 11 Apr 2015 23:26:50 +0000 (01:26 +0200)]
Fix unchecked conversion warning in MergeFormatter

Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFix hidden field warnings in bundle org.eclipse.jgit 06/45706/7
Matthias Sohn [Sat, 11 Apr 2015 22:51:37 +0000 (00:51 +0200)]
Fix hidden field warnings in bundle org.eclipse.jgit

Change-Id: I4e79cefe15037df0e1c520956bf2482240e31a7d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoClose WindowCursor using try-with-resources in UnpackedObject 08/48908/1
Hugo Arès [Thu, 28 May 2015 19:59:48 +0000 (15:59 -0400)]
Close WindowCursor using try-with-resources in UnpackedObject

Change-Id: I187403ed432f7d6b1e84223918bd72d895e6bdfe
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
9 years agoMerge changes I7b6d7be4,I63a74651,I39c2ea6b
Shawn Pearce [Thu, 28 May 2015 19:39:07 +0000 (15:39 -0400)]
Merge changes I7b6d7be4,I63a74651,I39c2ea6b

* changes:
  Silence unused object warning in MyersDiff
  Silence resource leak warnings where caller is responsible to close
  Fix potential null pointer access in IndexDiffFilter

9 years agoMerge "Silence false potential null pointer access warnings"
Shawn Pearce [Thu, 28 May 2015 19:37:09 +0000 (15:37 -0400)]
Merge "Silence false potential null pointer access warnings"

9 years agoMerge "Fix WindowCursor memory leak."
Shawn Pearce [Thu, 28 May 2015 19:35:25 +0000 (15:35 -0400)]
Merge "Fix WindowCursor memory leak."

9 years agoMerge changes I144a53fe,I2b268e6a
Shawn Pearce [Thu, 28 May 2015 19:35:14 +0000 (15:35 -0400)]
Merge changes I144a53fe,I2b268e6a

* changes:
  Add tests for ObjectFilter
  Expose Sets helper to tests outside org.eclipse.jgit.api

9 years agoFix WindowCursor memory leak. 04/48904/1
Hugo Arès [Thu, 28 May 2015 18:21:03 +0000 (14:21 -0400)]
Fix WindowCursor memory leak.

ObjectReader release method was replaced by close method but
WindowCursor was still implementing release method.

To prevent the same mistake again, make ObjectReader close method
abstract to force sub classes to implement it.

Change-Id: I50d0d1d19a26e306fd0dba77b246a95a44fd6584
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
9 years agoarchive: Drop unnecessary empty comments and 'final' qualifiers on locals 02/48902/1
Jonathan Nieder [Wed, 27 May 2015 23:25:49 +0000 (16:25 -0700)]
archive: Drop unnecessary empty comments and 'final' qualifiers on locals

Early JGit code used comments to inform the Eclipse formatter about
where to break lines and used final in the hope of making code faster.
The ArchiveCommand command implementation imitated that style.

Nowadays the project relies less on the Eclipse formatter and relies
more on Java having sane performance with local variables that are not
explicitly marked 'final'.  Removing the unnecessary empty comments and
'final' qualifiers makes this code more readable and more consistent
with recent JGit code.

Change-Id: I7a181432eda7e18bd32cf110d89c0efbe490c4f1
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoClose 'out' consistently in ArchiveCommand.call 01/48901/1
Jonathan Nieder [Wed, 27 May 2015 23:25:32 +0000 (16:25 -0700)]
Close 'out' consistently in ArchiveCommand.call

Whether the output stream specified with setOutputStream() is closed by
ArchiveCommand.call() is murky and inconsistent:

- on success, it is closed
- if an exception is encountered when writing the archive, it is closed
- if an exception is encountered when calling createArchiveStream to
  open the archive, we forget to close it

Close the output stream consistently to avoid leaks.

Now that the inner try-with-resources doesn't have its own finally
block, this allows us to merge the two try blocks.

It would be even better to never close the output stream.  That will
involve more API changes to avoid silently breaking callers, so it is
deferred to a later change.

Change-Id: I0185bdaa60ecee4a541eab5d8ff6c9c4dbe40bf1
Signed-off-by: Jonathan Nieder <jrn@google.com>
9 years agoFix that exceptions in ReceivePack cause Invalid Channel 101 exceptions 12/48112/9
Christian Halstrick [Mon, 18 May 2015 22:45:42 +0000 (00:45 +0200)]
Fix that exceptions in ReceivePack cause Invalid Channel 101 exceptions

When during a PushOperation the server hits an exception different from
UnpackException the JGit server behaved wrong. That kind of exceptions
are handled so late that the connection is already released and the
information whether to talk sideband to the client is lost. In detail:
ReceivePack.receive() will call release() and that will reset the
capabilities. But later on the stack in ReceivePackServlet.doPost() it
is tried to send a response to client now with reset capabilities (no
sideband!).

Change-Id: I0a609acc6152ab43b47a93d712deb65bb1105f75
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoBetter report too large pack-files from PushCommand 48/46348/7
Christian Halstrick [Thu, 23 Apr 2015 13:24:25 +0000 (15:24 +0200)]
Better report too large pack-files from PushCommand

JGits PushCommand and BasePackPushConnection were throwing generic
TransportExceptions when the pushed pack-file was rejected by the server
since it was too big. Let JGit better interprete the server's response
to detect this situation and throw a more specific exception.

This detection works by parsing the status line sent by the server. This
change only recognizes the response sent by a JGit based server. All
other servers which report such problems in a different way still lead
to a generic TransportExceptions.

Change-Id: Ic075764ea152939ce72c446252464620dd54edea
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFS: Extract GobblerThread into a private static class 08/48808/2
Dave Borowitz [Wed, 27 May 2015 16:40:32 +0000 (09:40 -0700)]
FS: Extract GobblerThread into a private static class

The primary goal is to improve exception readability. Since this is a
standalone thread, just logging the stack trace of the caught
exception is not very useful:

java.io.IOException: Stream closed
at java.io.BufferedInputStream.getBufIfOpen(BufferedInputStream.java:162)
at java.io.BufferedInputStream.read(BufferedInputStream.java:258)
at org.eclipse.jgit.util.FS$2.run(FS.java:451)

Providing a named class eliminates the "FS$2", and including the
command name provides a little more context in the error message.
A future improvement might include the stack trace that created the
GobblerThread as well.

Change-Id: Ibf16d15b47a85b6f41844a177e398c2fc94f27b0

9 years agoAdd bitmap index misses to PackWriter.Statistics 92/48692/3
Terry Parker [Tue, 12 May 2015 00:37:02 +0000 (17:37 -0700)]
Add bitmap index misses to PackWriter.Statistics

RevWalks to find commits that are not in bitmap indices are expensive.
Track the count of commits that are enumerated via RevWalks as "bitmap
index misses" in the PackWriter.Statistics class.

Change-Id: Ie0135a0a0aeba2dfb6df78839d545006629f16cb
Signed-off-by: Terry Parker <tparker@google.com>
9 years agoMerge "Enable public access to SimilarityIndex scoring function"
Shawn Pearce [Tue, 26 May 2015 20:49:28 +0000 (16:49 -0400)]
Merge "Enable public access to SimilarityIndex scoring function"

9 years agoEnable public access to SimilarityIndex scoring function 74/48574/3
David Pletcher [Mon, 25 May 2015 21:49:58 +0000 (14:49 -0700)]
Enable public access to SimilarityIndex scoring function

The SimilarityIndex class implements the useful capability of scoring
the similarity between two files. That capability is required for a
feature that's being developed in another package, to detect files
derived from a set of potential sources.

This CL adds a public factory method to create a SimilarityIndex from
an ObjectLoader. It grants public access to the SimilarityIndex class,
the score method, an inner exception class and a special marker
instance of that exception class.

Change-Id: I3f72670da643be3bb8e261c5af5e9664bcd0401b
Signed-off-by: David Pletcher <dpletcher@google.com>
9 years agoMerge "Add getters to RepoProject."
Shawn Pearce [Tue, 26 May 2015 17:13:59 +0000 (13:13 -0400)]
Merge "Add getters to RepoProject."

9 years agoAdd getters to RepoProject. 55/48555/4
Yuxuan 'fishy' Wang [Mon, 25 May 2015 18:41:24 +0000 (11:41 -0700)]
Add getters to RepoProject.

Change-Id: I74ded6c2c3f5985568cd77bd8799b45017fb1d09
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
9 years agoMerge branch 'stable-4.0' 53/48653/1
Matthias Sohn [Tue, 26 May 2015 14:54:18 +0000 (16:54 +0200)]
Merge branch 'stable-4.0'

* stable-4.0:
  Prepare post 4.0.0-rc2 builds
  JGit v4.0.0.201505260635-rc2

Change-Id: I1a67726b037be5311d85d90d815110b422182d33
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoPrepare post 4.0.0-rc2 builds 36/48636/1
Matthias Sohn [Tue, 26 May 2015 13:05:25 +0000 (15:05 +0200)]
Prepare post 4.0.0-rc2 builds

Change-Id: I3ba1bb0d7f220f88eb768a3137493f737aadf466
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoJGit v4.0.0.201505260635-rc2 12/48612/1 v4.0.0.201505260635-rc2
Matthias Sohn [Tue, 26 May 2015 10:33:24 +0000 (12:33 +0200)]
JGit v4.0.0.201505260635-rc2

Change-Id: I496743145da865f9631b46a432c65c1e63ccb501
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge branch 'master' into stable-4.0 11/48611/1
Matthias Sohn [Tue, 26 May 2015 09:39:19 +0000 (11:39 +0200)]
Merge branch 'master' into stable-4.0

* master:
  Silence non-externalized string warnings in org.eclipse.jgit
  Externalize translatable texts in org.eclipse.jgit
  Don't invalidate pack file on InterruptedIOException
  Update Mars target platforms to use Mars RC2 orbit
  Update build to use eclipse-jarsigner-plugin 1.1.2
  Guard agains null ReflogReader if named ref does not exist
  FS: Allow to manually set the path to the Git system config file
  FS: Fix a minor typo in runInShell() docs
  FS: Improve javadoc of some recently introduced methods
  Cleanup code and Eclipse compile errors in new gitrepo API
  Refactor to expose ManifestParser.
  FS: Remove the gitprefix logic
  SystemReader: Use discoverGitSystemConfig() in openSystemConfig()
  FS: Add a method to discover the system-wide config file
  FS: Extend readPipe() to optionally take additional environment
  FS: Document readpipe()'s encoding parameter
  Split discoverGitPrefix() code out into discoverGitExe()
  Equalize discoverGitPrefix() implementations between POSIX and Win32
  Move resolveGrandparentFile() to the base class for wider use
  Replace deprecated release() methods by close()
  Use AutoClosable to close resources in bundle org.eclipse.jgit
  ReceivePack: support quiet capability
  Fix ObjectReader resources leak

Change-Id: I0cd9f7ad57f26f0a0cbf412845d00ba1efbea346
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence unused object warning in MyersDiff 05/45705/5
Matthias Sohn [Sat, 11 Apr 2015 22:43:07 +0000 (00:43 +0200)]
Silence unused object warning in MyersDiff

Change-Id: I7b6d7be4bb283c1f451bc58f29c71a8082580989
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence resource leak warnings where caller is responsible to close 04/45704/5
Matthias Sohn [Fri, 10 Apr 2015 21:53:08 +0000 (23:53 +0200)]
Silence resource leak warnings where caller is responsible to close

Change-Id: I63a74651689c10426d5f150ab2e027c6b63cab95
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence false potential null pointer access warnings 00/45700/5
Matthias Sohn [Fri, 10 Apr 2015 00:37:04 +0000 (02:37 +0200)]
Silence false potential null pointer access warnings

Change-Id: I30c074a1b3436e47316b2eb2f083708161182d32

9 years agoSilence non-externalized string warnings in org.eclipse.jgit 05/45605/6
Matthias Sohn [Thu, 9 Apr 2015 22:56:45 +0000 (00:56 +0200)]
Silence non-externalized string warnings in org.eclipse.jgit

Change-Id: I7fa180db0c59e4a317a0c99ec48574cb0e5ac2f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFix potential null pointer access in IndexDiffFilter 01/45701/5
Matthias Sohn [Sat, 11 Apr 2015 21:56:41 +0000 (23:56 +0200)]
Fix potential null pointer access in IndexDiffFilter

Change-Id: I39c2ea6b3090d7028cc1e246af6e3cc4e7bc70c2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoExternalize translatable texts in org.eclipse.jgit 53/44053/8
Matthias Sohn [Tue, 17 Mar 2015 23:32:04 +0000 (00:32 +0100)]
Externalize translatable texts in org.eclipse.jgit

Change-Id: Ibf4c299f9d203c78cae79e61f88d4bea60ea2795
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDon't invalidate pack file on InterruptedIOException 88/48288/3
Saša Živkov [Wed, 20 May 2015 14:57:24 +0000 (16:57 +0200)]
Don't invalidate pack file on InterruptedIOException

If the thread reading a pack file is interrupted don't invalidate that
pack file.

This could happen when Gerrit invoked JGit for computing a diff in one
thread and waited for the call to finish from another thread, with a
timeout. When the timeout was reached the "diff" thread was interrupted.
If it happened to be in an IO operation, reading a pack file, an
InterruptedIOException was thrown and the pack file was marked as
invalid and removed from the pack list.

Invalidating the pack in that case could cause the project disappearing in
Gerrit as discussed in [1] and [2].

[1] https://groups.google.com/forum/#!topic/repo-discuss/CYYoHfDxCfA
[2] https://groups.google.com/forum/#!topic/repo-discuss/ZeGWPyyJlrM

Change-Id: I2eb1f98370936b5be541d96d70c3973cbfc39238
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
9 years agoUpdate Mars target platforms to use Mars RC2 orbit 71/48571/1
Matthias Sohn [Mon, 25 May 2015 21:53:39 +0000 (23:53 +0200)]
Update Mars target platforms to use Mars RC2 orbit

Change-Id: Idda321d5026329ec194d53ad635973465bcccd49
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUpdate build to use eclipse-jarsigner-plugin 1.1.2 68/48568/1
Matthias Sohn [Mon, 25 May 2015 21:13:50 +0000 (23:13 +0200)]
Update build to use eclipse-jarsigner-plugin 1.1.2

Change-Id: Ic2fb30cf851542e12508e4cf638b52b65519f41d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoGuard agains null ReflogReader if named ref does not exist 21/48521/3
Andrey Loskutov [Sun, 24 May 2015 07:15:15 +0000 (09:15 +0200)]
Guard agains null ReflogReader if named ref does not exist

Follow up on egit bug 466973.

Change-Id: Idd83d87803e86b25f106dfd725214b5a3ec5171c
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFS: Allow to manually set the path to the Git system config file 77/48477/3
Sebastian Schuberth [Fri, 22 May 2015 15:21:27 +0000 (17:21 +0200)]
FS: Allow to manually set the path to the Git system config file

Now that d7a4473 removed the gitprefix property, we did not have a way to
specify the path to the Git system config file in case
discoverGitSystemConfig() fails. Fix that by introducing a member variable
that caches the result of discoverGitSystemConfig() as well as a setter
method to overwrite the content of that variable.

Change-Id: Icd965bffbe2f11b18c9505ee2ddd2afad5b64d70
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
9 years agoFS: Fix a minor typo in runInShell() docs 57/48557/2
Sebastian Schuberth [Mon, 25 May 2015 18:07:53 +0000 (20:07 +0200)]
FS: Fix a minor typo in runInShell() docs

Change-Id: I5b1a5f3732aa97f83a4d39b42ba0f1e8eff9dec4
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
9 years agoFS: Improve javadoc of some recently introduced methods 56/48556/2
Sebastian Schuberth [Mon, 25 May 2015 18:15:05 +0000 (20:15 +0200)]
FS: Improve javadoc of some recently introduced methods

Change-Id: I31e788ee20ac3e8439559d9060d39e9792f6dc7d
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoCleanup code and Eclipse compile errors in new gitrepo API 22/48522/3
Andrey Loskutov [Sun, 24 May 2015 07:31:17 +0000 (09:31 +0200)]
Cleanup code and Eclipse compile errors in new gitrepo API

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>
9 years agoMerge "Refactor to expose ManifestParser."
Shawn Pearce [Fri, 22 May 2015 18:24:44 +0000 (14:24 -0400)]
Merge "Refactor to expose ManifestParser."

9 years agoRefactor to expose ManifestParser. 16/48416/2
Yuxuan 'fishy' Wang [Thu, 21 May 2015 23:52:32 +0000 (16:52 -0700)]
Refactor to expose ManifestParser.

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>
9 years agoFS: Remove the gitprefix logic 47/48147/6
Sebastian Schuberth [Tue, 19 May 2015 09:43:30 +0000 (11:43 +0200)]
FS: Remove the gitprefix logic

The only purpose of the gitprefix logic was to determine the path to the
system-wide config file. This is now done by discoverGitSystemConfig()
independent of the gitprefix, so get rid of this unused code.

Change-Id: Iaa88df9bd066dc1ed4067c18618af809e49876b3
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
9 years agoSystemReader: Use discoverGitSystemConfig() in openSystemConfig() 46/48146/6
Sebastian Schuberth [Tue, 19 May 2015 09:30:03 +0000 (11:30 +0200)]
SystemReader: Use discoverGitSystemConfig() in openSystemConfig()

Bug: 410568
Change-Id: Id768294e83f374f50ae5e6486f4e757515c8262d
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFS: Add a method to discover the system-wide config file 45/48145/6
Sebastian Schuberth [Tue, 19 May 2015 08:49:44 +0000 (10:49 +0200)]
FS: Add a method to discover the system-wide config file

Change-Id: I969e26a5ab5f8ca3ab29024f405c1e34afdba493
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>