]> source.dussan.org Git - jgit.git/log
jgit.git
9 years agoObjectReader: remove the walkAdvice API 61/47561/5
Shawn Pearce [Sat, 9 May 2015 05:26:28 +0000 (22:26 -0700)]
ObjectReader: remove the walkAdvice API

This was added a very long time ago to support the failed
DHT storage implementation. Since then no storage system
was able to make use of this API, but it pollutes internals
of the walkers.

Kill the API on ObjectReader and drop the invocations from
the walker code.

Change-Id: I36608afdac13a6c3084d7c7e0af5e0cb22900332

9 years agoRevWalk: Discard uninteresting commits unless RevSort.BOUNDARY 63/47563/4
Shawn Pearce [Sat, 9 May 2015 05:48:10 +0000 (22:48 -0700)]
RevWalk: Discard uninteresting commits unless RevSort.BOUNDARY

Previously using an ObjectWalk meant uninteresting commits may keep
their commit message buffers in memory just in case they were found to
be on the boundary and were output as UNINTERESTING for the caller.

This was incorrect inside StartGenerator. ObjectWalk hides these
internal UNINTERESTING cases from its caller unless RevSort.BOUNDARY
was explicitly set, and its false by default. Callers never see one
of these saved uninteresting commits.

Change the test to allow early dispose unless the application has
explicitly asked for RevSort.BOUNDARY. This allows uninteresting
commit buffers to be discarded and garbage collected in ObjectWalks
when the caller will never be given the RevCommit.

Change-Id: Ic1419cc1d9ee95f4d09386dd0730d54c12dcc157

9 years agoObjectWalk: make setRetainBody(false) the default 68/47568/3
Shawn Pearce [Sat, 9 May 2015 17:47:13 +0000 (10:47 -0700)]
ObjectWalk: make setRetainBody(false) the default

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

9 years agoMerge changes I62befa4a,Ia9c3d123,I7fcf6534
Shawn Pearce [Sun, 10 May 2015 03:00:55 +0000 (23:00 -0400)]
Merge changes I62befa4a,Ia9c3d123,I7fcf6534

* changes:
  Delete deprecated PackWriter.preparePack() methods
  Delete deprecated class IgnoreRule
  Delete deprecated checkoutEntry() methods in DirCacheCheckout

9 years agoDo not concatenate strings as arguments to StringBuilder.append() 23/47523/1
Sebastian Schuberth [Fri, 8 May 2015 09:04:27 +0000 (11:04 +0200)]
Do not concatenate strings as arguments to StringBuilder.append()

That more or less defeats the purpose of using a StringBuilder.

Change-Id: I519f7bf1c9b6670e63c3714210f834ee845dc69f
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
9 years agoIndexDiffFilter: Simplify a boolean expression 22/47522/1
Sebastian Schuberth [Fri, 8 May 2015 09:02:44 +0000 (11:02 +0200)]
IndexDiffFilter: Simplify a boolean expression

Change-Id: Ibdd0338b638b864d6572045b084b08a04471ecf7
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
9 years agoGroupHead: Remove a redundant call to String.format() 21/47521/1
Sebastian Schuberth [Fri, 8 May 2015 09:02:15 +0000 (11:02 +0200)]
GroupHead: Remove a redundant call to String.format()

Change-Id: I8f5fc09469b56d73d3838e7bcfecfd21140429eb
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
9 years agoFS_Win32: Avoid an IOException on Windows if bash is not in PATH 25/47025/3
Sebastian Schuberth [Mon, 4 May 2015 09:45:22 +0000 (11:45 +0200)]
FS_Win32: Avoid an IOException on Windows if bash is not in PATH

Change-Id: I3145f74ecee9f5b368e7f4b9fd7cb906f407eff5
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSkip logging stack trace on corrupt objects 95/47395/1
Shawn Pearce [Wed, 6 May 2015 23:02:27 +0000 (16:02 -0700)]
Skip logging stack trace on corrupt objects

Instead of dumping a full stack trace when a client sends an invalid
commit, record only a short line explaining the attempt:

  Cannot receive Invalid commit c0ff33...: invalid author into /tmp/jgit.git

The text alone is sufficient to explain the problem and the stack
trace does not lend any additional useful information. ObjectChecker
is quite clear about its rejection cases.

Change-Id: Ifc8cf06032489dc6431be1ba66101cf3d4299218

9 years agoAdd repository name to failures in HTTP server log 92/47392/1
Shawn Pearce [Wed, 6 May 2015 22:47:34 +0000 (15:47 -0700)]
Add repository name to failures in HTTP server log

