A few locations were doing OBJECT_ID_LENGTH * 2 on their own, as the old STR_LEN constant wasn't visible. Replace them with the new public constant OBJECT_ID_STRING_LENGTH. Change-Id: Id39bddb52de8c65bb097de042e9d4ed99598201f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>tags/v0.7.0
@@ -210,7 +210,7 @@ public class LockFile { | |||
requireLock(); | |||
try { | |||
final BufferedOutputStream b; | |||
b = new BufferedOutputStream(os, Constants.OBJECT_ID_LENGTH * 2 + 1); | |||
b = new BufferedOutputStream(os, Constants.OBJECT_ID_STRING_LENGTH + 1); | |||
id.copyTo(b); | |||
b.write('\n'); | |||
b.flush(); |
@@ -83,7 +83,7 @@ public abstract class RefWriter { | |||
*/ | |||
public void writeInfoRefs() throws IOException { | |||
final StringWriter w = new StringWriter(); | |||
final char[] tmp = new char[Constants.OBJECT_ID_LENGTH * 2]; | |||
final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; | |||
for (final Ref r : refs) { | |||
if (Constants.HEAD.equals(r.getName())) { | |||
// Historically HEAD has never been published through | |||
@@ -137,7 +137,7 @@ public abstract class RefWriter { | |||
w.write('\n'); | |||
} | |||
final char[] tmp = new char[Constants.OBJECT_ID_LENGTH * 2]; | |||
final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; | |||
for (final Ref r : refs) { | |||
if (r.getStorage() != Ref.Storage.PACKED) | |||
continue; |
@@ -72,12 +72,12 @@ public class ReflogReader { | |||
Entry(byte[] raw, int pos) { | |||
oldId = ObjectId.fromString(raw, pos); | |||
pos += Constants.OBJECT_ID_LENGTH * 2; | |||
pos += Constants.OBJECT_ID_STRING_LENGTH; | |||
if (raw[pos++] != ' ') | |||
throw new IllegalArgumentException( | |||
"Raw log message does not parse as log entry"); | |||
newId = ObjectId.fromString(raw, pos); | |||
pos += Constants.OBJECT_ID_LENGTH * 2; | |||
pos += Constants.OBJECT_ID_STRING_LENGTH; | |||
if (raw[pos++] != ' ') { | |||
throw new IllegalArgumentException( | |||
"Raw log message does not parse as log entry"); |
@@ -179,7 +179,7 @@ public class BundleWriter { | |||
w.write(TransportBundle.V2_BUNDLE_SIGNATURE); | |||
w.write('\n'); | |||
final char[] tmp = new char[Constants.OBJECT_ID_LENGTH * 2]; | |||
final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; | |||
for (final RevCommit a : assume) { | |||
w.write('-'); | |||
a.copyTo(tmp, w); |
@@ -882,7 +882,7 @@ public class ReceivePack { | |||
case REJECTED_MISSING_OBJECT: | |||
if (cmd.getMessage() == null) | |||
r.append("missing object(s)"); | |||
else if (cmd.getMessage().length() == 2 * Constants.OBJECT_ID_LENGTH) | |||
else if (cmd.getMessage().length() == Constants.OBJECT_ID_STRING_LENGTH) | |||
r.append("object " + cmd.getMessage() + " missing"); | |||
else | |||
r.append(cmd.getMessage()); |
@@ -70,7 +70,7 @@ class RefAdvertiser { | |||
private final StringBuilder tmpLine = new StringBuilder(100); | |||
private final char[] tmpId = new char[2 * Constants.OBJECT_ID_LENGTH]; | |||
private final char[] tmpId = new char[Constants.OBJECT_ID_STRING_LENGTH]; | |||
private final Set<String> capablities = new LinkedHashSet<String>(); | |||
@@ -308,7 +308,7 @@ abstract class WalkRemoteObjectDatabase { | |||
void writeRef(final String name, final ObjectId value) throws IOException { | |||
final ByteArrayOutputStream b; | |||
b = new ByteArrayOutputStream(Constants.OBJECT_ID_LENGTH * 2 + 1); | |||
b = new ByteArrayOutputStream(Constants.OBJECT_ID_STRING_LENGTH + 1); | |||
value.copyTo(b); | |||
b.write('\n'); | |||