{"thread":{"id":"18331","subject":"[EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to","startedAt":"2009-03-16T20:14:33Z","lastAt":"2009-03-16T21:28:31Z","messageCount":15,"participants":["Robin Rosenberg","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"108124","messageId":"1237234483-3405-1-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":null,"subject":"[EGIT PATCH 00/10] JGit cleanups","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:33Z","receivedAt":"2009-03-16T20:14:33Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Getting annoyed with all the noise I came up with series of cleanups. The\nhunk parsing fixes are the one's I'm not really sure about, but my attempts\nto find a case that would give an uncontrolled error did not find much\nsuccess.\n\n-- robin\n\nRobin Rosenberg (10):\n  Require javadoc on protected methods in jgit core\n  Rename the objectsUrl in the nested HttpObjectDB to\n  Rename variables that hides others with different content in\n    FetchProcess\n  Rename a parameter i PackWriter that hides another with the same name\n  Rename fields to avoid hiding of field names in ReadTreeTest\n  Rename the gitDir fields to indicate they refer to another dir than\n    the default\n  Rename a parameter in PushProcessTest that hides another\n  Drop unused end parameters in hunk parsing code\n  Drop unused File arguments in IndexTreeWalker and WorkdirCheckout\n  Drop an effectively unused parameter in IndexTreeWalker.\n\n .../.settings/org.eclipse.jdt.core.prefs           |    7 +-\n .../src/org/spearce/jgit/pgm/ReceivePack.java      |   10 +-\n .../src/org/spearce/jgit/pgm/TextBuiltin.java      |    9 +-\n .../src/org/spearce/jgit/pgm/UploadPack.java       |   10 +-\n .../tst/org/spearce/jgit/lib/ReadTreeTest.java     |  118 ++++++++++----------\n .../spearce/jgit/transport/PushProcessTest.java    |    4 +-\n .../.settings/org.eclipse.jdt.core.prefs           |    5 +-\n .../jgit/dircache/DirCacheBuildIterator.java       |    2 +-\n .../spearce/jgit/dircache/DirCacheIterator.java    |    2 +-\n .../src/org/spearce/jgit/lib/IndexTreeWalker.java  |   12 +-\n .../src/org/spearce/jgit/lib/ObjectId.java         |    2 +-\n .../src/org/spearce/jgit/lib/PackIndex.java        |    6 +-\n .../src/org/spearce/jgit/lib/PackWriter.java       |    8 +-\n .../jgit/lib/TreeVisitorWithCurrentDirectory.java  |    4 +-\n .../src/org/spearce/jgit/lib/WorkDirCheckout.java  |   17 ++--\n .../org/spearce/jgit/merge/StrategyOneSided.java   |    2 +-\n .../org/spearce/jgit/patch/CombinedHunkHeader.java |    2 +-\n .../src/org/spearce/jgit/patch/FileHeader.java     |   18 ++--\n .../src/org/spearce/jgit/patch/HunkHeader.java     |    6 +-\n .../src/org/spearce/jgit/patch/Patch.java          |    8 +-\n .../org/spearce/jgit/revplot/PlotCommitList.java   |    9 ++\n .../src/org/spearce/jgit/revplot/PlotWalk.java     |    4 +\n .../org/spearce/jgit/transport/DaemonService.java  |    4 +-\n .../org/spearce/jgit/transport/FetchProcess.java   |    8 +-\n .../org/spearce/jgit/transport/OpenSshConfig.java  |    2 +-\n .../spearce/jgit/transport/OperationResult.java    |   10 +-\n .../spearce/jgit/transport/PackedObjectInfo.java   |    2 +-\n .../src/org/spearce/jgit/transport/PushResult.java |    2 +-\n .../spearce/jgit/transport/RemoteRefUpdate.java    |    6 +-\n .../org/spearce/jgit/transport/TransportHttp.java  |   14 +-\n .../spearce/jgit/treewalk/WorkingTreeIterator.java |    7 +\n 31 files changed, 173 insertions(+), 147 deletions(-)\n"},{"id":"108123","messageId":"1237234483-3405-2-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-1-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 01/10] Require javadoc on protected methods in jgit core","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:34Z","receivedAt":"2009-03-16T20:14:34Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"In general protected methods are part of a public API since they grant\naccess to code outside of the package that declares the method or field.\n\nA few protected fields and methods do not have javadocs, but it turns\nout all but one are not used outside the package that declares them so\nwe can simply make them package private. This doesn't mean they aren't\nsupposed to be an API, but we can upgrade them if necessary.\n\nA few places are actually used outside the package and are valid uses. For\nthose appropriate javadocs are added.\n\nSigned-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n .../.settings/org.eclipse.jdt.core.prefs           |    7 ++++---\n .../src/org/spearce/jgit/pgm/TextBuiltin.java      |    9 +++++++--\n .../.settings/org.eclipse.jdt.core.prefs           |    5 +++--\n .../jgit/dircache/DirCacheBuildIterator.java       |    2 +-\n .../spearce/jgit/dircache/DirCacheIterator.java    |    2 +-\n .../src/org/spearce/jgit/lib/ObjectId.java         |    2 +-\n .../src/org/spearce/jgit/lib/PackIndex.java        |    6 +++---\n .../src/org/spearce/jgit/lib/PackWriter.java       |    2 +-\n .../jgit/lib/TreeVisitorWithCurrentDirectory.java  |    4 ++--\n .../src/org/spearce/jgit/lib/WorkDirCheckout.java  |   14 +++++++-------\n .../org/spearce/jgit/merge/StrategyOneSided.java   |    2 +-\n .../src/org/spearce/jgit/patch/FileHeader.java     |   18 +++++++++---------\n .../src/org/spearce/jgit/patch/HunkHeader.java     |    4 ++--\n .../org/spearce/jgit/revplot/PlotCommitList.java   |    9 +++++++++\n .../src/org/spearce/jgit/revplot/PlotWalk.java     |    4 ++++\n .../org/spearce/jgit/transport/DaemonService.java  |    4 ++--\n .../org/spearce/jgit/transport/OpenSshConfig.java  |    2 +-\n .../spearce/jgit/transport/OperationResult.java    |   10 +++++-----\n .../spearce/jgit/transport/PackedObjectInfo.java   |    2 +-\n .../src/org/spearce/jgit/transport/PushResult.java |    2 +-\n .../spearce/jgit/transport/RemoteRefUpdate.java    |    6 +++---\n .../spearce/jgit/treewalk/WorkingTreeIterator.java |    7 +++++++\n 22 files changed, 75 insertions(+), 48 deletions(-)\n\ndiff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs\nindex a67b954..f0c80d3 100644\n--- a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs\n+++ b/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs\n@@ -1,4 +1,4 @@\n-#Sun Feb 03 03:16:45 CET 2008\n+#Sun Mar 15 19:46:39 CET 2009\n eclipse.preferences.version=1\n org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\n org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\n@@ -36,10 +36,11 @@ org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error\n org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore\n org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error\n org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public\n+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected\n+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag\n org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error\n org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private\n+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected\n org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore\n org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning\n org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\nindex d3e32b3..0cbd0d9 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\n@@ -207,18 +207,23 @@ public Repository getRepository() {\n \t\treturn db;\n \t}\n \n-\tprotected ObjectId resolve(final String s) throws IOException {\n+\tObjectId resolve(final String s) throws IOException {\n \t\tfinal ObjectId r = db.resolve(s);\n \t\tif (r == null)\n \t\t\tthrow die(\"Not a revision: \" + s);\n \t\treturn r;\n \t}\n \n+\t/**\n+\t * @param why\n+\t *            textual explanation\n+\t * @return a runtime exception the caller is expected to throw\n+\t */\n \tprotected static Die die(final String why) {\n \t\treturn new Die(why);\n \t}\n \n-\tprotected String abbreviateRef(String dst, boolean abbreviateRemote) {\n+\tString abbreviateRef(String dst, boolean abbreviateRemote) {\n \t\tif (dst.startsWith(R_HEADS))\n \t\t\tdst = dst.substring(R_HEADS.length());\n \t\telse if (dst.startsWith(R_TAGS))\ndiff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\nindex a67b954..8e8e172 100644\n--- a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\n+++ b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\n@@ -1,4 +1,4 @@\n-#Sun Feb 03 03:16:45 CET 2008\n+#Sun Mar 15 01:13:43 CET 2009\n eclipse.preferences.version=1\n org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\n org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\n@@ -36,7 +36,8 @@ org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error\n org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore\n org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error\n org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public\n+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected\n+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag\n org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error\n org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled\n org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheBuildIterator.java b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheBuildIterator.java\nindex 234ffd2..9818b76 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheBuildIterator.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheBuildIterator.java\n@@ -91,7 +91,7 @@ public DirCacheBuildIterator(final DirCacheBuilder dcb) {\n \t\tbuilder = dcb;\n \t}\n \n-\tprotected DirCacheBuildIterator(final DirCacheBuildIterator p,\n+\tDirCacheBuildIterator(final DirCacheBuildIterator p,\n \t\t\tfinal DirCacheTree dct) {\n \t\tsuper(p, dct);\n \t\tbuilder = p.builder;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheIterator.java b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheIterator.java\nindex 8384723..356d735 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheIterator.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheIterator.java\n@@ -105,7 +105,7 @@ public DirCacheIterator(final DirCache dc) {\n \t\t\tparseEntry();\n \t}\n \n-\tprotected DirCacheIterator(final DirCacheIterator p, final DirCacheTree dct) {\n+\tDirCacheIterator(final DirCacheIterator p, final DirCacheTree dct) {\n \t\tsuper(p, p.path, p.pathLen + 1);\n \t\tcache = p.cache;\n \t\ttree = dct;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectId.java b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectId.java\nindex 52ce0d4..fde209b 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectId.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectId.java\n@@ -238,7 +238,7 @@ private static final ObjectId fromHexString(final byte[] bs, int p) {\n \t\t}\n \t}\n \n-\tprotected ObjectId(final int new_1, final int new_2, final int new_3,\n+\tObjectId(final int new_1, final int new_2, final int new_3,\n \t\t\tfinal int new_4, final int new_5) {\n \t\tw1 = new_1;\n \t\tw2 = new_2;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackIndex.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackIndex.java\nindex 473ce1e..b8e7447 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackIndex.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackIndex.java\n@@ -243,7 +243,7 @@ abstract long findCRC32(AnyObjectId objId) throws MissingObjectException,\n \t * \n \t */\n \tpublic static class MutableEntry {\n-\t\tprotected final MutableObjectId idBuffer = new MutableObjectId();\n+\t\tfinal MutableObjectId idBuffer = new MutableObjectId();\n \n \t\tlong offset;\n \n@@ -281,12 +281,12 @@ public MutableEntry cloneEntry() {\n \t\t\treturn r;\n \t\t}\n \n-\t\tprotected void ensureId() {\n+\t\tvoid ensureId() {\n \t\t\t// Override in implementations.\n \t\t}\n \t}\n \n-\tprotected abstract class EntriesIterator implements Iterator<MutableEntry> {\n+\tabstract class EntriesIterator implements Iterator<MutableEntry> {\n \t\tprotected final MutableEntry entry = initEntry();\n \n \t\tprotected long returnedNumber = 0;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java\nindex b878409..2183872 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java\n@@ -931,7 +931,7 @@ boolean isDeltaRepresentation() {\n \t\t * @return true if object is already written; false otherwise.\n \t\t */\n \t\tboolean isWritten() {\n-\t\t\treturn offset != 0;\n+\t\t\treturn getOffset() != 0;\n \t\t}\n \n \t\tPackedObjectLoader getReuseLoader() {\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/TreeVisitorWithCurrentDirectory.java b/org.spearce.jgit/src/org/spearce/jgit/lib/TreeVisitorWithCurrentDirectory.java\nindex e227adb..3e1e1ea 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/TreeVisitorWithCurrentDirectory.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/TreeVisitorWithCurrentDirectory.java\n@@ -50,11 +50,11 @@\n \n \tprivate File currentDirectory;\n \n-\tprotected TreeVisitorWithCurrentDirectory(final File rootDirectory) {\n+\tTreeVisitorWithCurrentDirectory(final File rootDirectory) {\n \t\tcurrentDirectory = rootDirectory;\n \t}\n \n-\tprotected File getCurrentDirectory() {\n+\tFile getCurrentDirectory() {\n \t\treturn currentDirectory;\n \t}\n \ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java\nindex 15e00df..d3da74a 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java\n@@ -56,15 +56,15 @@\n  * Three-way merges are no performed. See {@link #setFailOnConflict(boolean)}.\n  */\n public class WorkDirCheckout {\n-\tprotected Repository repo;\n+\tRepository repo;\n \n-\tprotected File root;\n+\tFile root;\n \n-\tprotected GitIndex index;\n+\tGitIndex index;\n \t\n \tprivate boolean failOnConflict = true;\n \n-\tprotected Tree merge;\n+\tTree merge;\n \n \t\n \t/**\n@@ -151,9 +151,9 @@ private void checkoutTwoTrees() throws FileNotFoundException, IOException {\n \tArrayList<String> conflicts  = new ArrayList<String>();\n \tArrayList<String> removed = new ArrayList<String>();\n \n-\tprotected Tree head = null;\n+\tTree head = null;\n \n-\tprotected HashMap<String, ObjectId> updated = new HashMap<String, ObjectId>();\n+\tHashMap<String, ObjectId> updated = new HashMap<String, ObjectId>();\n \t\n \tprivate void checkoutOutIndexNoHead() throws IOException {\n \t\tnew IndexTreeWalker(index, merge, root, new AbstractIndexTreeVisitor() {\n@@ -294,7 +294,7 @@ else if (file.isDirectory()) {\n \t\tconflicts.removeAll(removed);\n \t}\n \n-\tprotected void processEntry(TreeEntry h, TreeEntry m, Entry i,\n+\tvoid processEntry(TreeEntry h, TreeEntry m, Entry i,\n \t\t\tFile file) throws IOException {\n \t\t\t\tObjectId iId = (i == null ? null : i.getObjectId());\n \t\t\t\tObjectId mId = (m == null ? null : m.getId());\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/merge/StrategyOneSided.java b/org.spearce.jgit/src/org/spearce/jgit/merge/StrategyOneSided.java\nindex 8677b28..c594daa 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/merge/StrategyOneSided.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/merge/StrategyOneSided.java\n@@ -77,7 +77,7 @@ public Merger newMerger(final Repository db) {\n \t\treturn new OneSide(db, treeIndex);\n \t}\n \n-\tprotected static class OneSide extends Merger {\n+\tstatic class OneSide extends Merger {\n \t\tprivate final int treeIndex;\n \n \t\tprotected OneSide(final Repository local, final int index) {\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/patch/FileHeader.java b/org.spearce.jgit/src/org/spearce/jgit/patch/FileHeader.java\nindex e6cccb2..7d341d8 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/patch/FileHeader.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/patch/FileHeader.java\n@@ -68,9 +68,9 @@\n \n \tprivate static final byte[] NEW_MODE = encodeASCII(\"new mode \");\n \n-\tprotected static final byte[] DELETED_FILE_MODE = encodeASCII(\"deleted file mode \");\n+\tstatic final byte[] DELETED_FILE_MODE = encodeASCII(\"deleted file mode \");\n \n-\tprotected static final byte[] NEW_FILE_MODE = encodeASCII(\"new file mode \");\n+\tstatic final byte[] NEW_FILE_MODE = encodeASCII(\"new file mode \");\n \n \tprivate static final byte[] COPY_FROM = encodeASCII(\"copy from \");\n \n@@ -88,7 +88,7 @@\n \n \tprivate static final byte[] DISSIMILARITY_INDEX = encodeASCII(\"dissimilarity index \");\n \n-\tprotected static final byte[] INDEX = encodeASCII(\"index \");\n+\tstatic final byte[] INDEX = encodeASCII(\"index \");\n \n \tstatic final byte[] OLD_NAME = encodeASCII(\"--- \");\n \n@@ -220,7 +220,7 @@ public String getScriptText(Charset oldCharset, Charset newCharset) {\n \t\treturn getScriptText(new Charset[] { oldCharset, newCharset });\n \t}\n \n-\tprotected String getScriptText(Charset[] charsetGuess) {\n+\tString getScriptText(Charset[] charsetGuess) {\n \t\tif (getHunks().isEmpty()) {\n \t\t\t// If we have no hunks then we can safely assume the entire\n \t\t\t// patch is a binary style patch, or a meta-data only style\n@@ -562,19 +562,19 @@ int parseGitHeaders(int ptr, final int end) {\n \t\treturn ptr;\n \t}\n \n-\tprotected void parseOldName(int ptr, final int eol) {\n+\tvoid parseOldName(int ptr, final int eol) {\n \t\toldName = p1(parseName(oldName, ptr + OLD_NAME.length, eol));\n \t\tif (oldName == DEV_NULL)\n \t\t\tchangeType = ChangeType.ADD;\n \t}\n \n-\tprotected void parseNewName(int ptr, final int eol) {\n+\tvoid parseNewName(int ptr, final int eol) {\n \t\tnewName = p1(parseName(newName, ptr + NEW_NAME.length, eol));\n \t\tif (newName == DEV_NULL)\n \t\t\tchangeType = ChangeType.DELETE;\n \t}\n \n-\tprotected void parseNewFileMode(int ptr, final int eol) {\n+\tvoid parseNewFileMode(int ptr, final int eol) {\n \t\toldMode = FileMode.MISSING;\n \t\tnewMode = parseFileMode(ptr + NEW_FILE_MODE.length, eol);\n \t\tchangeType = ChangeType.ADD;\n@@ -633,7 +633,7 @@ private static String p1(final String r) {\n \t\treturn s > 0 ? r.substring(s + 1) : r;\n \t}\n \n-\tprotected FileMode parseFileMode(int ptr, final int end) {\n+\tFileMode parseFileMode(int ptr, final int end) {\n \t\tint tmp = 0;\n \t\twhile (ptr < end - 1) {\n \t\t\ttmp <<= 3;\n@@ -642,7 +642,7 @@ protected FileMode parseFileMode(int ptr, final int end) {\n \t\treturn FileMode.fromBits(tmp);\n \t}\n \n-\tprotected void parseIndexLine(int ptr, final int end) {\n+\tvoid parseIndexLine(int ptr, final int end) {\n \t\t// \"index $asha1..$bsha1[ $mode]\" where $asha1 and $bsha1\n \t\t// can be unique abbreviations\n \t\t//\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java b/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java\nindex fc30311..e3ce546 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java\n@@ -307,7 +307,7 @@ void extractFileLines(final StringBuilder sb, final String[] text,\n \t\t}\n \t}\n \n-\tprotected void copyLine(final StringBuilder sb, final String[] text,\n+\tvoid copyLine(final StringBuilder sb, final String[] text,\n \t\t\tfinal int[] offsets, final int fileIdx) {\n \t\tfinal String s = text[fileIdx];\n \t\tfinal int start = offsets[fileIdx];\n@@ -320,7 +320,7 @@ protected void copyLine(final StringBuilder sb, final String[] text,\n \t\toffsets[fileIdx] = end;\n \t}\n \n-\tprotected void skipLine(final String[] text, final int[] offsets,\n+\tvoid skipLine(final String[] text, final int[] offsets,\n \t\t\tfinal int fileIdx) {\n \t\tfinal String s = text[fileIdx];\n \t\tfinal int end = s.indexOf('\\n', offsets[fileIdx]);\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotCommitList.java b/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotCommitList.java\nindex 7e9f509..a0959e2 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotCommitList.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotCommitList.java\n@@ -171,10 +171,19 @@ private PlotLane nextFreeLane() {\n \t\treturn p;\n \t}\n \n+\t/**\n+\t * @return a new Lane appropriate for this particular PlotList.\n+\t */\n \tprotected L createLane() {\n \t\treturn (L) new PlotLane();\n \t}\n \n+\t/**\n+\t * Return colors and other reusable information to the plotter when a lane\n+\t * is no longer needed.\n+\t * \n+\t * @param lane\n+\t */\n \tprotected void recycleLane(final L lane) {\n \t\t// Nothing.\n \t}\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotWalk.java b/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotWalk.java\nindex 8801850..f2a5976 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotWalk.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/revplot/PlotWalk.java\n@@ -88,6 +88,10 @@ protected RevCommit createCommit(final AnyObjectId id) {\n \t\treturn new PlotCommit(id, getTags(id));\n \t}\n \n+\t/**\n+\t * @param commitId\n+\t * @return return the list of knows tags referring to this commit\n+\t */\n \tprotected Ref[] getTags(final AnyObjectId commitId) {\n \t\tCollection<Ref> list = reverseRefMap.get(commitId);\n \t\tRef[] tags;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonService.java b/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonService.java\nindex 4dc11ef..c511d5a 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonService.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonService.java\n@@ -51,7 +51,7 @@\n \n \tprivate boolean overridable;\n \n-\tprotected DaemonService(final String cmdName, final String cfgName) {\n+\tDaemonService(final String cmdName, final String cfgName) {\n \t\tcommand = cmdName.startsWith(\"git-\") ? cmdName : \"git-\" + cmdName;\n \t\tconfig = cfgName;\n \t\toverridable = true;\n@@ -115,6 +115,6 @@ void execute(final DaemonClient client, final String commandLine)\n \t\t\texecute(client, db);\n \t}\n \n-\tprotected abstract void execute(DaemonClient client, Repository db)\n+\tabstract void execute(DaemonClient client, Repository db)\n \t\t\tthrows IOException;\n }\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java b/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java\nindex b08d5c6..0d9f12f 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java\n@@ -95,7 +95,7 @@ public static OpenSshConfig get() {\n \t/** Cached entries read out of the configuration file. */\n \tprivate Map<String, Host> hosts;\n \n-\tprotected OpenSshConfig(final File h, final File cfg) {\n+\tOpenSshConfig(final File h, final File cfg) {\n \t\thome = h;\n \t\tconfigFile = cfg;\n \t\thosts = Collections.emptyMap();\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/OperationResult.java b/org.spearce.jgit/src/org/spearce/jgit/transport/OperationResult.java\nindex f078f39..7b56d8b 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/OperationResult.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/OperationResult.java\n@@ -53,11 +53,11 @@\n  */\n public abstract class OperationResult {\n \n-\tprotected Map<String, Ref> advertisedRefs = Collections.emptyMap();\n+\tMap<String, Ref> advertisedRefs = Collections.emptyMap();\n \n-\tprotected URIish uri;\n+\tURIish uri;\n \n-\tprotected final SortedMap<String, TrackingRefUpdate> updates = new TreeMap<String, TrackingRefUpdate>();\n+\tfinal SortedMap<String, TrackingRefUpdate> updates = new TreeMap<String, TrackingRefUpdate>();\n \n \t/**\n \t * Get the URI this result came from.\n@@ -122,12 +122,12 @@ public TrackingRefUpdate getTrackingRefUpdate(final String localName) {\n \t\treturn updates.get(localName);\n \t}\n \n-\tprotected void setAdvertisedRefs(final URIish u, final Map<String, Ref> ar) {\n+\tvoid setAdvertisedRefs(final URIish u, final Map<String, Ref> ar) {\n \t\turi = u;\n \t\tadvertisedRefs = ar;\n \t}\n \n-\tprotected void add(final TrackingRefUpdate u) {\n+\tvoid add(final TrackingRefUpdate u) {\n \t\tupdates.put(u.getLocalName(), u);\n \t}\n }\n\\ No newline at end of file\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java b/org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java\nindex 045b795..f37f421 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java\n@@ -49,7 +49,7 @@\n  * objects from the pack. This extension of ObjectId includes the offset.\n  */\n public class PackedObjectInfo extends ObjectId {\n-\tprotected long offset;\n+\tprivate long offset;\n \n \tprivate int crc;\n \ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/PushResult.java b/org.spearce.jgit/src/org/spearce/jgit/transport/PushResult.java\nindex f7fbd58..91f9f69 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/PushResult.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/PushResult.java\n@@ -77,7 +77,7 @@ public RemoteRefUpdate getRemoteUpdate(final String refName) {\n \t\treturn remoteUpdates.get(refName);\n \t}\n \n-\tprotected void setRemoteUpdates(\n+\tvoid setRemoteUpdates(\n \t\t\tfinal Map<String, RemoteRefUpdate> remoteUpdates) {\n \t\tthis.remoteUpdates = remoteUpdates;\n \t}\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java b/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java\nindex c79f7dc..9b054eb 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java\n@@ -315,15 +315,15 @@ public String getMessage() {\n \t\treturn message;\n \t}\n \n-\tprotected void setStatus(final Status status) {\n+\tvoid setStatus(final Status status) {\n \t\tthis.status = status;\n \t}\n \n-\tprotected void setFastForward(boolean fastForward) {\n+\tvoid setFastForward(boolean fastForward) {\n \t\tthis.fastForward = fastForward;\n \t}\n \n-\tprotected void setMessage(final String message) {\n+\tvoid setMessage(final String message) {\n \t\tthis.message = message;\n \t}\n \ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/treewalk/WorkingTreeIterator.java b/org.spearce.jgit/src/org/spearce/jgit/treewalk/WorkingTreeIterator.java\nindex 07ce2ed..836b01a 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/treewalk/WorkingTreeIterator.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/treewalk/WorkingTreeIterator.java\n@@ -309,6 +309,13 @@ static int lastPathChar(final Entry e) {\n \t\treturn e.getMode() == FileMode.TREE ? '/' : '\\0';\n \t}\n \n+\t/**\n+\t * Constructor helper.\n+\t *\n+\t * @param list\n+\t *            files in the subtree of the work tree this iterator operates\n+\t *            on\n+\t */\n \tprotected void init(final Entry[] list) {\n \t\t// Filter out nulls, . and .. as these are not valid tree entries,\n \t\t// also cache the encoded forms of the path names for efficient use\n-- \n1.6.1.285.g35d8b\n"},{"id":"108121","messageId":"1237234483-3405-3-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-2-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:35Z","receivedAt":"2009-03-16T20:14:35Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"It is used for looking at alternate objects, so name it such\n---\n .../org/spearce/jgit/transport/TransportHttp.java  |   14 +++++++-------\n 1 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java\nindex fe4a437..38d26b3 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java\n@@ -112,15 +112,15 @@ public void close() {\n \t}\n \n \tclass HttpObjectDB extends WalkRemoteObjectDatabase {\n-\t\tprivate final URL objectsUrl;\n+\t\tprivate final URL alternateObjectsUrl;\n \n \t\tHttpObjectDB(final URL b) {\n-\t\t\tobjectsUrl = b;\n+\t\t\talternateObjectsUrl = b;\n \t\t}\n \n \t\t@Override\n \t\tURIish getURI() {\n-\t\t\treturn new URIish(objectsUrl);\n+\t\t\treturn new URIish(alternateObjectsUrl);\n \t\t}\n \n \t\t@Override\n@@ -143,7 +143,7 @@ URIish getURI() {\n \t\t@Override\n \t\tWalkRemoteObjectDatabase openAlternate(final String location)\n \t\t\t\tthrows IOException {\n-\t\t\treturn new HttpObjectDB(new URL(objectsUrl, location));\n+\t\t\treturn new HttpObjectDB(new URL(alternateObjectsUrl, location));\n \t\t}\n \n \t\t@Override\n@@ -171,7 +171,7 @@ WalkRemoteObjectDatabase openAlternate(final String location)\n \n \t\t@Override\n \t\tFileStream open(final String path) throws IOException {\n-\t\t\tfinal URL base = objectsUrl;\n+\t\t\tfinal URL base = alternateObjectsUrl;\n \t\t\tfinal URL u = new URL(base, path);\n \t\t\tfinal Proxy proxy = HttpSupport.proxyFor(proxySelector, u);\n \t\t\tfinal HttpURLConnection c;\n@@ -201,10 +201,10 @@ FileStream open(final String path) throws IOException {\n \t\t\t\t}\n \t\t\t} catch (IOException err) {\n \t\t\t\ttry {\n-\t\t\t\t\tthrow new TransportException(new URL(objectsUrl, INFO_REFS)\n+\t\t\t\t\tthrow new TransportException(new URL(alternateObjectsUrl, INFO_REFS)\n \t\t\t\t\t\t\t+ \": cannot read available refs\", err);\n \t\t\t\t} catch (MalformedURLException mue) {\n-\t\t\t\t\tthrow new TransportException(objectsUrl + INFO_REFS\n+\t\t\t\t\tthrow new TransportException(alternateObjectsUrl + INFO_REFS\n \t\t\t\t\t\t\t+ \": cannot read available refs\", err);\n \t\t\t\t}\n \t\t\t}\n-- \n1.6.1.285.g35d8b\n"},{"id":"108122","messageId":"1237234483-3405-4-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-3-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 03/10] Rename variables that hides others with different content in FetchProcess","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:36Z","receivedAt":"2009-03-16T20:14:36Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"---\n .../org/spearce/jgit/transport/FetchProcess.java   |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java\nindex df64817..f216cba 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java\n@@ -298,7 +298,7 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched)\n \n \tprivate Collection<Ref> expandAutoFollowTags() throws TransportException {\n \t\tfinal Collection<Ref> additionalTags = new ArrayList<Ref>();\n-\t\tfinal Map<String, Ref> have = transport.local.getAllRefs();\n+\t\tfinal Map<String, Ref> haveRefs = transport.local.getAllRefs();\n \t\tfor (final Ref r : conn.getRefs()) {\n \t\t\tif (!isTag(r))\n \t\t\t\tcontinue;\n@@ -307,7 +307,7 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched)\n \t\t\t\tcontinue;\n \t\t\t}\n \n-\t\t\tfinal Ref local = have.get(r.getName());\n+\t\t\tfinal Ref local = haveRefs.get(r.getName());\n \t\t\tif (local != null) {\n \t\t\t\tif (!r.getObjectId().equals(local.getObjectId()))\n \t\t\t\t\twantTag(r);\n@@ -321,11 +321,11 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched)\n \t}\n \n \tprivate void expandFetchTags() throws TransportException {\n-\t\tfinal Map<String, Ref> have = transport.local.getAllRefs();\n+\t\tfinal Map<String, Ref> haveRefs = transport.local.getAllRefs();\n \t\tfor (final Ref r : conn.getRefs()) {\n \t\t\tif (!isTag(r))\n \t\t\t\tcontinue;\n-\t\t\tfinal Ref local = have.get(r.getName());\n+\t\t\tfinal Ref local = haveRefs.get(r.getName());\n \t\t\tif (local == null || !r.getObjectId().equals(local.getObjectId()))\n \t\t\t\twantTag(r);\n \t\t}\n-- \n1.6.1.285.g35d8b\n"},{"id":"108131","messageId":"1237234483-3405-5-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-4-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 04/10] Rename a parameter i PackWriter that hides another with the same name","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:37Z","receivedAt":"2009-03-16T20:14:37Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"---\n .../src/org/spearce/jgit/lib/PackWriter.java       |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java\nindex 2183872..601ce71 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java\n@@ -447,7 +447,7 @@ public void preparePack(final Iterator<RevObject> objectsSource)\n \t * @param uninterestingObjects\n \t *            collection of objects to be marked as uninteresting (end\n \t *            points of graph traversal).\n-\t * @param thin\n+\t * @param packthin\n \t *            a boolean indicating whether writer may pack objects with\n \t *            delta base object not within set of objects to pack, but\n \t *            belonging to party repository (uninteresting/boundary) as\n@@ -464,9 +464,9 @@ public void preparePack(final Iterator<RevObject> objectsSource)\n \tpublic void preparePack(\n \t\t\tfinal Collection<? extends ObjectId> interestingObjects,\n \t\t\tfinal Collection<? extends ObjectId> uninterestingObjects,\n-\t\t\tfinal boolean thin, final boolean ignoreMissingUninteresting)\n+\t\t\tfinal boolean packthin, final boolean ignoreMissingUninteresting)\n \t\t\tthrows IOException {\n-\t\tthis.thin = thin;\n+\t\tthis.thin = packthin;\n \t\tObjectWalk walker = setUpWalker(interestingObjects,\n \t\t\t\tuninterestingObjects, ignoreMissingUninteresting);\n \t\tfindObjectsToPack(walker);\n-- \n1.6.1.285.g35d8b\n"},{"id":"108129","messageId":"1237234483-3405-6-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-5-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 05/10] Rename fields to avoid hiding of field names in ReadTreeTest","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:38Z","receivedAt":"2009-03-16T20:14:38Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"---\n .../tst/org/spearce/jgit/lib/ReadTreeTest.java     |  118 ++++++++++----------\n 1 files changed, 59 insertions(+), 59 deletions(-)\n\ndiff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ReadTreeTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ReadTreeTest.java\nindex 6318633..c9d0565 100644\n--- a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ReadTreeTest.java\n+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ReadTreeTest.java\n@@ -49,10 +49,10 @@\n \n public class ReadTreeTest extends RepositoryTestCase {\n \t\n-\tprivate Tree head;\n-\tprivate Tree merge;\n-\tprivate GitIndex index;\n-\tprivate WorkDirCheckout readTree;\n+\tprivate Tree theHead;\n+\tprivate Tree theMerge;\n+\tprivate GitIndex theIndex;\n+\tprivate WorkDirCheckout theReadTree;\n \t// Each of these rules are from the read-tree manpage\n \t// go there to see what they mean.\n \t// Rule 0 is left out for obvious reasons :)\n@@ -87,9 +87,9 @@ public void testRules1thru3_NoIndexEntry() throws IOException {\n \tvoid setupCase(HashMap<String, String> headEntries, \n \t\t\tHashMap<String, String> mergeEntries, \n \t\t\tHashMap<String, String> indexEntries) throws IOException {\n-\t\thead = buildTree(headEntries);\n-\t\tmerge = buildTree(mergeEntries);\n-\t\tindex = buildIndex(indexEntries);\n+\t\ttheHead = buildTree(headEntries);\n+\t\ttheMerge = buildTree(mergeEntries);\n+\t\ttheIndex = buildIndex(indexEntries);\n \t}\n \t\n \tprivate GitIndex buildIndex(HashMap<String, String> indexEntries) throws IOException {\n@@ -129,9 +129,9 @@ ObjectId genSha1(String data) {\n \t}\n \t\n \tprivate WorkDirCheckout go() throws IOException {\n-\t\treadTree = new WorkDirCheckout(db, trash, head, index, merge);\n-\t\treadTree.prescanTwoTrees();\n-\t\treturn readTree;\n+\t\ttheReadTree = new WorkDirCheckout(db, trash, theHead, theIndex, theMerge);\n+\t\ttheReadTree.prescanTwoTrees();\n+\t\treturn theReadTree;\n \t}\n \n     // for these rules, they all have clean yes/no options\n@@ -144,17 +144,17 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException {\n \t\tidxMap = new HashMap<String, String>();\n \t\tidxMap.put(\"foo\", \"foo\");\n \t\tsetupCase(null, null, idxMap);\n-\t\treadTree = go();\n+\t\ttheReadTree = go();\n \t\t\n-\t\tassertTrue(readTree.updated.isEmpty());\n-\t\tassertTrue(readTree.removed.isEmpty());\n-\t\tassertTrue(readTree.conflicts.isEmpty());\n+\t\tassertTrue(theReadTree.updated.isEmpty());\n+\t\tassertTrue(theReadTree.removed.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.isEmpty());\n \t\t\n \t\t// rules 6 and 7\n \t\tidxMap = new HashMap<String, String>();\n \t\tidxMap.put(\"foo\", \"foo\");\n \t\tsetupCase(null, idxMap, idxMap);\n-\t\treadTree = go();\n+\t\ttheReadTree = go();\n \n \t\tassertAllEmpty();\n \t\t\n@@ -166,9 +166,9 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException {\n \t\tsetupCase(null, mergeMap, idxMap);\n \t\tgo();\n \t\t\n-\t\tassertTrue(readTree.updated.isEmpty());\n-\t\tassertTrue(readTree.removed.isEmpty());\n-\t\tassertTrue(readTree.conflicts.contains(\"foo\"));\n+\t\tassertTrue(theReadTree.updated.isEmpty());\n+\t\tassertTrue(theReadTree.removed.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.contains(\"foo\"));\n \t\t\n \t\t// rule 10\n \t\t\n@@ -177,29 +177,29 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException {\n \t\tsetupCase(headMap, null, idxMap);\n \t\tgo();\n \t\t\n-\t\tassertTrue(readTree.removed.contains(\"foo\"));\n-\t\tassertTrue(readTree.updated.isEmpty());\n-\t\tassertTrue(readTree.conflicts.isEmpty());\n+\t\tassertTrue(theReadTree.removed.contains(\"foo\"));\n+\t\tassertTrue(theReadTree.updated.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.isEmpty());\n \t\t\n \t\t// rule 11\n \t\tsetupCase(headMap, null, idxMap);\n \t\tnew File(trash, \"foo\").delete();\n \t\twriteTrashFile(\"foo\", \"bar\");\n-\t\tindex.getMembers()[0].forceRecheck();\n+\t\ttheIndex.getMembers()[0].forceRecheck();\n \t\tgo();\n \t\t\n-\t\tassertTrue(readTree.removed.isEmpty());\n-\t\tassertTrue(readTree.updated.isEmpty());\n-\t\tassertTrue(readTree.conflicts.contains(\"foo\"));\n+\t\tassertTrue(theReadTree.removed.isEmpty());\n+\t\tassertTrue(theReadTree.updated.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.contains(\"foo\"));\n \t\t\n \t\t// rule 12 & 13\n \t\theadMap.put(\"foo\", \"head\");\n \t\tsetupCase(headMap, null, idxMap);\n \t\tgo();\n \t\t\n-\t\tassertTrue(readTree.removed.isEmpty());\n-\t\tassertTrue(readTree.updated.isEmpty());\n-\t\tassertTrue(readTree.conflicts.contains(\"foo\"));\n+\t\tassertTrue(theReadTree.removed.isEmpty());\n+\t\tassertTrue(theReadTree.updated.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.contains(\"foo\"));\n \t\t\n \t\t// rules 14 & 15\n \t\tsetupCase(headMap, headMap, idxMap);\n@@ -209,7 +209,7 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException {\n \t\t\n \t\t// rules 16 & 17\n \t\tsetupCase(headMap, mergeMap, idxMap); go();\n-\t\tassertTrue(readTree.conflicts.contains(\"foo\"));\n+\t\tassertTrue(theReadTree.conflicts.contains(\"foo\"));\n \t\t\n \t\t// rules 18 & 19\n \t\tsetupCase(headMap, idxMap, idxMap); go();\n@@ -217,51 +217,51 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException {\n \t\t\n \t\t// rule 20\n \t\tsetupCase(idxMap, mergeMap, idxMap); go();\n-\t\tassertTrue(readTree.updated.containsKey(\"foo\"));\n+\t\tassertTrue(theReadTree.updated.containsKey(\"foo\"));\n \t\t\n \t\t// rules 21\n \t\tsetupCase(idxMap, mergeMap, idxMap); \n \t\tnew File(trash, \"foo\").delete();\n \t\twriteTrashFile(\"foo\", \"bar\");\n-\t\tindex.getMembers()[0].forceRecheck();\n+\t\ttheIndex.getMembers()[0].forceRecheck();\n \t\tgo();\n-\t\tassertTrue(readTree.conflicts.contains(\"foo\"));\n+\t\tassertTrue(theReadTree.conflicts.contains(\"foo\"));\n \t}\n \n \tprivate void assertAllEmpty() {\n-\t\tassertTrue(readTree.removed.isEmpty());\n-\t\tassertTrue(readTree.updated.isEmpty());\n-\t\tassertTrue(readTree.conflicts.isEmpty());\n+\t\tassertTrue(theReadTree.removed.isEmpty());\n+\t\tassertTrue(theReadTree.updated.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.isEmpty());\n \t}\n \t\n \tpublic void testDirectoryFileSimple() throws IOException {\n-\t\tindex = new GitIndex(db);\n-\t\tindex.add(trash, writeTrashFile(\"DF\", \"DF\"));\n-\t\tTree treeDF = db.mapTree(index.writeTree());\n+\t\ttheIndex = new GitIndex(db);\n+\t\ttheIndex.add(trash, writeTrashFile(\"DF\", \"DF\"));\n+\t\tTree treeDF = db.mapTree(theIndex.writeTree());\n \t\t\n \t\trecursiveDelete(new File(trash, \"DF\"));\n-\t\tindex = new GitIndex(db);\n-\t\tindex.add(trash, writeTrashFile(\"DF/DF\", \"DF/DF\"));\n-\t\tTree treeDFDF = db.mapTree(index.writeTree());\n+\t\ttheIndex = new GitIndex(db);\n+\t\ttheIndex.add(trash, writeTrashFile(\"DF/DF\", \"DF/DF\"));\n+\t\tTree treeDFDF = db.mapTree(theIndex.writeTree());\n \t\t\n-\t\tindex = new GitIndex(db);\n+\t\ttheIndex = new GitIndex(db);\n \t\trecursiveDelete(new File(trash, \"DF\"));\n \t\t\n-\t\tindex.add(trash, writeTrashFile(\"DF\", \"DF\"));\n-\t\treadTree = new WorkDirCheckout(db, trash, treeDF, index, treeDFDF);\n-\t\treadTree.prescanTwoTrees();\n+\t\ttheIndex.add(trash, writeTrashFile(\"DF\", \"DF\"));\n+\t\ttheReadTree = new WorkDirCheckout(db, trash, treeDF, theIndex, treeDFDF);\n+\t\ttheReadTree.prescanTwoTrees();\n \t\t\n-\t\tassertTrue(readTree.removed.contains(\"DF\"));\n-\t\tassertTrue(readTree.updated.containsKey(\"DF/DF\"));\n+\t\tassertTrue(theReadTree.removed.contains(\"DF\"));\n+\t\tassertTrue(theReadTree.updated.containsKey(\"DF/DF\"));\n \t\t\n \t\trecursiveDelete(new File(trash, \"DF\"));\n-\t\tindex = new GitIndex(db);\n-\t\tindex.add(trash, writeTrashFile(\"DF/DF\", \"DF/DF\"));\n+\t\ttheIndex = new GitIndex(db);\n+\t\ttheIndex.add(trash, writeTrashFile(\"DF/DF\", \"DF/DF\"));\n \t\t\n-\t\treadTree = new WorkDirCheckout(db, trash, treeDFDF, index, treeDF);\n-\t\treadTree.prescanTwoTrees();\n-\t\tassertTrue(readTree.removed.contains(\"DF/DF\"));\n-\t\tassertTrue(readTree.updated.containsKey(\"DF\"));\n+\t\ttheReadTree = new WorkDirCheckout(db, trash, treeDFDF, theIndex, treeDF);\n+\t\ttheReadTree.prescanTwoTrees();\n+\t\tassertTrue(theReadTree.removed.contains(\"DF/DF\"));\n+\t\tassertTrue(theReadTree.updated.containsKey(\"DF\"));\n \t}\n \t\n \t/*\n@@ -467,19 +467,19 @@ private void cleanUpDF() throws Exception {\n \t}\n \t\n \tprivate void assertConflict(String s) {\n-\t\tassertTrue(readTree.conflicts.contains(s));\n+\t\tassertTrue(theReadTree.conflicts.contains(s));\n \t}\n \t\n \tprivate void assertUpdated(String s) {\n-\t\tassertTrue(readTree.updated.containsKey(s));\n+\t\tassertTrue(theReadTree.updated.containsKey(s));\n \t}\n \t\n \tprivate void assertRemoved(String s) {\n-\t\tassertTrue(readTree.removed.contains(s));\n+\t\tassertTrue(theReadTree.removed.contains(s));\n \t}\n \t\n \tprivate void assertNoConflicts() {\n-\t\tassertTrue(readTree.conflicts.isEmpty());\n+\t\tassertTrue(theReadTree.conflicts.isEmpty());\n \t}\n \n \tprivate void doit(HashMap<String, String> h, HashMap<String, String>m,\n@@ -545,8 +545,8 @@ public void testCloseNameConflicts1() throws IOException {\n \t}\n \n \tprivate void checkout() throws IOException {\n-\t\treadTree = new WorkDirCheckout(db, trash, head, index, merge);\n-\t\treadTree.checkout();\n+\t\ttheReadTree = new WorkDirCheckout(db, trash, theHead, theIndex, theMerge);\n+\t\ttheReadTree.checkout();\n \t}\n \t\n \tpublic void testCheckoutOutChanges() throws IOException {\n-- \n1.6.1.285.g35d8b\n"},{"id":"108127","messageId":"1237234483-3405-7-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-6-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 06/10] Rename the gitDir fields to indicate they refer to another dir than the default","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:39Z","receivedAt":"2009-03-16T20:14:39Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"---\n .../src/org/spearce/jgit/pgm/ReceivePack.java      |   10 +++++-----\n .../src/org/spearce/jgit/pgm/UploadPack.java       |   10 +++++-----\n 2 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java\nindex 579f893..7c72e2c 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java\n@@ -45,7 +45,7 @@\n @Command(common = false, usage = \"Server side backend for 'jgit push'\")\n class ReceivePack extends TextBuiltin {\n \t@Argument(index = 0, required = true, metaVar = \"DIRECTORY\", usage = \"Repository to receive into\")\n-\tFile gitdir;\n+\tFile newGitdir;\n \n \t@Override\n \tprotected final boolean requiresRepository() {\n@@ -56,11 +56,11 @@ protected final boolean requiresRepository() {\n \tprotected void run() throws Exception {\n \t\tfinal org.spearce.jgit.transport.ReceivePack rp;\n \n-\t\tif (new File(gitdir, \".git\").isDirectory())\n-\t\t\tgitdir = new File(gitdir, \".git\");\n-\t\tdb = new Repository(gitdir);\n+\t\tif (new File(newGitdir, \".git\").isDirectory())\n+\t\t\tnewGitdir = new File(newGitdir, \".git\");\n+\t\tdb = new Repository(newGitdir);\n \t\tif (!db.getObjectsDirectory().isDirectory())\n-\t\t\tthrow die(\"'\" + gitdir.getPath() + \"' not a git repository\");\n+\t\t\tthrow die(\"'\" + newGitdir.getPath() + \"' not a git repository\");\n \t\trp = new org.spearce.jgit.transport.ReceivePack(db);\n \t\trp.receive(System.in, System.out, System.err);\n \t}\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java\nindex d6f6d7c..b9e25d0 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java\n@@ -45,7 +45,7 @@\n @Command(common = false, usage = \"Server side backend for 'jgit fetch'\")\n class UploadPack extends TextBuiltin {\n \t@Argument(index = 0, required = true, metaVar = \"DIRECTORY\", usage = \"Repository to read from\")\n-\tFile gitdir;\n+\tFile newGitdir;\n \n \t@Override\n \tprotected final boolean requiresRepository() {\n@@ -56,11 +56,11 @@ protected final boolean requiresRepository() {\n \tprotected void run() throws Exception {\n \t\tfinal org.spearce.jgit.transport.UploadPack rp;\n \n-\t\tif (new File(gitdir, \".git\").isDirectory())\n-\t\t\tgitdir = new File(gitdir, \".git\");\n-\t\tdb = new Repository(gitdir);\n+\t\tif (new File(newGitdir, \".git\").isDirectory())\n+\t\t\tnewGitdir = new File(newGitdir, \".git\");\n+\t\tdb = new Repository(newGitdir);\n \t\tif (!db.getObjectsDirectory().isDirectory())\n-\t\t\tthrow die(\"'\" + gitdir.getPath() + \"' not a git repository\");\n+\t\t\tthrow die(\"'\" + newGitdir.getPath() + \"' not a git repository\");\n \t\trp = new org.spearce.jgit.transport.UploadPack(db);\n \t\trp.upload(System.in, System.out, System.err);\n \t}\n-- \n1.6.1.285.g35d8b\n"},{"id":"108128","messageId":"1237234483-3405-8-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-7-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 07/10] Rename a parameter in PushProcessTest that hides another","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:40Z","receivedAt":"2009-03-16T20:14:40Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"---\n .../spearce/jgit/transport/PushProcessTest.java    |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java\nindex eafd89c..ef9a8c8 100644\n--- a/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java\n+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java\n@@ -401,9 +401,9 @@ public void close() {\n \t\t}\n \n \t\tpublic void push(ProgressMonitor monitor,\n-\t\t\t\tMap<String, RemoteRefUpdate> refUpdates)\n+\t\t\t\tMap<String, RemoteRefUpdate> refsToUpdate)\n \t\t\t\tthrows TransportException {\n-\t\t\tfor (final RemoteRefUpdate rru : refUpdates.values()) {\n+\t\t\tfor (final RemoteRefUpdate rru : refsToUpdate.values()) {\n \t\t\t\tassertEquals(Status.NOT_ATTEMPTED, rru.getStatus());\n \t\t\t\trru.setStatus(connectionUpdateStatus);\n \t\t\t}\n-- \n1.6.1.285.g35d8b\n"},{"id":"108125","messageId":"1237234483-3405-9-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-8-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 08/10] Drop unused end parameters in hunk parsing code","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:41Z","receivedAt":"2009-03-16T20:14:41Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Is this safe, or should they actually be used?\n---\n .../org/spearce/jgit/patch/CombinedHunkHeader.java |    2 +-\n .../src/org/spearce/jgit/patch/HunkHeader.java     |    2 +-\n .../src/org/spearce/jgit/patch/Patch.java          |    8 ++++----\n 3 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/patch/CombinedHunkHeader.java b/org.spearce.jgit/src/org/spearce/jgit/patch/CombinedHunkHeader.java\nindex 83ea681..b1aef91 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/patch/CombinedHunkHeader.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/patch/CombinedHunkHeader.java\n@@ -90,7 +90,7 @@ public OldImage getOldImage(final int nthParent) {\n \t}\n \n \t@Override\n-\tvoid parseHeader(final int end) {\n+\tvoid parseHeader() {\n \t\t// Parse \"@@@ -55,12 -163,13 +163,15 @@@ protected boolean\"\n \t\t//\n \t\tfinal byte[] buf = file.buf;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java b/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java\nindex e3ce546..e9c55e3 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java\n@@ -161,7 +161,7 @@ public int getLinesContext() {\n \t\treturn nContext;\n \t}\n \n-\tvoid parseHeader(final int end) {\n+\tvoid parseHeader() {\n \t\t// Parse \"@@ -236,9 +236,9 @@ protected boolean\"\n \t\t//\n \t\tfinal byte[] buf = file.buf;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/patch/Patch.java b/org.spearce.jgit/src/org/spearce/jgit/patch/Patch.java\nindex 9c2a8d6..4b2121e 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/patch/Patch.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/patch/Patch.java\n@@ -222,7 +222,7 @@ private int parseDiffGit(final byte[] buf, final int start, final int end) {\n \t\tfinal FileHeader fh = new FileHeader(buf, start);\n \t\tint ptr = fh.parseGitFileName(start + DIFF_GIT.length, end);\n \t\tif (ptr < 0)\n-\t\t\treturn skipFile(buf, start, end);\n+\t\t\treturn skipFile(buf, start);\n \n \t\tptr = fh.parseGitHeaders(ptr, end);\n \t\tptr = parseHunks(fh, ptr, end);\n@@ -236,7 +236,7 @@ private int parseDiffCombined(final byte[] hdr, final byte[] buf,\n \t\tfinal CombinedFileHeader fh = new CombinedFileHeader(buf, start);\n \t\tint ptr = fh.parseGitFileName(start + hdr.length, end);\n \t\tif (ptr < 0)\n-\t\t\treturn skipFile(buf, start, end);\n+\t\t\treturn skipFile(buf, start);\n \n \t\tptr = fh.parseGitHeaders(ptr, end);\n \t\tptr = parseHunks(fh, ptr, end);\n@@ -255,7 +255,7 @@ private int parseTraditionalPatch(final byte[] buf, final int start,\n \t\treturn ptr;\n \t}\n \n-\tprivate static int skipFile(final byte[] buf, int ptr, final int end) {\n+\tprivate static int skipFile(final byte[] buf, int ptr) {\n \t\tptr = nextLF(buf, ptr);\n \t\tif (match(buf, ptr, OLD_NAME) >= 0)\n \t\t\tptr = nextLF(buf, ptr);\n@@ -282,7 +282,7 @@ private int parseHunks(final FileHeader fh, int c, final int end) {\n \n \t\t\tif (isHunkHdr(buf, c, end) == fh.getParentCount()) {\n \t\t\t\tfinal HunkHeader h = fh.newHunkHeader(c);\n-\t\t\t\th.parseHeader(end);\n+\t\t\t\th.parseHeader();\n \t\t\t\tc = h.parseBody(this, end);\n \t\t\t\th.endOffset = c;\n \t\t\t\tfh.addHunk(h);\n-- \n1.6.1.285.g35d8b\n"},{"id":"108126","messageId":"1237234483-3405-10-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-9-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 09/10] Drop unused File arguments in IndexTreeWalker and WorkdirCheckout","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:42Z","receivedAt":"2009-03-16T20:14:42Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"---\n .../src/org/spearce/jgit/lib/IndexTreeWalker.java  |    8 ++++----\n .../src/org/spearce/jgit/lib/WorkDirCheckout.java  |    5 ++---\n 2 files changed, 6 insertions(+), 7 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java b/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java\nindex 5c7909a..e2078e1 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java\n@@ -104,10 +104,10 @@ public IndexTreeWalker(GitIndex index, Tree mainTree, Tree newTree, File root, I\n \t * @throws IOException\n \t */\n \tpublic void walk() throws IOException {\n-\t\twalk(mainTree, newTree, \"\");\n+\t\twalk(mainTree, newTree);\n \t}\n \n-\tprivate void walk(Tree tree, Tree auxTree, String curDir) throws IOException {\n+\tprivate void walk(Tree tree, Tree auxTree) throws IOException {\n \t\tTreeIterator mi = new TreeIterator(tree, TreeIterator.Order.POSTORDER);\n \t\tTreeIterator ai = new TreeIterator(auxTree, TreeIterator.Order.POSTORDER);\n \t\tTreeEntry m = mi.hasNext() ? mi.next() : null;\n@@ -124,7 +124,7 @@ private void walk(Tree tree, Tree auxTree, String curDir) throws IOException {\n \t\t\tEntry     pi = cmpmi >= 0 && cmpai >= 0 ? i : null;\n \n \t\t\tif (pi != null)\n-\t\t\t\tvisitEntry(pm, pa, pi, root);\n+\t\t\t\tvisitEntry(pm, pa, pi);\n \t\t\telse\n \t\t\t\tfinishVisitTree(pm, pa, curIndexPos, root);\n \n@@ -135,7 +135,7 @@ private void walk(Tree tree, Tree auxTree, String curDir) throws IOException {\n \t}\n \n \tprivate void visitEntry(TreeEntry t1, TreeEntry t2,\n-\t\t\tEntry i, File root) throws IOException {\n+\t\t\tEntry i) throws IOException {\n \n \t\tassert t1 != null || t2 != null || i != null : \"Needs at least one entry\";\n \t\tassert root != null : \"Needs workdir\";\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java\nindex d3da74a..8435223 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java\n@@ -259,7 +259,7 @@ public void visitEntry(TreeEntry treeEntry, TreeEntry auxEntry,\n \t\t\t\tif (treeEntry instanceof Tree || auxEntry instanceof Tree) {\n \t\t\t\t\tthrow new IllegalArgumentException(\"Can't pass me a tree!\");\n \t\t\t\t}\n-\t\t\t\tprocessEntry(treeEntry, auxEntry, indexEntry, file);\n+\t\t\t\tprocessEntry(treeEntry, auxEntry, indexEntry);\n \t\t\t}\n \t\n \t\t\t@Override\n@@ -294,8 +294,7 @@ else if (file.isDirectory()) {\n \t\tconflicts.removeAll(removed);\n \t}\n \n-\tvoid processEntry(TreeEntry h, TreeEntry m, Entry i,\n-\t\t\tFile file) throws IOException {\n+\tvoid processEntry(TreeEntry h, TreeEntry m, Entry i) throws IOException {\n \t\t\t\tObjectId iId = (i == null ? null : i.getObjectId());\n \t\t\t\tObjectId mId = (m == null ? null : m.getId());\n \t\t\t\tObjectId hId = (h == null ? null : h.getId());\n-- \n1.6.1.285.g35d8b\n"},{"id":"108130","messageId":"1237234483-3405-11-git-send-email-robin.rosenberg@dewire.com","threadId":"18331","inReplyTo":"1237234483-3405-10-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 10/10] Drop an effectively unused parameter in IndexTreeWalker.","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-03-16T20:14:43Z","receivedAt":"2009-03-16T20:14:43Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"The value was always the same as the field it shadowed\n---\n .../src/org/spearce/jgit/lib/IndexTreeWalker.java  |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java b/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java\nindex e2078e1..0f1aef4 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/IndexTreeWalker.java\n@@ -126,7 +126,7 @@ private void walk(Tree tree, Tree auxTree) throws IOException {\n \t\t\tif (pi != null)\n \t\t\t\tvisitEntry(pm, pa, pi);\n \t\t\telse\n-\t\t\t\tfinishVisitTree(pm, pa, curIndexPos, root);\n+\t\t\t\tfinishVisitTree(pm, pa, curIndexPos);\n \n \t\t\tif (pm != null) m = mi.hasNext() ? mi.next() : null;\n \t\t\tif (pa != null) a = ai.hasNext() ? ai.next() : null;\n@@ -160,7 +160,7 @@ else if (t2 != null)\n \t\t\t\tvisitor.visitEntry(t1, i, f);\n \t}\n \n-\tprivate void finishVisitTree(TreeEntry t1, TreeEntry t2, int curIndexPos, File root)\n+\tprivate void finishVisitTree(TreeEntry t1, TreeEntry t2, int curIndexPos)\n \t\t\tthrows IOException {\n \n \t\tassert t1 != null || t2 != null : \"Needs at least one entry\";\n-- \n1.6.1.285.g35d8b\n"},{"id":"108133","messageId":"20090316202513.GS22920@spearce.org","threadId":"18331","inReplyTo":"1237234483-3405-3-git-send-email-robin.rosenberg@dewire.com","subject":"Re: [EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-16T20:25:13Z","receivedAt":"2009-03-16T20:25:13Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Robin Rosenberg <robin.rosenberg@dewire.com> wrote:\n> It is used for looking at alternate objects, so name it such\n\nNo SOB?\n\nBut I disagree with this name change.  Its pointing at the\nobjects directory of a repository.  It may also be used to\npoint at an alternate when opening an alternate, in which\ncase it points at the alternate's objects directory.\n\nIMHO, objectsUrl is the right name for this.\n\n> ---\n>  .../org/spearce/jgit/transport/TransportHttp.java  |   14 +++++++-------\n>  1 files changed, 7 insertions(+), 7 deletions(-)\n> \n> diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java\n> index fe4a437..38d26b3 100644\n> --- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java\n> +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java\n> @@ -112,15 +112,15 @@ public void close() {\n>  \t}\n>  \n>  \tclass HttpObjectDB extends WalkRemoteObjectDatabase {\n> -\t\tprivate final URL objectsUrl;\n> +\t\tprivate final URL alternateObjectsUrl;\n\n-- \nShawn.\n"},{"id":"108134","messageId":"20090316203935.GT22920@spearce.org","threadId":"18331","inReplyTo":"1237234483-3405-9-git-send-email-robin.rosenberg@dewire.com","subject":"Re: [EGIT PATCH 08/10] Drop unused end parameters in hunk parsing code","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-16T20:39:35Z","receivedAt":"2009-03-16T20:39:35Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Robin Rosenberg <robin.rosenberg@dewire.com> wrote:\n> Is this safe, or should they actually be used?\n\nYea, these are safe to remove.  At worst we move one line beyond\nthe end marker given to us by the user in Patch.parse() and then\nabort the parse loop when we find ptr >= end.  We should also never\nexceed the byte[] length; the ParseUtils methods we use do their\nown array bound checks internally.\n\n>  .../org/spearce/jgit/patch/CombinedHunkHeader.java |    2 +-\n>  .../src/org/spearce/jgit/patch/HunkHeader.java     |    2 +-\n>  .../src/org/spearce/jgit/patch/Patch.java          |    8 ++++----\n>  3 files changed, 6 insertions(+), 6 deletions(-)\n\n-- \nShawn.\n"},{"id":"108141","messageId":"200903162225.00347.robin.rosenberg.lists@dewire.com","threadId":"18331","inReplyTo":"20090316202513.GS22920@spearce.org","subject":"Re: [EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-03-16T21:25:00Z","receivedAt":"2009-03-16T21:25:00Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"måndag 16 mars 2009 21:25:13 skrev \"Shawn O. Pearce\" <spearce@spearce.org>:\n> Robin Rosenberg <robin.rosenberg@dewire.com> wrote:\n> > It is used for looking at alternate objects, so name it such\n> \n> No SOB?\n> \n> But I disagree with this name change.  Its pointing at the\n> objects directory of a repository.  It may also be used to\n> point at an alternate when opening an alternate, in which\n> case it points at the alternate's objects directory.\n> \n> IMHO, objectsUrl is the right name for this.\n\nOk, I missed the real reason in the comment. It is name hiding. objectsUrl\nis the name of another variable in the outer scope.\n\n-- robin\n"},{"id":"108142","messageId":"20090316212831.GU22920@spearce.org","threadId":"18331","inReplyTo":"200903162225.00347.robin.rosenberg.lists@dewire.com","subject":"Re: [EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-16T21:28:31Z","receivedAt":"2009-03-16T21:28:31Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:\n> måndag 16 mars 2009 21:25:13 skrev \"Shawn O. Pearce\" <spearce@spearce.org>:\n> > Robin Rosenberg <robin.rosenberg@dewire.com> wrote:\n> > > It is used for looking at alternate objects, so name it such\n> > \n> > No SOB?\n> > \n> > But I disagree with this name change.  Its pointing at the\n> > objects directory of a repository.  It may also be used to\n> > point at an alternate when opening an alternate, in which\n> > case it points at the alternate's objects directory.\n> > \n> > IMHO, objectsUrl is the right name for this.\n> \n> Ok, I missed the real reason in the comment. It is name hiding. objectsUrl\n> is the name of another variable in the outer scope.\n\nOK.\n\nI still disagree with the name change.  Can we hide the outer name by\nmaking it private?  Or come up with a better name for the inner one?\n\n-- \nShawn.\n"}]}