If UploadPack or ReceivePack has an exception record an identifier
associated with the repository as part of the log message. This can
help the HTTP admin track down the offending repository and take
action to repair the root cause.

Change-Id: I58f22b33cdb40994f044a26fba9fe965b45be51d

9 years agoMerge branch 'stable-4.0' 74/47174/1
Matthias Sohn [Tue, 5 May 2015 12:47:46 +0000 (14:47 +0200)]
Merge branch 'stable-4.0'

* stable-4.0:
  Prepare post 4.0.0-m2 builds
  JGit v4.0.0.201505050340-m2
  Prepare post 4.0.0-m1 builds
  JGit v4.0.0.201503231230-m1

Change-Id: I2cf68424bb550816f6137d693e792ebffa11bf87
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoPrepare post 4.0.0-m2 builds 68/47168/1
Matthias Sohn [Tue, 5 May 2015 10:41:54 +0000 (12:41 +0200)]
Prepare post 4.0.0-m2 builds

Change-Id: I11c2d5120508526ed2671d62f4dd6a395c3b4749
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoJGit v4.0.0.201505050340-m2 25/47125/1 v4.0.0.201505050340-m2
Matthias Sohn [Tue, 5 May 2015 07:36:57 +0000 (09:36 +0200)]
JGit v4.0.0.201505050340-m2

Change-Id: I4a360a654d5d5e4200bf1e4817613f85755bb3ff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge branch 'master' into stable-4.0 92/47092/1
Matthias Sohn [Mon, 4 May 2015 20:02:23 +0000 (22:02 +0200)]
Merge branch 'master' into stable-4.0

Change-Id: I962461630384b76e7f387f4e1c1248833fbc4673
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoPrepare post 4.0.0-m1 builds 91/47091/1
Matthias Sohn [Mon, 4 May 2015 19:59:17 +0000 (21:59 +0200)]
Prepare post 4.0.0-m1 builds

Change-Id: I2e6a90d74f774d576e7d3595344dccaa27a96027
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge "Revert "ResolveMerge only needs to visit differing TreeEntries""
Matthias Sohn [Mon, 4 May 2015 13:33:27 +0000 (09:33 -0400)]
Merge "Revert "ResolveMerge only needs to visit differing TreeEntries""

9 years agoUse CBI eclipse-jarsigner-plugin 1.1.2-SNAPSHOT 04/47004/2
Matthias Sohn [Mon, 4 May 2015 06:56:28 +0000 (08:56 +0200)]
Use CBI eclipse-jarsigner-plugin 1.1.2-SNAPSHOT

CBI recently fixed a couple of resource leaks which probably caused
jar signing failures on Hudson (bug 464947). JGit builds were also
affected. Hence use version 1.1.2-SNAPSHOT until a new release is
available.

Bug:464947
Change-Id: I7fb4a65f888194f7209c866cd58551891c89fb7a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSupport agent= capability in wire protocol 28/46928/5
Shawn Pearce [Thu, 30 Apr 2015 19:43:46 +0000 (12:43 -0700)]
Support agent= capability in wire protocol

Since git-core ff5effd (v1.7.12.1) the native wire protocol transmits
the server and client implementation and version strings using
capability "agent=git/1.7.12.1" or similar.

Support this in JGit and hang the implementation data off UploadPack
and ReceivePack.  On HTTP transports default to the User-Agent HTTP
header until the client overrides this with the optional capability
string in the first line.

Extract the user agent string into a UserAgent class under transport
where it can be specified to a different value if the application's
build process has broken the Implementation-Version header in the
JGit package.

Change-Id: Icfc6524d84a787386d1786310b421b2f92ae9e65

9 years agoMerge changes I368af61a,I2400fe5f
Matthias Sohn [Thu, 30 Apr 2015 14:43:46 +0000 (10:43 -0400)]
Merge changes I368af61a,I2400fe5f

* changes:
  Remove pack from list when file handle is stale
  Lower log level to warn for handled pack errors

9 years agoAdd fsck.allowInvalidPersonIdent to accept invalid author/committers 35/46835/3
Shawn Pearce [Thu, 30 Apr 2015 04:56:28 +0000 (21:56 -0700)]
Add fsck.allowInvalidPersonIdent to accept invalid author/committers

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

9 years agoRemove pack from list when file handle is stale 49/45649/5
Hugo Arès [Tue, 7 Apr 2015 15:17:06 +0000 (11:17 -0400)]
Remove pack from list when file handle is stale

