|
|
@ -473,14 +473,8 @@ public class RepoCommand extends GitCommand<RevCommit> { |
|
|
|
xmlInRead--; |
|
|
|
xmlInRead--; |
|
|
|
if (xmlInRead != 0) |
|
|
|
if (xmlInRead != 0) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
// Only do the following after we finished reading everything.
|
|
|
|
// Only do the following after we finished reading everything.
|
|
|
|
if (defaultRemote == null) { |
|
|
|
|
|
|
|
if (filename != null) |
|
|
|
|
|
|
|
throw new SAXException(MessageFormat.format( |
|
|
|
|
|
|
|
RepoText.get().errorNoDefaultFilename, filename)); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
throw new SAXException(RepoText.get().errorNoDefault); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
removeNotInGroup(); |
|
|
|
removeNotInGroup(); |
|
|
|
removeOverlaps(); |
|
|
|
removeOverlaps(); |
|
|
|
|
|
|
|
|
|
|
@ -493,8 +487,18 @@ public class RepoCommand extends GitCommand<RevCommit> { |
|
|
|
} |
|
|
|
} |
|
|
|
for (Project proj : projects) { |
|
|
|
for (Project proj : projects) { |
|
|
|
String remote = proj.remote; |
|
|
|
String remote = proj.remote; |
|
|
|
if (remote == null) |
|
|
|
if (remote == null) { |
|
|
|
|
|
|
|
if (defaultRemote == null) { |
|
|
|
|
|
|
|
if (filename != null) |
|
|
|
|
|
|
|
throw new SAXException(MessageFormat.format( |
|
|
|
|
|
|
|
RepoText.get().errorNoDefaultFilename, |
|
|
|
|
|
|
|
filename)); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
throw new SAXException( |
|
|
|
|
|
|
|
RepoText.get().errorNoDefault); |
|
|
|
|
|
|
|
} |
|
|
|
remote = defaultRemote; |
|
|
|
remote = defaultRemote; |
|
|
|
|
|
|
|
} |
|
|
|
String remoteUrl = remoteUrls.get(remote); |
|
|
|
String remoteUrl = remoteUrls.get(remote); |
|
|
|
if (remoteUrl == null) { |
|
|
|
if (remoteUrl == null) { |
|
|
|
remoteUrl = baseUri.resolve(remotes.get(remote)).toString(); |
|
|
|
remoteUrl = baseUri.resolve(remotes.get(remote)).toString(); |
|
|
|