From 16e810b2ec37c2db8bc0e39426be385024a8de8a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 May 2011 11:39:33 -0700 Subject: [PATCH] Add shortening of note ref names to NoteMap Change-Id: I224190bbb41c7cbea38388d0148ecc6dc68f3a14 Signed-off-by: Kevin Sawicki --- .../tst/org/eclipse/jgit/notes/NoteMapTest.java | 8 ++++++++ .../src/org/eclipse/jgit/notes/NoteMap.java | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java index 94fdc69e8..84b10f3c5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java @@ -522,6 +522,14 @@ public class NoteMapTest extends RepositoryTestCase { assertEquals(2, count(it)); } + public void testShorteningNoteRefName() throws Exception { + String expectedShortName = "review"; + String noteRefName = Constants.R_NOTES + expectedShortName; + assertEquals(expectedShortName, NoteMap.shortenRefName(noteRefName)); + String nonNoteRefName = Constants.R_HEADS + expectedShortName; + assertEquals(nonNoteRefName, NoteMap.shortenRefName(expectedShortName)); + } + private RevCommit commitNoteMap(NoteMap map) throws IOException { tr.tick(600); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java index 0d4d6b914..3c4347823 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java @@ -80,6 +80,19 @@ public class NoteMap implements Iterable { return r; } + /** + * Shorten the note ref name by trimming off the {@link Constants#R_NOTES} + * prefix if it exists. + * + * @param noteRefName + * @return a more user friendly note name + */ + public static String shortenRefName(String noteRefName) { + if (noteRefName.startsWith(Constants.R_NOTES)) + return noteRefName.substring(Constants.R_NOTES.length()); + return noteRefName; + } + /** * Load a collection of notes from a branch. *