This error happens on nfs file system when you try to read a file that
was deleted or replaced.

When the error happens because the file was deleted, removing it from
the list is the proper way to handle the error, same use case as
FileNotFoundException. When the error happens because the file was
replaced, removing the file from the list will cause the file to be
re-read so it will get the latest version of the file.

Bug: 462868
Change-Id: I368af61a6cf73706601a3e4df4ef24f0aa0465c5
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
9 years agoLower log level to warn for handled pack errors 41/45641/4
Hugo Arès [Fri, 10 Apr 2015 13:08:07 +0000 (09:08 -0400)]
Lower log level to warn for handled pack errors

Pack not found and pack corrupted/invalid are handled by the code (pack
is removed from the list) so logging an error and the stacktrace is
misleading because it implies that there is an action to take to fix the
error.

Lower the log level to warn and remove the stacktrace for those 2 types
of errors and keep the error log statement for any other.

Change-Id: I2400fe5fec07ac6d6c244b852cce615663774e6e
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge branch 'stable-3.7' 97/46597/1
Matthias Sohn [Mon, 27 Apr 2015 21:59:26 +0000 (23:59 +0200)]
Merge branch 'stable-3.7'

* 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>
9 years agoPrepare 3.7.2-SNAPSHOT builds 23/46523/1 stable-3.7
Matthias Sohn [Sun, 26 Apr 2015 22:33:14 +0000 (00:33 +0200)]
Prepare 3.7.2-SNAPSHOT builds

Change-Id: Ia42a665e76953b643a080b58d2cd4526575ddf2e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoJGit v3.7.1.201504261725-r 22/46522/1 v3.7.1.201504261725-r
Matthias Sohn [Sun, 26 Apr 2015 21:23:20 +0000 (23:23 +0200)]
JGit v3.7.1.201504261725-r

Change-Id: I80639e317df80c103aef5cad75ad9079d43fb9d0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge "Revert "Let ObjectWalk.markUninteresting also mark the root tree as"" into...
Matthias Sohn [Sun, 26 Apr 2015 20:26:51 +0000 (16:26 -0400)]
Merge "Revert "Let ObjectWalk.markUninteresting also mark the root tree as"" into stable-3.7

9 years agoRevert "Let ObjectWalk.markUninteresting also mark the root tree as" 47/46447/2
David Ostrovsky [Fri, 24 Apr 2015 16:55:31 +0000 (18:55 +0200)]
Revert "Let ObjectWalk.markUninteresting also mark the root tree as"

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>
9 years agoDelete deprecated PackWriter.preparePack() methods 92/46492/1
Matthias Sohn [Fri, 24 Apr 2015 22:51:02 +0000 (00:51 +0200)]
Delete deprecated PackWriter.preparePack() methods

Change-Id: I62befa4a933c9ffd42d14519f555554cc513ddd9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated class IgnoreRule 91/46491/1
Matthias Sohn [Fri, 24 Apr 2015 22:43:20 +0000 (00:43 +0200)]
Delete deprecated class IgnoreRule

Was replaced by FastIgnoreRule in 3.6

Change-Id: Ia9c3d1231a5d97f3f5bddc81113954c9f9d8ee1e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoDelete deprecated checkoutEntry() methods in DirCacheCheckout 90/46490/1
Matthias Sohn [Fri, 24 Apr 2015 22:22:59 +0000 (00:22 +0200)]
Delete deprecated checkoutEntry() methods in DirCacheCheckout

Change-Id: I7fcf6534e6092ba87360ccd68a7dd7466c5c8911
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoRemove validate support when reusing cached pack 52/46452/2
Shawn Pearce [Fri, 24 Apr 2015 18:16:33 +0000 (11:16 -0700)]
Remove validate support when reusing cached pack

Cached packs are only used when writing over the network or to
a bundle file and reuse validation is always disabled in these
two contexts. The client/consumer of the stream will be SHA-1
checksumming every object.

Reuse validation is most critical during local GC to avoid silently
ignoring corruption by stopping as soon as a problem is found and
leaving everything alone for the end-user to debug and salvage.
Cached packs are not supported during local GC as the bitmap rebuild
logic does not support including a cached pack in the result.

Strip out the validation and force PackWriter to always disable the
cached pack feature if reuseValidation is enabled.

Change-Id: If0d7baf2ae1bf1f7e71bf773151302c9f7887039

