Merge "ReceivePack: Use error message if set"
This commit is contained in:
commit
9c67f680c8
|
@ -1814,6 +1814,22 @@ void sendString(String s) throws IOException {
|
|||
.append(" ("); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if (cmd.getResult() == Result.REJECTED_MISSING_OBJECT) {
|
||||
if (cmd.getMessage() == null)
|
||||
r.append("missing object(s)"); //$NON-NLS-1$
|
||||
else if (cmd.getMessage()
|
||||
.length() == Constants.OBJECT_ID_STRING_LENGTH) {
|
||||
// TODO: Using get/setMessage to store an OID is a
|
||||
// misuse. The caller should set a full error message.
|
||||
r.append("object "); //$NON-NLS-1$
|
||||
r.append(cmd.getMessage());
|
||||
r.append(" missing"); //$NON-NLS-1$
|
||||
} else {
|
||||
r.append(cmd.getMessage());
|
||||
}
|
||||
} else if (cmd.getMessage() != null) {
|
||||
r.append(cmd.getMessage());
|
||||
} else {
|
||||
switch (cmd.getResult()) {
|
||||
case NOT_ATTEMPTED:
|
||||
r.append("server bug; ref not processed"); //$NON-NLS-1$
|
||||
|
@ -1835,34 +1851,22 @@ void sendString(String s) throws IOException {
|
|||
r.append("branch is currently checked out"); //$NON-NLS-1$
|
||||
break;
|
||||
|
||||
case REJECTED_MISSING_OBJECT:
|
||||
if (cmd.getMessage() == null)
|
||||
r.append("missing object(s)"); //$NON-NLS-1$
|
||||
else if (cmd.getMessage()
|
||||
.length() == Constants.OBJECT_ID_STRING_LENGTH) {
|
||||
r.append("object "); //$NON-NLS-1$
|
||||
r.append(cmd.getMessage());
|
||||
r.append(" missing"); //$NON-NLS-1$
|
||||
} else
|
||||
r.append(cmd.getMessage());
|
||||
break;
|
||||
|
||||
case REJECTED_OTHER_REASON:
|
||||
if (cmd.getMessage() == null)
|
||||
r.append("unspecified reason"); //$NON-NLS-1$
|
||||
else
|
||||
r.append(cmd.getMessage());
|
||||
break;
|
||||
|
||||
case LOCK_FAILURE:
|
||||
r.append("failed to lock"); //$NON-NLS-1$
|
||||
break;
|
||||
|
||||
case REJECTED_MISSING_OBJECT:
|
||||
case OK:
|
||||
// We shouldn't have reached this case (see 'ok' case
|
||||
// above).
|
||||
continue;
|
||||
// above and if-statement above).
|
||||
throw new AssertionError();
|
||||
}
|
||||
}
|
||||
|
||||
if (!reportStatus) {
|
||||
r.append(")"); //$NON-NLS-1$
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue