aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix replacement quoting for replaceAll in filter commandMarkus Duft2018-09-101-1/+3
| | | | | | | | | | | | | According to String.replaceAll JavaDoc: "Note that backslashes (\) and dollar signs ($) in the replacement string may cause the results to be different than if it were being treated as a literal replacement string; see Matcher.replaceAll. Use java.util.regex.Matcher.quoteReplacement to suppress the special meaning of these characters, if desired." Bug: 536318 Change-Id: Ib70cfec41bf73e14d23d94d14aee05a25b1e87f6 Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
* Merge branch 'stable-5.0' into stable-5.1Matthias Sohn2018-09-101-0/+6
|\ | | | | | | | | | | | | | | | | * stable-5.0: Prepare 4.11.3-SNAPSHOT builds JGit v4.11.2.201809100523-r Change-Id: I6bd3cb830b7b44dc6e5fd66ff0732957be6b5710 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-09-101-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.3-SNAPSHOT builds JGit v4.11.2.201809100523-r Change-Id: I8a6f2667f9e43d53e995554224c2a538d1959996 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Prepare 4.11.3-SNAPSHOT buildsMatthias Sohn2018-09-1056-356/+356
| | | | | | | | | | | | | | | Change-Id: I4f5dda6da3f6ecd9b99c1d9a220844c5402f1988 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * JGit v4.11.2.201809100523-rv4.11.2.201809100523-rMatthias Sohn2018-09-1056-59/+59
| | | | | | | | | | | | | | | Change-Id: I85dab173a94b3036ccf669c20b9dffb4af0922b4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Update Orbit 2018-09 to R20180905201904Matthias Sohn2018-09-1011-17/+17
| | | | | | | | | | | | Change-Id: I15e79024b89e45a5ba60c7aba909d899733bcb2f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge branch 'stable-5.0' into stable-5.1Matthias Sohn2018-09-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Prepare 5.0.4-SNAPSHOT builds JGit v5.0.3.201809091024-r Prepare 4.9.5-SNAPSHOT builds JGit v4.9.4.201809090327-r Fix @since tag for LOCK_SUFFIX Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: I9117b961035ee527cb8e1dd5df59976fff83829d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare 5.0.4-SNAPSHOT buildsMatthias Sohn2018-09-0956-357/+357
| | | | | | | | | | | | | | | Change-Id: Ib9042662c3f2a1544d597d476c5952c61767687b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v5.0.3.201809091024-rv5.0.3.201809091024-rMatthias Sohn2018-09-0956-59/+59
| | | | | | | | | | | | | | | Change-Id: I9e8e74a10dbb235b08c6a5e1b169c5cae440f129 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-09-091-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.9.5-SNAPSHOT builds JGit v4.9.4.201809090327-r Fix @since tag for LOCK_SUFFIX Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: Ia72fc409f0262565cf31b8bc62737c78fc4c3485 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-09-092-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.5-SNAPSHOT builds JGit v4.9.4.201809090327-r Fix @since tag for LOCK_SUFFIX Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: I8e962758973753fe7baffd959050593a059ee44e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-09-092-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.5-SNAPSHOT builds JGit v4.9.4.201809090327-r Fix @since tag for LOCK_SUFFIX Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: I78099d2a5ba895273ca3ac587c7aa5f3f43fe869 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Prepare 4.9.5-SNAPSHOT buildsMatthias Sohn2018-09-0956-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8d2b60be1803399027e1a3e9734625278a63861 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * JGit v4.9.4.201809090327-rv4.9.4.201809090327-rMatthias Sohn2018-09-0956-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13488a915fe0ba871c5f37c6e9efc6f436083171 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-09-092-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Fix @since tag for LOCK_SUFFIX Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: Id3c85149316cbe671e55f41438bd3a3a892b4ed0
| | | | | * Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-09-090-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: I980807ad4701f9e510354b505c9556e123f32471 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Prepare 4.7.4-SNAPSHOT buildsMatthias Sohn2018-09-0956-321/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4d17e1604270946606e75145012c5b7fa1283eb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * JGit v4.7.3.201809090215-rv4.7.3.201809090215-rMatthias Sohn2018-09-0956-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ded7a2b61235509c5a6ba95e7329e288bbfddb1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | Fix @since tag for LOCK_SUFFIXMatthias Sohn2018-09-092-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia65cf3f12ec6d35a21b4d9332be912f06d8bf834 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | Use the same default diff.renameLimit = 400 like native gitMatthias Sohn2018-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 434085 Change-Id: I43a0401049cd85b2c7a2162ccc071af7fffdfed3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | Merge branch 'stable-5.0' into stable-5.1Matthias Sohn2018-09-089-18/+209
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix atomic lock file creation on NFS Use constant for ".lock" Fix handling of option core.supportsAtomicCreateNewFile GC: Avoid logging errors when deleting non-empty folders Change-Id: I3c8892e33516bdcadd983e7ab668635b7fa3d4c5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-09-089-11/+219
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Fix atomic lock file creation on NFS Use constant for ".lock" Fix handling of option core.supportsAtomicCreateNewFile GC: Avoid logging errors when deleting non-empty folders Change-Id: Ifcc8bfab4fd05c18a08dd82588860dffd0e6d726 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-09-0813-98/+232
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix atomic lock file creation on NFS Use constant for ".lock" Fix handling of option core.supportsAtomicCreateNewFile GC: Avoid logging errors when deleting non-empty folders Change-Id: Ie86079d9ad76972306bc80e63d8bfe18ae06a0da Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-09-0812-21/+255
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix atomic lock file creation on NFS Use constant for ".lock" Fix handling of option core.supportsAtomicCreateNewFile GC: Avoid logging errors when deleting non-empty folders Change-Id: I32dc651870b7ba7c88de448c7984134b7c99e7e3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-09-0812-75/+238
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Fix atomic lock file creation on NFS Use constant for ".lock" Fix handling of option core.supportsAtomicCreateNewFile GC: Avoid logging errors when deleting non-empty folders Change-Id: Id7f68f4e8fb07a21737e3b7090f600507a13bbbe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-09-0812-22/+234
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Fix atomic lock file creation on NFS Use constant for ".lock" Fix handling of option core.supportsAtomicCreateNewFile GC: Avoid logging errors when deleting non-empty folders Change-Id: Ia7a18f69eee173aec9e462c16eee2b0ca4565e76 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Fix atomic lock file creation on NFSMatthias Sohn2018-09-075-6/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FS_POSIX.createNewFile(File) failed to properly implement atomic file creation on NFS using the algorithm [1]: - name of the hard link must be unique to prevent that two processes using different NFS clients try to create the same link. This would render nlink useless to detect if there was a race. - the hard link must be retained for the lifetime of the file since we don't know when the state of the involved NFS clients will be synchronized. This depends on NFS configuration options. To fix these issues we need to change the signature of createNewFile which would break API. Hence deprecate the old method FS.createNewFile(File) and add a new method createNewFileAtomic(File). The new method returns a LockToken which needs to be retained by the caller (LockFile) until all involved NFS clients synchronized their state. Since we don't know when the NFS caches are synchronized we need to retain the token until the corresponding file is no longer needed. The LockToken must be closed after the LockFile using it has been committed or unlocked. On Posix, if core.supportsAtomicCreateNewFile = false this will delete the hard link which guarded the atomic creation of the file. When acquiring the lock fails ensure that the hard link is removed. [1] https://www.time-travellers.org/shane/papers/NFS_considered_harmful.html also see file creation flag O_EXCL in http://man7.org/linux/man-pages/man2/open.2.html Change-Id: I84fcb16143a5f877e9b08c6ee0ff8fa4ea68a90d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Use constant for ".lock"Matthias Sohn2018-09-077-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5f27032fb85694a093f827581216d4ffb99db68b) Change-Id: I6bc0e9a910b110418a82d8e574fb2aecc3a31d6a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Fix handling of option core.supportsAtomicCreateNewFileChristian Halstrick2018-09-071-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When core.supportsAtomicCreateNewFile was set to false and the repository was located on a filesystem which doesn't support the file attribute "unix:nlink" then FS_POSIX#createNewFile may report an error even if everything was ok. Modify FS_POSIX#createNewFile to silently ignore this situation. An example of such a filesystem is sshfs where reading "unix:nlink" always returns 1 (instead of throwing a exception). Bug: 537969 Change-Id: I6deda7672fa7945efa8706ea1cd652272604ff19 Also-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | * GC: Avoid logging errors when deleting non-empty foldersHector Caballero2018-09-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I88304d34c and Ia555bce00 modified the way errors are handled when trying to delete non-empty reference folders. Before, this error was silently ignored as it was considered an expected output. Now, every failed folder delete is logged which can be noisy. Ignore the DirectoryNotEmptyException but log any other error avoiding deletion of an eligible folder. Signed-off-by: Hector Oswaldo Caballero <hector.caballero@ericsson.com> Change-Id: I194512f67885231d62c03976ae683e5cc450ec7c
* | | | | | | Prepare 5.1.0-SNAPSHOT buildsMatthias Sohn2018-09-0556-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d06c5237edae54b09f465f415f5a308b5e7ceff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | JGit v5.1.0.201809051400-rc1v5.1.0.201809051400-rc1Matthias Sohn2018-09-0556-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b53f95ee51d94da8b029c9bb10eb854ff9dd4f6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | Merge branch 'master' into stable-5.1Matthias Sohn2018-09-05127-696/+1350
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: UploadPackTest: Avoid unnecessarily boxing int into Integer Parse signature of GPG-signed commits Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8 Simplify file creation in ResetCommandTest Specify charset when constructing InputStreamReader Update Orbit to S20180829155938 for 2018-09 RC1 Replace useminimalnegotation flag with maxhaves flag Extract protocol v2 fetch request parsing to its own class FetchV2Request: Rename shallowSince to deepenSince FetchV2Request: Correct typo in parameter name FetchV2Request round up (doneReceived, renamings) Use right variable in error message about depth UploadPack: avoid conflating shallow commit lists in protocol v2 Bazel: Use hyphen instead of underscore in external repository names Format BUILD files with buildifier 0.15.0 Upgrade maven-compiler-plugin to 3.8.0 Change-Id: Ibc6feb828e4ff20a3158e6b75dcfce7617e00b0e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | UploadPackTest: Avoid unnecessarily boxing int into IntegerDavid Pursehouse2018-09-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The statement: assertThat(recvStream.available(), is(0)); results in a warning from Eclipse: The expression of type int is boxed into Integer because recvStream.available() returns int, but the hamcrest is() method takes an Integer. Replace it with the equivalent JUnit assertion. Also remove the suppression of another similar warning and fix that in the same way. Change-Id: I6f18b304a540bcd0a10aec7d3abc7dc6f047fe80 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | Parse signature of GPG-signed commitsDavid Turner2018-09-044-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support GPG-signed commits, add some methods which will allow GPG signatures to be parsed out of RevCommit objects. Later, we can add code to verify the signatures. Change-Id: Ifcf6b3ac79115c15d3ec4b4eaed07315534d09ac Signed-off-by: David Turner <dturner@twosigma.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8David Pursehouse2018-09-04105-397/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b748620f067582afef20f144feebe40d0332be2 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | Simplify file creation in ResetCommandTestRené Scheibe2018-09-031-38/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use existing test utility methods instead of nested PrintWriter usage. Change-Id: I324852c7971ae644fa499f377a31d1cf265c7fd9 Signed-off-by: René Scheibe <rene.scheibe@gmail.com>
| * | | | | | | Specify charset when constructing InputStreamReaderDavid Pursehouse2018-09-025-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ErrorProne warns [1] about implicit use of the platform default charset, which can result in differing behaviour between JVM executions or incorrect behavior if the encoding of the data source doesn't match expectations. [1] http://errorprone.info/bugpattern/DefaultCharset Change-Id: I0fd489d352170339c3867355cd24324dfdbd4b59 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | Update Orbit to S20180829155938 for 2018-09 RC1Matthias Sohn2018-09-0111-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48d5a2e06e2833c9745cb71c53600da3ed5f8501 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Merge "Replace useminimalnegotation flag with maxhaves flag"Jonathan Nieder2018-08-312-60/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Replace useminimalnegotation flag with maxhaves flagMinh Thai2018-08-312-60/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client will stop sending haves when the number of haves sent reaches maxhaves. Change-Id: I1e5b1525be4c67f20a81ca24a2770c20eb5c1271 Signed-off-by: Minh Thai <mthai@google.com>
| * | | | | | | | Extract protocol v2 fetch request parsing to its own classIvan Frade2018-08-313-137/+585
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parsing code for protocol v2 fetch doesn't have any dependency on the rest of UploadPack. Move it to its own class. This makes testing easier (no need to instantiate the full UploadPack), simplifies the code in UploadPack and increases modularity. At the moment, the parser needs to know about the reference database to validate incoming references. This dependency could be easily removed moving the validation later in the flow, after the parsing, where other validations are already happening. Postponing that to keep this patch about moving unmodified code around. Change-Id: I7ad29a6b99caa7c12c06f5a7f30ab6a5f6e44dc7 Signed-off-by: Ivan Frade <ifrade@google.com>
| * | | | | | | | FetchV2Request: Rename shallowSince to deepenSinceJonathan Nieder2018-08-312-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fetch parameter is called deepen-since in the protocol. Call it the same thing in the request object to make the code easier to reason about. This doesn't touch UploadPack#shallowSince, which is likely to be eliminated altogether in a later patch anyway. Change-Id: I8ef34bc7ad12fae3a9057ae951367cc024e1a1cb Suggested-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | | | | | FetchV2Request: Correct typo in parameter nameJonathan Nieder2018-08-311-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is an extra 'd' in deependNotRefs. Noticed during code review. Change-Id: I93d8d7951fe5c351b62e23bdf5bad0ebd631017d Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | | | | Merge "FetchV2Request round up (doneReceived, renamings)"Jonathan Nieder2018-08-312-26/+46
| |\ \ \ \ \ \ \
| | * | | | | | | FetchV2Request round up (doneReceived, renamings)Ivan Frade2018-08-312-26/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "doneReceived" a member of the fetch request. It indicates if the "done" line has been received (so it makes sense there) and makes all the code after the parsing depend only on the request. Rename "shallowExcludeRefs" to "deepenNot". Those refs come in "deepen-not" lines in the protocol, and this name makes clearer the intention. Change-Id: I7bec65de04930277266491d278de7c3af7d8cbe6 Signed-off-by: Ivan Frade <ifrade@google.com>
| * | | | | | | | Merge branch 'stable-5.1'David Pursehouse2018-08-312-69/+68
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Bazel: Use hyphen instead of underscore in external repository names Bazel: Format all build files with buildifier 0.15.0 ChangeIdUtilTest: Remove unused notestCommitDashV Change-Id: Ie9d77a7716591246b87fb59ac85214417fe8309d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | Merge branch 'stable-5.0' into stable-5.1David Pursehouse2018-08-315-100/+99
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Bazel: Use hyphen instead of underscore in external repository names Bazel: Format all build files with buildifier 0.15.0 ChangeIdUtilTest: Remove unused notestCommitDashV Change-Id: I7c2fc7d694d7d891cac96cb805c89c8bdf7c5cbf Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-08-315-97/+96
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Bazel: Use hyphen instead of underscore in external repository names Bazel: Format all build files with buildifier 0.15.0 ChangeIdUtilTest: Remove unused notestCommitDashV Change-Id: I5ebb1058927ea5a478eae9e44b7d96f123a22523 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | | | | Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-08-314-92/+91
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Bazel: Use hyphen instead of underscore in external repository names Bazel: Format all build files with buildifier 0.15.0 ChangeIdUtilTest: Remove unused notestCommitDashV Change-Id: I500dd4e63302abb19ad669988b3a427cef8ef3d4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>