9 years agoRename copyThroughCache to shouldCopyThroughCache 48/46448/2
Shawn Pearce [Fri, 24 Apr 2015 17:22:28 +0000 (10:22 -0700)]
Rename copyThroughCache to shouldCopyThroughCache

Sensible suggestion from Terry Parker as a late comment on
commit f2efcdc6f769d59722b17e9274932d585035cfb6.

Change-Id: I225775bfb6d3d91ae066ff00f9d80a9c02a422c2

9 years agoAdd readAheadBuffer hint to ReadableChannel 90/46390/4
Shawn Pearce [Fri, 24 Apr 2015 04:59:23 +0000 (21:59 -0700)]
Add readAheadBuffer hint to ReadableChannel

This hint allows an underlying implementation to read more bytes when
possible and buffer them locally for future read calls to consume.

Change-Id: Ia986a1bb8640eecb91cfbd515c61fa1ff1574a6f

9 years agoMerge "Restore AwtCredentialsProvider to enable debugging pgm in Eclipse"
Shawn Pearce [Fri, 24 Apr 2015 16:47:45 +0000 (12:47 -0400)]
Merge "Restore AwtCredentialsProvider to enable debugging pgm in Eclipse"

9 years agoAvoid storing large packs in block cache during reuse 87/46387/3
Shawn Pearce [Thu, 23 Apr 2015 19:12:43 +0000 (12:12 -0700)]
Avoid storing large packs in block cache during reuse

When a large pack (> 30% of the block cache) is being reused by
copying it pollutes the block cache with noise by storing blocks
that are never referenced again.

Avoid this by streaming the file directly from its channel onto
the output stream.

Change-Id: I2e53de27f3dcfb93de68b1fad45f75ab23e79fe7

9 years agoRestore AwtCredentialsProvider to enable debugging pgm in Eclipse 60/46260/1
Matthias Sohn [Wed, 22 Apr 2015 10:53:35 +0000 (12:53 +0200)]
Restore AwtCredentialsProvider to enable debugging pgm in Eclipse

In 6c1f7393882baf8464859136a70199ea96fcae0f the AWT based credentials
provider was dropped because we don't support Java 5 any longer so we
can always use the ConsoleCredentialsProvider which requires Java 6.
This broke debugging org.eclipse.jgit.pgm since Eclipse doesn't support
using a system console authenticator [1].

[1] see https://bugs.eclipse.org/bugs/show_bug.cgi?id=148831

Change-Id: Iba71001a7762e73d6579ba9dfa5a08ddaba777ea

9 years agoExpose public getDepth method 57/45957/2
David Pletcher [Thu, 16 Apr 2015 19:47:15 +0000 (12:47 -0700)]
Expose public getDepth method

The clone or fetch depth is a valuable bit of information
for access logging. Create a public getter to faciliate access.
A precondition check prevents unintentional misuse when the
data isn't valid yet.

Change-Id: I4603d5fd3bd4a767e3e2419b0f2da3664cfbd7f8
Signed-off-by: David Pletcher <dpletcher@google.com>
9 years agoFix error message to include cause if ResetCommand fails 05/45805/2
Matthias Sohn [Tue, 14 Apr 2015 13:28:19 +0000 (15:28 +0200)]
Fix error message to include cause if ResetCommand fails

Bug: 464048
Change-Id: I6e7d9262b94cb168c84faef1dea22c1e082fe5ad
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoRevert "ResolveMerge only needs to visit differing TreeEntries" 07/45607/3
Christian Halstrick [Fri, 10 Apr 2015 05:52:19 +0000 (07:52 +0200)]
Revert "ResolveMerge only needs to visit differing TreeEntries"

This reverts commit bda5e764200dafb2311149a9152c02373127287d. This reduces
performance at least for non-bare repositories.

Change-Id: Ib26cf8372f210798e104112edf14e91bfeaf23ec

9 years agoMerge "FS.readPipe() shouldn't log IOException as an error"
Shawn Pearce [Thu, 9 Apr 2015 01:08:50 +0000 (21:08 -0400)]
Merge "FS.readPipe() shouldn't log IOException as an error"

9 years agoMerge "Remove obsolete API warning filters to silence warnings"
Shawn Pearce [Thu, 9 Apr 2015 01:08:29 +0000 (21:08 -0400)]
Merge "Remove obsolete API warning filters to silence warnings"

