motiejus
/
jgit
1
Fork 0
Code Releases Activity

Strip trailing /s in repo base URI. 

Change-Id: I71040db2cca69638cfad89acdc9179ee80592b27
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
This commit is contained in:
Yuxuan 'fishy' Wang 2014-06-09 11:27:52 -07:00
parent 289b7c60a9
commit 73d38bfb33
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RepoTest.java
View File

@ -149,7 +149,7 @@ private void resolveRelativeUris() {
!groupAUri.startsWith(prefix) ||
!groupBUri.startsWith(prefix)) {
start++;
rootUri = defaultUri.substring(0, start);
rootUri = defaultUri.substring(0, start) + "manifest";
defaultUri = defaultUri.substring(start);
notDefaultUri = notDefaultUri.substring(start);
groupAUri = groupAUri.substring(start);

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java
View File

@ -526,7 +526,7 @@ private void resolveRelativeUris() {
!groupAUri.startsWith(prefix) ||
!groupBUri.startsWith(prefix)) {
start++;
rootUri = defaultUri.substring(0, start);
rootUri = defaultUri.substring(0, start) + "manifest";
defaultUri = defaultUri.substring(start);
notDefaultUri = notDefaultUri.substring(start);
groupAUri = groupAUri.substring(start);

8
org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java
View File

@ -289,7 +289,13 @@ private static class XmlManifest extends DefaultHandler {
this.command = command;
this.inputStream = inputStream;
this.filename = filename;
this.baseUrl = baseUrl;
// Strip trailing /s to match repo behavior.
int lastIndex = baseUrl.length() - 1;
while (lastIndex >= 0 && baseUrl.charAt(lastIndex) == '/')
lastIndex--;
this.baseUrl = baseUrl.substring(0, lastIndex + 1);
remotes = new HashMap<String, String>();
projects = new ArrayList<Project>();
plusGroups = new HashSet<String>();