|
|
|
@ -182,15 +182,15 @@ class Push extends TextBuiltin {
|
|
|
|
|
switch (rru.getStatus()) { |
|
|
|
|
case OK: |
|
|
|
|
if (rru.isDelete()) |
|
|
|
|
printUpdateLine('-', "[deleted]", null, remoteName, null); |
|
|
|
|
printUpdateLine('-', "[deleted]", null, remoteName, null); //$NON-NLS-1$
|
|
|
|
|
else { |
|
|
|
|
final Ref oldRef = result.getAdvertisedRef(remoteName); |
|
|
|
|
if (oldRef == null) { |
|
|
|
|
final String summary; |
|
|
|
|
if (remoteName.startsWith(Constants.R_TAGS)) |
|
|
|
|
summary = "[new tag]"; |
|
|
|
|
summary = "[new tag]"; //$NON-NLS-1$
|
|
|
|
|
else |
|
|
|
|
summary = "[new branch]"; |
|
|
|
|
summary = "[new branch]"; //$NON-NLS-1$
|
|
|
|
|
printUpdateLine('*', summary, srcRef, remoteName, null); |
|
|
|
|
} else { |
|
|
|
|
boolean fastForward = rru.isFastForward(); |
|
|
|
@ -206,16 +206,16 @@ class Push extends TextBuiltin {
|
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
case NON_EXISTING: |
|
|
|
|
printUpdateLine('X', "[no match]", null, remoteName, null); |
|
|
|
|
printUpdateLine('X', "[no match]", null, remoteName, null); //$NON-NLS-1$
|
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
case REJECTED_NODELETE: |
|
|
|
|
printUpdateLine('!', "[rejected]", null, remoteName, |
|
|
|
|
printUpdateLine('!', "[rejected]", null, remoteName, //$NON-NLS-1$
|
|
|
|
|
CLIText.get().remoteSideDoesNotSupportDeletingRefs); |
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
case REJECTED_NONFASTFORWARD: |
|
|
|
|
printUpdateLine('!', "[rejected]", srcRef, remoteName, |
|
|
|
|
printUpdateLine('!', "[rejected]", srcRef, remoteName, //$NON-NLS-1$
|
|
|
|
|
CLIText.get().nonFastForward); |
|
|
|
|
break; |
|
|
|
|
|
|
|
|
@ -223,22 +223,22 @@ class Push extends TextBuiltin {
|
|
|
|
|
final String message = MessageFormat.format( |
|
|
|
|
CLIText.get().remoteRefObjectChangedIsNotExpectedOne, |
|
|
|
|
safeAbbreviate(reader, rru.getExpectedOldObjectId())); |
|
|
|
|
printUpdateLine('!', "[rejected]", srcRef, remoteName, message); |
|
|
|
|
printUpdateLine('!', "[rejected]", srcRef, remoteName, message); //$NON-NLS-1$
|
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
case REJECTED_OTHER_REASON: |
|
|
|
|
printUpdateLine('!', "[remote rejected]", srcRef, remoteName, rru |
|
|
|
|
printUpdateLine('!', "[remote rejected]", srcRef, remoteName, rru //$NON-NLS-1$
|
|
|
|
|
.getMessage()); |
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
case UP_TO_DATE: |
|
|
|
|
if (verbose) |
|
|
|
|
printUpdateLine('=', "[up to date]", srcRef, remoteName, null); |
|
|
|
|
printUpdateLine('=', "[up to date]", srcRef, remoteName, null); //$NON-NLS-1$
|
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
case NOT_ATTEMPTED: |
|
|
|
|
case AWAITING_REPORT: |
|
|
|
|
printUpdateLine('?', "[unexpected push-process behavior]", srcRef, |
|
|
|
|
printUpdateLine('?', "[unexpected push-process behavior]", srcRef, //$NON-NLS-1$
|
|
|
|
|
remoteName, rru.getMessage()); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|