9 years agoMerge "Use try-with-resources to fix warnings in AddCommand"
Shawn Pearce [Thu, 9 Apr 2015 01:08:00 +0000 (21:08 -0400)]
Merge "Use try-with-resources to fix warnings in AddCommand"

9 years agoMerge changes Iad4d4127,I0211bcf0
Shawn Pearce [Thu, 9 Apr 2015 01:07:05 +0000 (21:07 -0400)]
Merge changes Iad4d4127,I0211bcf0

* changes:
  Silence warning for non-translatable String in AddNoteCommand
  Use try-with-resources to fix warnings in AddNoteCommand

9 years agoMerge changes I28a5c7e2,If90a6cca
Shawn Pearce [Thu, 9 Apr 2015 01:05:31 +0000 (21:05 -0400)]
Merge changes I28a5c7e2,If90a6cca

* changes:
  Replace use of deprecated release() in BasePackPushConnection
  Replace use of deprecated release() in BasePackFetchConnection

9 years agoMerge changes I184945ee,Iacaad1a7
Shawn Pearce [Thu, 9 Apr 2015 01:04:07 +0000 (21:04 -0400)]
Merge changes I184945ee,Iacaad1a7

* changes:
  Remove unnecessary $NON-NLS comment in BaseReceivePack
  Use try-with-resources to close resources in BaseReceivePack

9 years agoMerge changes Ic555e6e0,Id4cb9a23
Shawn Pearce [Thu, 9 Apr 2015 00:59:03 +0000 (20:59 -0400)]
Merge changes Ic555e6e0,Id4cb9a23

* changes:
  Replace use of deprecated release() method in BlameResult
  Use try-with-resource to close BlameGenerator

9 years agoMerge "Use try-with-resource to close resources in BlobBasedConfig"
Shawn Pearce [Thu, 9 Apr 2015 00:58:31 +0000 (20:58 -0400)]
Merge "Use try-with-resource to close resources in BlobBasedConfig"

9 years agoMerge "Use try-with-resource to close resources in BundleFetchConnection"
Shawn Pearce [Thu, 9 Apr 2015 00:57:51 +0000 (20:57 -0400)]
Merge "Use try-with-resource to close resources in BundleFetchConnection"

9 years agoMerge "Use try-with-resource to close resources in BundleWriter"
Shawn Pearce [Thu, 9 Apr 2015 00:56:21 +0000 (20:56 -0400)]
Merge "Use try-with-resource to close resources in BundleWriter"

9 years agoUse try-with-resource to close resources in CommitCommand 89/45189/3
Matthias Sohn [Thu, 2 Apr 2015 22:52:41 +0000 (00:52 +0200)]
Use try-with-resource to close resources in CommitCommand

Change-Id: Ibbbc74acfd050f28e68f318970660b5959caf7e3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoExternalize error message used in CheckoutCommand 83/45183/3
Matthias Sohn [Thu, 2 Apr 2015 22:29:41 +0000 (00:29 +0200)]
Externalize error message used in CheckoutCommand

Change-Id: Ifbc469b07e63218107157ffbf23ae55c52a55ef4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in CheckoutCommand 82/45182/3
Matthias Sohn [Wed, 1 Apr 2015 23:36:22 +0000 (01:36 +0200)]
Use try-with-resource to close resources in CheckoutCommand

Change-Id: Ia4d4f9bff03a03d116b80022d7691df67bf8b51b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge "Fix resource leak in ChangeIdUtil"
Shawn Pearce [Wed, 8 Apr 2015 20:08:41 +0000 (16:08 -0400)]
Merge "Fix resource leak in ChangeIdUtil"

9 years agoMerge changes I11631afb,Iaa51a46a
Shawn Pearce [Wed, 8 Apr 2015 19:53:47 +0000 (15:53 -0400)]
Merge changes I11631afb,Iaa51a46a

* changes:
  Externalize error messages used in DfsGarbageCollector
  Use try-with-resource to close resources in DfsGarbageCollector

9 years agoMerge changes I8c06635c,I62d6de7d
Shawn Pearce [Wed, 8 Apr 2015 19:30:49 +0000 (15:30 -0400)]
Merge changes I8c06635c,I62d6de7d

* changes:
  Silence non-externalized string warning in CherryPickCommand
  Use try-with-resource to close resources in CherryPickCommand

9 years agoMerge "Silence non-externalized string warnings in CherryPickResult"
Shawn Pearce [Wed, 8 Apr 2015 19:30:16 +0000 (15:30 -0400)]
Merge "Silence non-externalized string warnings in CherryPickResult"

