Change-Id: I2d1076b46695dac84961b8ae663bfc5cb123b3a3 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>tags/v3.1.0.201309270735-rc1
@@ -230,8 +230,8 @@ public class CommitCommand extends GitCommand<RevCommit> { | |||
ru.setRefLogMessage(reflogComment, false); | |||
} else { | |||
String prefix = amend ? "commit (amend): " //$NON-NLS-1$ | |||
: parents.size() == 0 ? "commit (initial): " | |||
: "commit: "; | |||
: parents.size() == 0 ? "commit (initial): " //$NON-NLS-1$ | |||
: "commit: "; //$NON-NLS-1$ | |||
ru.setRefLogMessage( | |||
prefix + revCommit.getShortMessage(), false); | |||
} |
@@ -383,7 +383,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { | |||
if (headName.startsWith(Constants.R_REFS)) { | |||
RefUpdate rup = repo.updateRef(headName); | |||
rup.setNewObjectId(newHead); | |||
rup.setRefLogMessage("rebase finished: " + headName + " onto " //$NON-NLS-1$ | |||
rup.setRefLogMessage("rebase finished: " + headName + " onto " //$NON-NLS-1$ //$NON-NLS-2$ | |||
+ onto.getName(), false); | |||
Result res = rup.forceUpdate(); | |||
switch (res) { |
@@ -169,7 +169,7 @@ public class RevertCommand extends GitCommand<RevCommit> { | |||
String shortMessage = "Revert \"" + srcCommit.getShortMessage() //$NON-NLS-1$ | |||
+ "\""; //$NON-NLS-1$ | |||
String newMessage = shortMessage + "\n\n" | |||
String newMessage = shortMessage + "\n\n" //$NON-NLS-1$ | |||
+ "This reverts commit " + srcCommit.getId().getName() //$NON-NLS-1$ | |||
+ ".\n"; //$NON-NLS-1$ | |||
if (merger.merge(headCommit, srcParent)) { |
@@ -163,7 +163,7 @@ public class StashApplyCommand extends GitCommand<ObjectId> { | |||
JGitText.get().stashCommitMissingTwoParents, | |||
stashId.name())); | |||
ObjectId headTree = repo.resolve(Constants.HEAD + "^{tree}"); | |||
ObjectId headTree = repo.resolve(Constants.HEAD + "^{tree}"); //$NON-NLS-1$ | |||
ObjectId stashIndexCommit = revWalk.parseCommit(stashCommit | |||
.getParent(1)); | |||
ObjectId stashHeadCommit = stashCommit.getParent(0); |
@@ -76,7 +76,7 @@ public class RevFlag { | |||
* | |||
* @since 3.0 | |||
*/ | |||
public static final RevFlag SEEN = new StaticRevFlag("SEEN", RevWalk.SEEN); | |||
public static final RevFlag SEEN = new StaticRevFlag("SEEN", RevWalk.SEEN); //$NON-NLS-1$ | |||
final RevWalk walker; | |||
@@ -235,7 +235,7 @@ public class TransportSftp extends SshTransport implements WalkTransport { | |||
files.put(ent.getFilename(), ent); | |||
for (final ChannelSftp.LsEntry ent : list) { | |||
final String n = ent.getFilename(); | |||
if (!n.startsWith("pack-") || !n.endsWith(".pack")) //$NON-NLS-1$ | |||
if (!n.startsWith("pack-") || !n.endsWith(".pack")) //$NON-NLS-1$ //$NON-NLS-2$ | |||
continue; | |||
final String in = n.substring(0, n.length() - 5) + ".idx"; //$NON-NLS-1$ |
@@ -88,7 +88,7 @@ public class URIish implements Serializable { | |||
* Part of a pattern which matches the host part of URIs. Defines one | |||
* capturing group containing the host name. | |||
*/ | |||
private static final String HOST_P = "((?:[^\\\\/:]+)|(?:\\[[0-9a-f:]+\\]))"; | |||
private static final String HOST_P = "((?:[^\\\\/:]+)|(?:\\[[0-9a-f:]+\\]))"; //$NON-NLS-1$ | |||
/** | |||
* Part of a pattern which matches the optional port part of URIs. Defines |
@@ -131,7 +131,7 @@ public class ChangeIdUtil { | |||
private static final Pattern includeInFooterPattern = Pattern | |||
.compile("^[ \\[].*$"); //$NON-NLS-1$ | |||
private static final Pattern trailingWhitespace = Pattern.compile("\\s+$"); | |||
private static final Pattern trailingWhitespace = Pattern.compile("\\s+$"); //$NON-NLS-1$ | |||
/** | |||
* Find the right place to insert a Change-Id and return it. |
@@ -119,7 +119,7 @@ public class RelativeDateFormatter { | |||
JGitText.get().year; | |||
long months = round(ageMillis % YEAR_IN_MILLIS, MONTH_IN_MILLIS); | |||
String monthLabel = (months > 1) ? JGitText.get().months : // | |||
(months == 1 ? JGitText.get().month : ""); | |||
(months == 1 ? JGitText.get().month : ""); //$NON-NLS-1$ | |||
return MessageFormat.format( | |||
months == 0 ? JGitText.get().years0MonthsAgo : JGitText | |||
.get().yearsMonthsAgo, |