summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle diff formatting when there is nothing to compare withRobin Rosenberg2014-07-063-19/+124
| | | | | | | | DiffFormatter now suports either side being null and the log program will output the diff for the first commit. Bug: 395791 Change-Id: I378957b57e9ad1f7195ba416f402178453f0ebd3
* Eliminate warning about overlapping variable namesRobin Rosenberg2014-07-041-5/+5
| | | | Change-Id: I7e749092c5b51e2857c186088e2c5c6c6d295367
* Don't warn for methods that can be staticRobin Rosenberg2014-07-0215-15/+15
| | | | | | | | Making the methods static would gain little in performance, make the code harder to change. Removing unncessary warnings is more important. Change-Id: If3e6aa9c1d92e58b4e7a8e246cf4aace237d7a7b
* Add new default settings from Eclipse 4.4Robin Rosenberg2014-07-0216-1/+81
| | | | | | | | These settings were added by Eclipse simply by touching the project settings. Adding these makes it simpler to see what local changes have been made. Change-Id: Iab0aa62530312eb0c78b03b5c6a632742bcc4978
* Merge "Clarify comments in message properties files (and fix grammar)"Matthias Sohn2014-07-012-3/+3
|\
| * Clarify comments in message properties files (and fix grammar)Robin Stocker2014-06-302-3/+3
| | | | | | | | | | | | Bug: 438261 Change-Id: I7b98475886ef789ae7635d8c9e008fc1aa00d534 Signed-off-by: Robin Stocker <robin@nibor.org>
* | Try to fix intermittent test failure related to file timestampsRobin Rosenberg2014-07-011-3/+4
|/ | | | | | | | | | Improve how tests do a "touch" operation on files. Instead of doing "f.setLastModified(System.currentTimeMillis)" open a Outputstream on the file and directly close it again. This makes this method rely only on one clock - the clock of the filesystem. Bug: 436917 Change-Id: I68ef3c2878f28b12daebf2ef6a9fa0a5d6e0964d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix incorrect "''" in CLIText.propertiesRobin Stocker2014-06-301-1/+1
| | | | | | | | This message is not processed by MessageFormat. Bug: 438261 Change-Id: If75d8f3cd3f356a56623eee96b64e8845de5eb38 Signed-off-by: Robin Stocker <robin@nibor.org>
* Add a comment to the message properties files on how they are processedRobin Rosenberg2014-06-292-0/+8
| | | | Change-Id: I073f0c2c0729e6a5d3f1834203f0cfeb4c462eda
* Fix spelling error in error messgaeRobin Rosenberg2014-06-291-1/+1
| | | | Change-Id: I5f712ba290592f7c5aa9ee865ff30383ad315247
* Remove duplicate string in CLIText.propertiesRobin Rosenberg2014-06-291-1/+0
| | | | | Bug: 438261 Change-Id: Idd6839465ea36d072b1c4393f5abd2f39da02b62
* Fix formatting errors in error messagesRobin Rosenberg2014-06-292-8/+8
| | | | | | | | | {} is plain wrong and is not accepted by MessageFormat, the other risk becoming wrong if another single quote is introduced in the future and sets a bad example. Bug: 438261 Change-Id: I2948ca90c10f6ec2574f7f2b9be0a72821ea4daf
* Merge branch 'stable-3.4'Matthias Sohn2014-06-216-12/+108
|\ | | | | | | | | | | | | | | | | | | * stable-3.4: Prepare 3.4.2-SNAPSHOT builds JGit v3.4.1.201406201815-r Allow retrying connecting SshSession in case of an exception Change-Id: I7efb009b9e012637a16c57e2e93e074023b8e46c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.4.2-SNAPSHOT buildsMatthias Sohn2014-06-2155-263/+263
| | | | | | | | | | Change-Id: If88217d84b88cda6d04c159418d5bc86233fe28c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.4.1.201406201815-rv3.4.1.201406201815-rMatthias Sohn2014-06-2155-263/+263
| | | | | | | | | | Change-Id: I4383a90fd91a243cd5ce5d0ae4e53874b36c1f47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Allow retrying connecting SshSession in case of an exceptionStefan Lay2014-06-206-12/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connecting to an SshSession may fail due to different reasons. Jsch for example often throws an com.jcraft.jsch.JschException: verify: false.[1] The issue is still not fixed in JSch 0.1.51. In such a case it is worth retrying to connect. The number of connection attempts can be configured using ssh_config parameter "ConnectionAttempts" [2]. Don't retry if the user canceled authentication. [1] http://sourceforge.net/p/jsch/bugs/58/ [2] http://linux.die.net/man/5/ssh_config Bug: 437656 Change-Id: I6dd2a3786b7d3f15f5a46821d8edac987a57e381 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Remove no longer needed API breakage filtersRobin Rosenberg2014-06-151-19/+0
| | | | | | | | Change-Id: I2ea2dec55c187b62662195bae810b3f0af8a2983
* | Remove an unnecessary semicolonRobin Rosenberg2014-06-151-1/+1
| | | | | | | | Change-Id: I6c5b085ae4a47d0026bd2b2341de76ab333936b9
* | Remove an unnecessary $NON-NLS$ commentRobin Rosenberg2014-06-151-1/+1
| | | | | | | | Change-Id: I8335464061dac1c20de2b698f834e516ef78cf3d
* | Merge "Enable NLS / TranslationBundle to be used in OSGi"Robin Rosenberg2014-06-151-6/+10
|\ \
| * | Enable NLS / TranslationBundle to be used in OSGiRüdiger Herrmann2014-06-011-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TranslationBundle#load() used to load resource bundles through ResourceBundle#getBundle() without explicitly specifying a class loader. In this case, the class laoder of the calling class (TranslationBundle here) is used. This approach fails in runtime environments like OSGi where there are multiple class loaders. This change enables loading resource bundles in multi class loaders environments. The fix is to pass the class loader of the TranslationBundle-derived class to ResourceBundle#getBundle(). Bug: 436232 Change-Id: I39db61e012dc93ebf388a71bf6088a3310a22bac Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
* | | Don't set REWRITE flag unless parent rewriting is requestedDave Borowitz2014-06-121-5/+7
| | | | | | | | | | | | Change-Id: I65e3702ceb6c8854a2c358cfc2c2e3a9fb9486ff
* | | Rename RewriteTreeFilter to TreeRevFilter and make it publicDave Borowitz2014-06-124-20/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behavior of passing a TreeFilter to RevWalk has limited usefulness, since the RevFilter derived from the TreeFilter is always ANDed together with any other RevFilters. It is also tied fairly tightly to the parent rewriting mechanism. Make TreeRevFilter a generic RevFilter that matches modified paths against any TreeFilter. This allows for more complex logic like (modified this path OR authored by this person). Leave the rewrite flag logic in this class, since it's closely tied to the parent comparison code, but hidden behind a protected constructor. Change-Id: Ia72ef591a99415e6f340c5f64583a49c91f1b82f
* | | Add missing javadoc and since tag for RepoCommand.readFileFromRepo()Matthias Sohn2014-06-121-0/+14
| | | | | | | | | | | | Change-Id: Ib0a98ce633e83c82a58b633c767e70d316b7254c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Refactor DefaultRemoteReader for easier code reuse"Dave Borowitz2014-06-111-1/+9
|\ \ \
| * | | Refactor DefaultRemoteReader for easier code reuseYuxuan 'fishy' Wang2014-06-101-1/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f326b4fc96198de7b424e15d8329bde7d7b39cf Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | | Merge branch 'stable-3.4'Matthias Sohn2014-06-110-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | * stable-3.4: Prepare post 3.4.0 builds JGit v3.4.0.201406110918-r Change-Id: I1aa3b911c7ace01b82ab9844eec5432d4125b726 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare post 3.4.0 buildsMatthias Sohn2014-06-1155-59/+59
| | | | | | | | | | | | Change-Id: I49f3741f3973b247a635f7c99b72309d2381a377 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v3.4.0.201406110918-rv3.4.0.201406110918-rMatthias Sohn2014-06-1155-59/+59
| | | | | | | | | | | | | | | Change-Id: I56543234316f04bff4e45628bcb8286a6e52e31f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Fixed the problem with calling LsRemoteCommand without a local ↵Robin Rosenberg2014-06-104-1/+50
|\ \ \ | | | | | | | | | | | | repository over the ssh and git:// protocols."
| * | | Fixed the problem with calling LsRemoteCommand without a local repository ↵Anton Bannykh2014-06-084-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | over the ssh and git:// protocols. Bug: 436695 Change-Id: Ifd69fbc04156fa4dacdcba6225768f43843eee97 Signed-off-by: Anton Bannykh <anton.bannykh@gmail.com> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | | Add missing @since to RepoCommand.setInputStreamRobin Rosenberg2014-06-101-2/+3
| | | | | | | | | | | | | | | | Change-Id: I2fa1a5c28a1521a837aeaeb994e5cce8d7c4e645
* | | | Added setInputStream to RepoCommand.Yuxuan 'fishy' Wang2014-06-093-31/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes an input stream is more useful than the filename of the xml manifest. Change-Id: Icb09ac751b3d8d7eb14427ad1aac8cee0c371c5f Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | | Merge "Better way to handle relative URLs in manifest XML"Dave Borowitz2014-06-091-2/+2
|\ \ \ \
| * | | | Better way to handle relative URLs in manifest XMLYuxuan 'fishy' Wang2014-06-051-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old implementation will NOT strip the filename part from the baseUrl, e.g. https://android.googlesource.com/platform/manifest with .. will be resolved to https://android.googlesource.com/platform/, which is actually wrong. This implementation will resolve it to https://android.googlesource.com/ to match the behavior of repo. Change-Id: Ia32c8b34e16eacdf37a0da7025bf0b5cc5f67ed2 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | | LsRemoteCommand - internal execute need not be protectedRobin Rosenberg2014-06-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I04d054d9f19e4ee200f72b25962be4759cfe5d7e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Enable passing version number to maven central scriptsMatthias Sohn2014-06-062-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also check if the passed version matches the version pattern <major>.<minor>.<micro>.<qualifier>-<classifier> Change-Id: Ib7edf51fb5e89232909611de5b4811a62b4f3953 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge "Fix DeltaTask infinite loop"Robin Rosenberg2014-06-061-1/+1
|\ \ \ \
| * | | | Fix DeltaTask infinite loopHugo Arès2014-06-051-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeltaTask$Block.partitionTask was doing an infinite loop if number of threads was greater than the totalWeight. The weightPerThread was 0 which was causing the infinite loop. Set the weightPerThread to a minimal value of one. Bug: 420915 Change-Id: Ia8e3ad956d53d8193937b7fa1bc19aafde9767ff Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
* | | | Merge "Make JavaDoc validator happy by declaring GitAPIException on callAsMap"Robin Rosenberg2014-06-061-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Make JavaDoc validator happy by declaring GitAPIException on callAsMapRobin Rosenberg2014-06-041-0/+4
| | |/ | |/| | | | | | | Change-Id: I9caa559a3d4eb0ec93d90cf1e18aed785ef85a84
* | | Prepare 3.5.0-SNAPSHOT buildsRobin Rosenberg2014-06-0455-264/+264
| | | | | | | | | | | | | | | Change-Id: I53bd500188e09ae2e007a58b3cd89aa0805d6f2a Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | Merge branch 'stable-3.4'Matthias Sohn2014-06-043-5/+33
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | * stable-3.4: Prepare post 3.4 RC3 builds JGit v3.4.0.201406041058-rc3 blame: Un-break isFile check in tree walk Prepare post 3.4.0 RC2 builds JGit v3.4.0.201405281120-rc2 Fix authentication type names broken by 0b5441a8 Update Luna target platform to Orbit release R20140525021250 Change-Id: I344f1bbb8939bda01d524ec1a3218aa32bcc62f5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.4 RC3 buildsMatthias Sohn2014-06-0455-59/+59
| | | | | | | | Change-Id: I9730bb349d0295c811aa3a9ba0f67bd946e86d1e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.4.0.201406041058-rc3v3.4.0.201406041058-rc3Matthias Sohn2014-06-0455-59/+59
| | | | | | | | | | Change-Id: If0cfec023788cae7713dd1ccc250e221365ef984 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * blame: Un-break isFile check in tree walkJonathan Nieder2014-06-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, blame's walk to find a scapegoat to blame for a file walking backward from a commit used the test treeWalk.getFileMode(0).getObjectType() != OBJ_BLOB to throw out gitlink (submodule) entries. Later, 52500d3264d2 (blame: Micro optimize blob lookup in tree, 2014-04-17) changed that test to (treeWalk.getRawMode(0) & TYPE_FILE) != TYPE_FILE These checks are not the same, though: the older test accepts files and symlinks, while the newer one accepts files, symlinks, and gitlink (submodule) entries. This is particularly broken in the submodule case --- trying to parse the referred-to commit as a blob produces caught an exception: GET /gerrit/+blame/master/plugins/reviewnotes HTTP/1.1 org.eclipse.jgit.errors.MissingObjectException: Missing blob 61702414c046dd6b811c9137b765f9db422f83db Stick to just (possibly executable) files instead. Symlinks are not line-oriented data so blame on a symlink is not likely to be useful. A quick grep for '& TYPE_' doesn't find any other instances of this bug. Change-Id: Iebcc91f1bee3c91adda51dccd6372e8302bf23fe Signed-off-by: Jonathan Nieder <jrn@google.com>
| * Prepare post 3.4.0 RC2 buildsMatthias Sohn2014-05-2855-59/+59
| | | | | | | | Change-Id: Id8d784ba7b0aba7c6a00f459bf1ac54c1d36d061 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.4.0.201405281120-rc2v3.4.0.201405281120-rc2Matthias Sohn2014-05-2855-59/+59
| | | | | | | | | | Change-Id: Ifd376f58cf867fc84d39582c49e971d998abf63d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix authentication type names broken by 0b5441a8Matthias Sohn2014-05-271-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b5441a8 introduced an enum for authentication types and changed the case of digest and basic authentication type names to all uppercase. This broke digest authentication at least when using Gerrit as the git server. According to RFC2617 [1] "Basic" and "Digest" is the literal to be used in authentication headers and not "BASIC" [1] and "DIGEST" [2]. According to RFC4559 "Negotiate" [3] is used for SPNEGO based authentication. [1] http://tools.ietf.org/html/rfc2617#page-5 [2] http://tools.ietf.org/html/rfc2617#page-8 [3] http://tools.ietf.org/html/rfc4559#page-3 Bug: 435866 Change-Id: I6173aff9352d7def225cafe2d73e5176ad40dff0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update Luna target platform to Orbit release R20140525021250Matthias Sohn2014-05-261-1/+1
| | | | | | | | Change-Id: Id46d74e9b11b2a7ea78d17b8bc12c3ad027723f1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 04:20:02 +0000