9 years agoMerge "Use try-with-resource to close resources in CloneCommand"
Shawn Pearce [Wed, 8 Apr 2015 19:29:52 +0000 (15:29 -0400)]
Merge "Use try-with-resource to close resources in CloneCommand"

9 years agoMerge "Replace call to deprecated RevWalk.release() in DescribeCommand"
Shawn Pearce [Wed, 8 Apr 2015 19:26:19 +0000 (15:26 -0400)]
Merge "Replace call to deprecated RevWalk.release() in DescribeCommand"

9 years agoMerge "Use try-with-resource to close resources in DiffCommand"
Shawn Pearce [Wed, 8 Apr 2015 19:26:06 +0000 (15:26 -0400)]
Merge "Use try-with-resource to close resources in DiffCommand"

9 years agoMerge "Fix resource leak in DiffFormatter"
Shawn Pearce [Wed, 8 Apr 2015 19:25:29 +0000 (15:25 -0400)]
Merge "Fix resource leak in DiffFormatter"

9 years agoMerge "Use try-with-resource to close resources in DirCache"
Shawn Pearce [Wed, 8 Apr 2015 19:22:57 +0000 (15:22 -0400)]
Merge "Use try-with-resource to close resources in DirCache"

9 years agoExternalize error messages used in DfsGarbageCollector 92/45192/3
Matthias Sohn [Thu, 2 Apr 2015 23:09:32 +0000 (01:09 +0200)]
Externalize error messages used in DfsGarbageCollector

Change-Id: I11631afb33a2bb29d994551a0be8775bbe277300
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in DfsGarbageCollector 91/45191/2
Matthias Sohn [Thu, 2 Apr 2015 23:03:15 +0000 (01:03 +0200)]
Use try-with-resource to close resources in DfsGarbageCollector

Change-Id: Iaa51a46a9dde13d6f5c0f9ff54a68cea0ef1fde3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoMerge "Reduce visibility of DirCacheCheckout.checkValidPath()"
Shawn Pearce [Wed, 8 Apr 2015 19:21:15 +0000 (15:21 -0400)]
Merge "Reduce visibility of DirCacheCheckout.checkValidPath()"

9 years agoMerge "Use try-with-resource to close resources in FetchProcess"
Shawn Pearce [Wed, 8 Apr 2015 19:20:36 +0000 (15:20 -0400)]
Merge "Use try-with-resource to close resources in FetchProcess"

9 years agoMerge "Use try-with-resource to close resources in GC"
Shawn Pearce [Wed, 8 Apr 2015 19:20:13 +0000 (15:20 -0400)]
Merge "Use try-with-resource to close resources in GC"

9 years agoMerge "Replace deprecated release() methods by close() in Merger"
Shawn Pearce [Wed, 8 Apr 2015 19:19:18 +0000 (15:19 -0400)]
Merge "Replace deprecated release() methods by close() in Merger"

9 years agoMerge "Ensure that NameRevCommand.call() closes RevWalk"
Shawn Pearce [Wed, 8 Apr 2015 19:18:12 +0000 (15:18 -0400)]
Merge "Ensure that NameRevCommand.call() closes RevWalk"

9 years agoMerge "Replace deprecated release() methods by close() in NoteMapMerger"
Shawn Pearce [Wed, 8 Apr 2015 19:17:28 +0000 (15:17 -0400)]
Merge "Replace deprecated release() methods by close() in NoteMapMerger"

9 years agoMerge "Use try-with-resource to close resources in ObjectDatabase"
Shawn Pearce [Wed, 8 Apr 2015 19:17:11 +0000 (15:17 -0400)]
Merge "Use try-with-resource to close resources in ObjectDatabase"

9 years agoMerge changes Ia3908555,I3bc26847
Shawn Pearce [Wed, 8 Apr 2015 19:16:51 +0000 (15:16 -0400)]
Merge changes Ia3908555,I3bc26847

* changes:
  Silence false null pointer access warnings in PackFile
  Externalize error messages used in ObjectDirectoryInserter

9 years agoMerge "Silence non-externalized string warning in PackIndexV2"
Shawn Pearce [Wed, 8 Apr 2015 19:15:46 +0000 (15:15 -0400)]
Merge "Silence non-externalized string warning in PackIndexV2"

9 years agoMerge changes I1a4181fc,Ic2db0511
Shawn Pearce [Wed, 8 Apr 2015 19:15:32 +0000 (15:15 -0400)]
Merge changes I1a4181fc,Ic2db0511

