diff options
author | Dave Borowitz <dborowitz@google.com> | 2017-07-17 12:25:09 -0400 |
---|---|---|
committer | Dave Borowitz <dborowitz@google.com> | 2017-07-25 13:14:50 -0400 |
commit | dbb137e0f3ccaef7db4982127da1c7bdfc581e98 (patch) | |
tree | dedc67299cee5b290089ee260aa6c07a43038c07 /org.eclipse.jgit/src | |
parent | 82f68500c0dfedd98e0769888a46eff7899c5ab7 (diff) | |
download | jgit-dbb137e0f3ccaef7db4982127da1c7bdfc581e98.tar.gz jgit-dbb137e0f3ccaef7db4982127da1c7bdfc581e98.zip |
Extract constants for reflog entry message prefixes
Document explicitly that these are untranslated to (mostly) match C git.
Change-Id: I3abcffb4fd611d053bf4373e5d6a14a66f7b9b6b
Diffstat (limited to 'org.eclipse.jgit/src')
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java | 9 | ||||
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogEntry.java | 33 |
2 files changed, 38 insertions, 4 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java index 3c1916b642..1105352524 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java @@ -50,6 +50,7 @@ import java.io.IOException; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.lib.ReflogEntry; import org.eclipse.jgit.lib.Repository; /** Updates any reference stored by {@link RefDirectory}. */ @@ -127,14 +128,14 @@ class RefDirectoryUpdate extends RefUpdate { return status; } - private String toResultString(final Result status) { + private String toResultString(Result status) { switch (status) { case FORCED: - return "forced-update"; //$NON-NLS-1$ + return ReflogEntry.PREFIX_FORCED_UPDATE; case FAST_FORWARD: - return "fast forward"; //$NON-NLS-1$ + return ReflogEntry.PREFIX_FAST_FORWARD; case NEW: - return "created"; //$NON-NLS-1$ + return ReflogEntry.PREFIX_CREATED; default: return null; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogEntry.java index 8bd0633789..afa6521d67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogEntry.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogEntry.java @@ -50,6 +50,39 @@ package org.eclipse.jgit.lib; public interface ReflogEntry { /** + * Prefix used in reflog messages when the ref was first created. + * <p> + * Does not have a corresponding constant in C git, but is untranslated like + * the other constants. + * + * @since 4.9 + */ + public static final String PREFIX_CREATED = "created"; //$NON-NLS-1$ + + /** + * Prefix used in reflog messages when the ref was updated with a fast + * forward. + * <p> + * Untranslated, and exactly matches the + * <a href="https://git.kernel.org/pub/scm/git/git.git/tree/builtin/fetch.c?id=f3da2b79be9565779e4f76dc5812c68e156afdf0#n680"> + * untranslated string in C git</a>. + * + * @since 4.9 + */ + public static final String PREFIX_FAST_FORWARD = "fast-forward"; //$NON-NLS-1$ + + /** + * Prefix used in reflog messages when the ref was force updated. + * <p> + * Untranslated, and exactly matches the + * <a href="https://git.kernel.org/pub/scm/git/git.git/tree/builtin/fetch.c?id=f3da2b79be9565779e4f76dc5812c68e156afdf0#n695"> + * untranslated string in C git</a>. + * + * @since 4.9 + */ + public static final String PREFIX_FORCED_UPDATE = "forced-update"; //$NON-NLS-1$ + + /** * @return the commit id before the change */ public abstract ObjectId getOldId(); |