Commit Graph

4009 Commits

Author SHA1 Message Date
Fredrik Medley 96f210f4b7 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>
2015-06-09 18:43:48 +02:00
Matthias Sohn a89dbbd87e 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>
2015-06-09 17:17:18 +02:00
Matthias Sohn 2dd4dc149c Prepare 4.0.1-SNAPSHOT builds
Change-Id: I51d03d1a47d1e3cd453701e397750749867028a2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 15:17:22 +02:00
Matthias Sohn 4f22185455 JGit v4.0.0.201506090130-r
Change-Id: I01ad84fc74555656c42934cd62a85269a7030557
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 07:29:27 +02:00
Jonathan Nieder c1fca6cb43 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>
2015-06-08 10:47:15 -07:00
Matthias Sohn d8040f3406 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>
2015-06-08 12:59:28 +02:00
Jonathan Nieder 48b67012d6 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>
2015-06-05 16:08:55 -07:00
Jonathan Nieder a04d1ad2f1 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>
2015-06-05 14:14:55 -07:00
Shawn Pearce 336092afa7 Merge "Restore checkObjectCollisions flag" 2015-06-04 16:35:51 -04:00
David Pletcher c06620882b 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 9638e0aa87,
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>
2015-06-04 13:26:36 -07:00
Dave Borowitz b9f850a79b 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
2015-06-04 11:50:31 -07:00
Dave Borowitz 96eb3ee397 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
2015-06-04 11:50:31 -07:00
Jonathan Nieder 6227b340d3 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>
2015-06-03 12:27:17 -07:00
Shawn Pearce fb21fb10fc Revert "Fix unchecked conversion warning in MergeFormatter"
This reverts commit 6d4ebd168d.

Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4
2015-06-03 14:31:41 -04:00
Matthias Sohn d19ce2435d Delete deprecated TemporaryBuffer.LocalFile constructors
Change-Id: I5fdbf997ebcbe48e86f4c41c6b2643f47054b0c3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:27 +02:00
Matthias Sohn f691106547 Delete deprecated FileUtils.setExecute(File, boolean)
Change-Id: Ifa63e3743fb4de25e074404c301f860a1ffb5e02
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:27 +02:00
Matthias Sohn ba51037a69 Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)
Change-Id: I687c392e5a625fd66c45998c94373aa59921b986
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 08c8cf027d Delete deprecated UploadPackMayNotContinueException
Change-Id: Id298fc860684d2a2288769282fd8ce4475009dc8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn fa56e0deae Delete deprecated TransferConfig.isFsckObjects()
Change-Id: Ib7f36282d69a3298b1ac177ae17af0f80d64964f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 07114d99a0 Delete deprecated TextBuiltin.out
Change-Id: I184c2f0e0203fa95e0a117391bae93da0d23a435
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 913095e39e Delete deprecated Merger.getBaseCommit()
Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:25 +02:00
Terry Parker dd22bc831a 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>
2015-06-02 22:49:55 -04:00
Jonathan Nieder 8c3fe215b4 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>
2015-06-02 16:54:09 -07:00
Jonathan Nieder cc4f4f2fe1 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>
2015-06-02 16:54:08 -07:00
Jonathan Nieder 761e61f1ed dumb HTTP: Clarify AsIsFilter by introducing req and res locals
No functional change.

Change-Id: I945ba18879c360f433e026aa125ef3f9f6a75793
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-02 16:54:08 -07:00
Jonathan Nieder 54b195ad3e 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>
2015-06-02 16:54:07 -07:00
Matthias Sohn a79168bcbb Prepare 4.1.0-SNAPSHOT builds
Change-Id: I03d08b8e2d3400d4b5cdb4ab541b312870776843
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 00:52:00 +02:00
Matthias Sohn 97aa021145 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>
2015-06-03 00:27:27 +02:00
Matthias Sohn 72ecb5c8c7 Prepare post 4.0-RC3 builds
Change-Id: I74469f1243503098fb05b5ddec3fa609132debab
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02 23:11:57 +02:00
Matthias Sohn d59fafc7ca JGit v4.0.0.201506020755-rc3
Change-Id: I31c6177d19cba228aa67b2b5c3e0d82c38395cda
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02 13:55:16 +02:00
Matthias Sohn f9c7253b15 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>
2015-06-02 00:13:19 +02:00
Matthias Sohn 1e7262ae17 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>
2015-06-01 22:49:02 +02:00
Matthias Sohn 6fc5af47d1 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>
2015-06-01 16:07:53 +02:00
Matthias Sohn ce8baa3715 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>
2015-06-01 16:07:52 +02:00
Matthias Sohn 174c8c5d39 Update 4.5 target platform to use final Mars Orbit repository
Change-Id: Ie8ff09e6b054e5fae0786557b8fe831eb9e82dd2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01 16:07:52 +02:00
Matthias Sohn c5f7ab3482 Compare API changes in clirr report against 3.7.0
Change-Id: Id819fd700ed44cdc3cdbe33a4bb9ee52a6fbbd41
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01 11:12:06 +02:00
Christian Halstrick 6d09c486ed 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>
2015-06-01 10:42:21 +02:00
Shawn Pearce b10259f44b 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
2015-05-31 19:41:54 -04:00
Matthias Sohn 5059e3e408 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>
2015-05-29 04:19:25 -04:00
Matthias Sohn efacad0fc8 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>
2015-05-29 00:15:33 +02:00
Matthias Sohn 8787176ef1 Silence unchecked conversion warning in TransportSftp
Change-Id: I3dc8e0b483072bdf193ae4190a60d1867ebefd12
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:33 +02:00
Matthias Sohn e013bcdcc6 Silence deprecation warning in WindowCacheConfig
Change-Id: I923b65efeaacc5e9cc8aecc754ab8d8e63ccd2e5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:33 +02:00
Matthias Sohn 17307df3af Silence deprecation warning in DirCacheCheckout
Change-Id: I9e021ba2e0d1317bd98e86f832d55787ed6b0a63
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:33 +02:00
Matthias Sohn 6d4ebd168d Fix unchecked conversion warning in MergeFormatter
Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:32 +02:00
Matthias Sohn faae5cdb5b Fix hidden field warnings in bundle org.eclipse.jgit
Change-Id: I4e79cefe15037df0e1c520956bf2482240e31a7d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:32 +02:00
Hugo Arès 663ccd76f0 Close WindowCursor using try-with-resources in UnpackedObject
Change-Id: I187403ed432f7d6b1e84223918bd72d895e6bdfe
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
2015-05-28 16:07:23 -04:00
Shawn Pearce a3468f87cb 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
2015-05-28 15:39:08 -04:00
Shawn Pearce 5426ba2778 Merge "Silence false potential null pointer access warnings" 2015-05-28 15:37:11 -04:00
Shawn Pearce 10b99121b0 Merge "Fix WindowCursor memory leak." 2015-05-28 15:35:26 -04:00
Shawn Pearce ff75f18f07 Merge changes I144a53fe,I2b268e6a
* changes:
  Add tests for ObjectFilter
  Expose Sets helper to tests outside org.eclipse.jgit.api
2015-05-28 15:35:15 -04:00