* changes:
  Silence non-externalized string warning in PackParser
  Replace call to deprecated release() by close() in PackParser

9 years agoSilence non-externalized string warning in PackParser 84/45284/1
Matthias Sohn [Fri, 3 Apr 2015 22:54:24 +0000 (00:54 +0200)]
Silence non-externalized string warning in PackParser

Change-Id: I1a4181fc292c42157c69479f71c7674b2e00d2ce
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoReplace call to deprecated release() by close() in PackParser 83/45283/1
Matthias Sohn [Fri, 3 Apr 2015 22:53:47 +0000 (00:53 +0200)]
Replace call to deprecated release() by close() in PackParser

Change-Id: Ic2db051130059cce89486f55ecca32a7ce6715fd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence non-externalized string warning in PackIndexV2 82/45282/1
Matthias Sohn [Fri, 3 Apr 2015 22:51:05 +0000 (00:51 +0200)]
Silence non-externalized string warning in PackIndexV2

Change-Id: I8c94811972c593c898f6375178f250a2123d01c6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence false null pointer access warnings in PackFile 81/45281/1
Matthias Sohn [Fri, 3 Apr 2015 22:49:05 +0000 (00:49 +0200)]
Silence false null pointer access warnings in PackFile

Change-Id: Ia39085557b38840dfaa9b4995e6f6c40e19042cb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoExternalize error messages used in ObjectDirectoryInserter 79/45279/1
Matthias Sohn [Fri, 3 Apr 2015 22:45:33 +0000 (00:45 +0200)]
Externalize error messages used in ObjectDirectoryInserter

Change-Id: I3bc26847071fbc31267a4a4cf5a10b428bcf229d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in ObjectDatabase 77/45277/1
Matthias Sohn [Fri, 3 Apr 2015 22:38:39 +0000 (00:38 +0200)]
Use try-with-resource to close resources in ObjectDatabase

Change-Id: Ib410bf0d3c300c25b615bb6a51488b3d88aeb3bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoReplace deprecated release() methods by close() in NoteMapMerger 76/45276/1
Matthias Sohn [Fri, 3 Apr 2015 22:36:28 +0000 (00:36 +0200)]
Replace deprecated release() methods by close() in NoteMapMerger

Change-Id: Iaa76f0e853bb82cd7f231fd2f462a319f4196d8c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoEnsure that NameRevCommand.call() closes RevWalk 75/45275/1
Matthias Sohn [Fri, 3 Apr 2015 22:32:59 +0000 (00:32 +0200)]
Ensure that NameRevCommand.call() closes RevWalk

Change-Id: Icc35a81081759d664fe9e2b05e962ff3cd9aad92
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoReplace deprecated release() methods by close() in Merger 72/45272/1
Matthias Sohn [Fri, 3 Apr 2015 22:19:39 +0000 (00:19 +0200)]
Replace deprecated release() methods by close() in Merger

Change-Id: I80ce98511a6e9048f1eea93288d6960dcbf3326f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in GC 71/45271/1
Matthias Sohn [Fri, 3 Apr 2015 22:17:03 +0000 (00:17 +0200)]
Use try-with-resource to close resources in GC

Change-Id: I62a755a4ce839a252a5e80abf3f0d21243862376
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in FetchProcess 67/45267/1
Matthias Sohn [Fri, 3 Apr 2015 22:05:14 +0000 (00:05 +0200)]
Use try-with-resource to close resources in FetchProcess

Change-Id: If489d530ca39ae279c8da848f870b561c38eac3c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoClearer error message when service is not enabled 26/43926/4
Hector Oswaldo Caballero [Mon, 16 Mar 2015 12:48:56 +0000 (08:48 -0400)]
Clearer error message when service is not enabled

When a user tried to use a service not enabled in the remote server
a misleading error  message was given:

   fatal: remote error: Git access forbidden

This patch modifies the error message to make the cause clearer
to the user. Now, when the user tries to use a not enabled service,
the message error clearly states it:

   fatal: remote error: Service not enabled

Change-Id: If096c4ddd17c5aae0e99e3ea6eea4b69bd3c5466
Signed-off-by: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
9 years agoReduce visibility of DirCacheCheckout.checkValidPath() 98/45198/1
Matthias Sohn [Fri, 3 Apr 2015 00:03:00 +0000 (02:03 +0200)]
Reduce visibility of DirCacheCheckout.checkValidPath()

This was deprecated and should only be used by DirCacheCheckout and
friends. Other classes should use SystemReader.checkPath() instead.

