motiejus
/
jgit
1
Fork 0
Code Releases Activity

UploadPack: shallowExcludeRefs doesn't need to be nullable 

Code can check size instead of null, and that makes the initialization
trivial.

Change-Id: Icbe655816429a7a680926b0e871d96f3b2f1f7ba
Signed-off-by: Ivan Frade <ifrade@google.com>
This commit is contained in:
Ivan Frade 2018-08-23 15:20:57 -07:00
parent e1b971848a
commit 0b84c5b29e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
View File

@ -309,10 +309,10 @@ public Set<String> getOptions() {
/** /**
* (Possibly short) ref names, ancestors of which the client has asked us * (Possibly short) ref names, ancestors of which the client has asked us
* not to send using --shallow-exclude. Cannot be non-null if depth is * not to send using --shallow-exclude. Cannot be non-empty if depth is
* nonzero. * nonzero.
*/ */
private @Nullable List<String> shallowExcludeRefs; private List<String> shallowExcludeRefs = new ArrayList<>();
/** Commit time of the oldest common commit, in seconds. */ /** Commit time of the oldest common commit, in seconds. */
private int oldestTime; private int oldestTime;
@ -1023,16 +1023,12 @@ private void fetchV2() throws IOException {
throw new PackProtocolException( throw new PackProtocolException(
JGitText.get().deepenSinceWithDeepen); JGitText.get().deepenSinceWithDeepen);
} }
if (shallowExcludeRefs != null) { if (!shallowExcludeRefs.isEmpty()) {
throw new PackProtocolException( throw new PackProtocolException(
JGitText.get().deepenNotWithDeepen); JGitText.get().deepenNotWithDeepen);
} }
} else if (line.startsWith("deepen-not ")) { //$NON-NLS-1$ } else if (line.startsWith("deepen-not ")) { //$NON-NLS-1$
List<String> exclude = shallowExcludeRefs; shallowExcludeRefs.add(line.substring(11));
if (exclude == null) {
exclude = shallowExcludeRefs = new ArrayList<>();
}
exclude.add(line.substring(11));
if (depth != 0) { if (depth != 0) {
throw new PackProtocolException( throw new PackProtocolException(
JGitText.get().deepenNotWithDeepen); JGitText.get().deepenNotWithDeepen);
@ -1071,7 +1067,7 @@ private void fetchV2() throws IOException {
if (!clientShallowCommits.isEmpty()) { if (!clientShallowCommits.isEmpty()) {
verifyClientShallow(); verifyClientShallow();
} }
if (depth != 0 || shallowSince != 0 || shallowExcludeRefs != null) { if (depth != 0 || shallowSince != 0 || !shallowExcludeRefs.isEmpty()) {
shallowCommits = new ArrayList<>(); shallowCommits = new ArrayList<>();
processShallow(shallowCommits, unshallowCommits, false); processShallow(shallowCommits, unshallowCommits, false);
} }
@ -1238,7 +1234,7 @@ private void processShallow(@Nullable List<ObjectId> shallowCommits,
boolean writeToPckOut) throws IOException { boolean writeToPckOut) throws IOException {
if (options.contains(OPTION_DEEPEN_RELATIVE) || if (options.contains(OPTION_DEEPEN_RELATIVE) ||
shallowSince != 0 || shallowSince != 0 ||
shallowExcludeRefs != null) { !shallowExcludeRefs.isEmpty()) {
// TODO(jonathantanmy): Implement deepen-relative, deepen-since, // TODO(jonathantanmy): Implement deepen-relative, deepen-since,
// and deepen-not. // and deepen-not.
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();