Change-Id: I37cf753b1f081602dee9f0f47979eff39d735f92
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in DirCache 95/45195/1
Matthias Sohn [Thu, 2 Apr 2015 23:25:45 +0000 (01:25 +0200)]
Use try-with-resource to close resources in DirCache

Change-Id: I7dd3fd38784689816a1a8e9d8ccb499ae2138a8a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFix resource leak in DiffFormatter 94/45194/1
Matthias Sohn [Thu, 2 Apr 2015 23:23:31 +0000 (01:23 +0200)]
Fix resource leak in DiffFormatter

- close RevWalk allocated in scan()
- replace use of deprecated ObjectReader.release() method

Change-Id: I41b2b10a1a44270a6ceaa1741e996c0921439852
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in DiffCommand 93/45193/1
Matthias Sohn [Thu, 2 Apr 2015 23:15:37 +0000 (01:15 +0200)]
Use try-with-resource to close resources in DiffCommand

Change-Id: I13d7c8bd0eb049aa69effd8b74384746226414cb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoReplace call to deprecated RevWalk.release() in DescribeCommand 90/45190/1
Matthias Sohn [Thu, 2 Apr 2015 22:58:50 +0000 (00:58 +0200)]
Replace call to deprecated RevWalk.release() in DescribeCommand

Change-Id: Ie4bfdeb37d345d6ff1525a737f3b7653b2f8e23e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in CloneCommand 88/45188/1
Matthias Sohn [Thu, 2 Apr 2015 22:38:42 +0000 (00:38 +0200)]
Use try-with-resource to close resources in CloneCommand

Change-Id: I9536bc208a5f3ec34f0a82fb565b4253be38e074
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence non-externalized string warnings in CherryPickResult 86/45186/1
Matthias Sohn [Thu, 2 Apr 2015 22:36:36 +0000 (00:36 +0200)]
Silence non-externalized string warnings in CherryPickResult

Change-Id: I515abbcb4319b744c5074de5a0c56caed13c2fb5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoSilence non-externalized string warning in CherryPickCommand 85/45185/1
Matthias Sohn [Thu, 2 Apr 2015 22:33:01 +0000 (00:33 +0200)]
Silence non-externalized string warning in CherryPickCommand

Change-Id: I8c06635ce655470b5b650fa5c0c546e64445420c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in CherryPickCommand 84/45184/1
Matthias Sohn [Thu, 2 Apr 2015 22:32:08 +0000 (00:32 +0200)]
Use try-with-resource to close resources in CherryPickCommand

Change-Id: I62d6de7d67c7de2460f4cbe918ad2bb8109650b9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoFix resource leak in ChangeIdUtil 00/45100/1
Matthias Sohn [Wed, 1 Apr 2015 23:30:14 +0000 (01:30 +0200)]
Fix resource leak in ChangeIdUtil

Change-Id: I5cb3e9c7e167248697932933eef925c446514683
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in BundleWriter 99/45099/1
Matthias Sohn [Wed, 1 Apr 2015 23:25:46 +0000 (01:25 +0200)]
Use try-with-resource to close resources in BundleWriter

Change-Id: I5341973737f6d21c04982bcbefc2ed672ac9bcff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in BundleFetchConnection 98/45098/1
Matthias Sohn [Wed, 1 Apr 2015 23:24:05 +0000 (01:24 +0200)]
Use try-with-resource to close resources in BundleFetchConnection

Change-Id: Id79c01133b835e278d5b494b5bc5972d7aeed9a9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close resources in BlobBasedConfig 97/45097/1
Matthias Sohn [Wed, 1 Apr 2015 23:21:55 +0000 (01:21 +0200)]
Use try-with-resource to close resources in BlobBasedConfig

Change-Id: Idb890788a88049d07326cd48e7c5534148f18e32
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoReplace use of deprecated release() method in BlameResult 96/45096/1
Matthias Sohn [Wed, 1 Apr 2015 23:18:42 +0000 (01:18 +0200)]
Replace use of deprecated release() method in BlameResult

Change-Id: Ic555e6e0443337aed694bc6445a60abe08e07ad2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years agoUse try-with-resource to close BlameGenerator 95/45095/1
Matthias Sohn [Wed, 1 Apr 2015 23:15:59 +0000 (01:15 +0200)]
Use try-with-resource to close BlameGenerator

Change-Id: Id4cb9a236dddfc674b55e9e7037329a885455288
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>