checkouts = new LinkedHashSet<>();
try {
- readCheckouts(new File(mvc.checkouts), checkouts, mvc.search_prefix);
+ readCheckouts(new File(mvc.checkouts), checkouts, mvc.searchPrefix);
} catch (IOException e) {
System.err.println("Problem reading file " + mvc.checkouts + ": " + e.getMessage());
}
if (mvc.search) {
// Postprocess command-line arguments
- for (String adir : mvc.ignore_dir) {
+ for (String adir : mvc.ignoreDir) {
File afile = new File(expandTilde(adir));
if (!afile.exists()) {
System.err.printf(
@@ -598,10 +614,10 @@ public void parseArgs(@UnknownInitialization MultiVersionControl this, String[]
// Checkouts can be much slower than other operations.
timeout = timeout * 10;
- // Set dry_run to true unless it was explicitly specified
+ // Set dryRun to true unless it was explicitly specified
boolean explicitDryRun = false;
for (String arg : args) {
- if (arg.startsWith("--dry-run") || arg.startsWith("--dry_run")) {
+ if (arg.startsWith("--dry-run") || arg.startsWith("--dryRun")) {
explicitDryRun = true;
}
}
@@ -610,13 +626,13 @@ public void parseArgs(@UnknownInitialization MultiVersionControl this, String[]
System.out.println(
"No --dry-run argument, so using --dry-run=true; override with --dry-run=false");
}
- dry_run = true;
+ dryRun = true;
}
}
- if (dry_run) {
+ if (dryRun) {
show = true;
- redo_existing = true;
+ redoExisting = true;
}
if (debug) {
@@ -636,16 +652,19 @@ static enum RepoType {
HG,
/** Subversion. */
SVN
- };
+ }
/** Class that represents a clone on the local file system. */
static class Checkout {
/** The type of repository to clone. */
RepoType repoType;
+
/** Local directory. */
File directory;
+
/** Local directory (canonical version). */
String canonicalDirectory;
+
/**
* Non-null for CVS and SVN. May be null for distributed version control systems (Bzr, Git, Hg).
* For distributed systems, refers to the parent repository from which this was cloned, not the
@@ -654,6 +673,7 @@ static class Checkout {
* Most operations don't need this. It is needed for checkout, though.
*/
@Nullable String repository;
+
/**
* Null if no module, just whole thing. Non-null for CVS and, optionally, for SVN. Null for
* distributed version control systems (Bzr, Git, Hg).
@@ -764,7 +784,7 @@ public boolean equals(@GuardSatisfied Checkout this, @GuardSatisfied @Nullable O
@Override
@Pure
- public int hashCode(@GuardSatisfied Checkout this) {
+ public int hashCode(@GuardSatisfied @UnknownSignedness Checkout this) {
return Objects.hash(repoType, canonicalDirectory, module);
}
@@ -784,14 +804,14 @@ public String toString(@GuardSatisfied Checkout this) {
*
* @param file the .mvc-checkouts file
* @param checkouts the set to populate; is side-effected by this method
- * @param search_prefix if true, search for all clones whose directory is a prefix of one in the
+ * @param searchPrefix if true, search for all clones whose directory is a prefix of one in the
* cofiguration file
* @throws IOException if there is trouble reading the file (or file sysetm?)
*/
@SuppressWarnings({
"StringSplitter" // don't add dependence on Guava
})
- static void readCheckouts(File file, Set checkouts, boolean search_prefix)
+ static void readCheckouts(File file, Set checkouts, boolean searchPrefix)
throws IOException {
RepoType currentType = RepoType.BZR; // arbitrary choice, to avoid uninitialized variable
String currentRoot = null;
@@ -897,7 +917,7 @@ static void readCheckouts(File file, Set checkouts, boolean search_pre
// /a/b/c-fork-d-branch-e
// Then the latter is included twice, once each with the repository of `c` and of
// `c-fork-d`.
- if (search_prefix) {
+ if (searchPrefix) {
String dirName = dir.getName();
FileFilter namePrefixFilter =
new FileFilter() {
@@ -1087,7 +1107,6 @@ static void addCheckoutCvs(File cvsDir, File parentDir, Set checkouts)
return;
}
String pathInRepo = FilesPlume.readFile(repositoryFile).trim();
- String repoRoot = FilesPlume.readFile(rootFile).trim();
@NonNull File repoFileRoot = new File(pathInRepo);
while (repoFileRoot.getParentFile() != null) {
repoFileRoot = repoFileRoot.getParentFile();
@@ -1108,6 +1127,7 @@ static void addCheckoutCvs(File cvsDir, File parentDir, Set checkouts)
pathInRepoAtCheckout = dirRelative.getName();
}
+ String repoRoot = FilesPlume.readFile(rootFile).trim();
checkouts.add(new Checkout(RepoType.CVS, dirRelative, repoRoot, pathInRepoAtCheckout));
}
@@ -1256,6 +1276,7 @@ static Checkout dirToCheckoutGit(File gitDir, File parentDir) {
static class FilePair {
/** The first file. */
final @Nullable File file1;
+
/** The second file. */
final @Nullable File file2;
@@ -1342,6 +1363,7 @@ private void addArgs(ProcessBuilder pb, List args) {
private static class Replacer {
/** The regular expression matching text that should be replaced. */
Pattern regexp;
+
/** The replacement text. */
String replacement;
@@ -1377,14 +1399,15 @@ public String replaceAll(String s) {
public void process(Set checkouts) {
// Always run at least one command, but sometimes up to three.
ProcessBuilder pb = new ProcessBuilder("");
+ pb.redirectErrorStream(true);
ProcessBuilder pb2 = new ProcessBuilder(new ArrayList());
+ pb2.redirectErrorStream(true);
ProcessBuilder pb3 = new ProcessBuilder(new ArrayList());
+ pb3.redirectErrorStream(true);
// pb4 is only for checking whether there are no commits in this branch.
ProcessBuilder pb4 = new ProcessBuilder(new ArrayList());
- pb.redirectErrorStream(true);
- pb2.redirectErrorStream(true);
- pb3.redirectErrorStream(true);
pb4.redirectErrorStream(true);
+
// I really want to be able to redirect output to a Reader, but that
// isn't possible. I have to send it to a file.
// I can't just use the InputStream directly, because if the process is
@@ -1495,35 +1518,35 @@ public void process(Set checkouts) {
case CVS:
assert c.module != null : "@AssumeAssertion(nullness): dependent type CVS";
pb.command(
- cvs_executable,
+ cvsExecutable,
"-d",
c.repository,
"checkout",
"-P", // prune empty directories
"-ko", // no keyword substitution
c.module);
- addArgs(pb, cvs_arg);
+ addArgs(pb, cvsArg);
break;
case GIT:
// "--" is to prevent the directory name from being interpreted as a command-line
// option, if it starts with a hyphen.
- pb.command(git_executable, "clone", "--", c.repository, dirbase);
- addArgs(pb, git_arg);
+ pb.command(gitExecutable, "clone", "--", c.repository, dirbase);
+ addArgs(pb, gitArg);
break;
case HG:
- pb.command(hg_executable, "clone", c.repository, dirbase);
- addArgs(pb, hg_arg);
+ pb.command(hgExecutable, "clone", c.repository, dirbase);
+ addArgs(pb, hgArg);
if (insecure) {
addArg(pb, "--insecure");
}
break;
case SVN:
if (c.module != null) {
- pb.command(svn_executable, "checkout", c.repository, c.module);
+ pb.command(svnExecutable, "checkout", c.repository, c.module);
} else {
- pb.command(svn_executable, "checkout", c.repository);
+ pb.command(svnExecutable, "checkout", c.repository);
}
- addArgs(pb, svn_arg);
+ addArgs(pb, svnArg);
break;
default:
assert false;
@@ -1540,7 +1563,7 @@ public void process(Set checkouts) {
case CVS:
assert c.repository != null;
pb.command(
- cvs_executable,
+ cvsExecutable,
"-q",
// Including "-d REPOS" seems to give errors when a
// subdirectory is in a different CVS repository.
@@ -1549,7 +1572,7 @@ public void process(Set checkouts) {
"-b", // compress whitespace
"--brief", // report only whether files differ, not details
"-N"); // report new files
- addArgs(pb, cvs_arg);
+ addArgs(pb, cvsArg);
// # For the last perl command, this also works:
// # perl -p -e 'chomp(\$cwd = `pwd`); s/^Index: /\$cwd\\//'";
// # but the one we use is briefer and uses the abbreviated directory name.
@@ -1576,8 +1599,8 @@ public void process(Set checkouts) {
replacers.add(new Replacer("(^|\\n)(cvs diff: ignoring )", "$1$2" + dir + "/"));
break;
case GIT:
- pb.command(git_executable, "status");
- addArgs(pb, git_arg);
+ pb.command(gitExecutable, "status");
+ addArgs(pb, gitArg);
// Why was I using this option??
// addArg(pb, "--untracked-files=no");
addArg(pb, "--porcelain"); // experimenting with porcelain output
@@ -1650,8 +1673,8 @@ public void process(Set checkouts) {
// Necessary because "git status --porcelain" does not report:
// # Your branch is ahead of 'origin/master' by 1 commit.
// If you have pushed but not pulled, then this will report
- pb2.command(git_executable, "log", "--branches", "--not", "--remotes");
- addArgs(pb2, git_arg);
+ pb2.command(gitExecutable, "log", "--branches", "--not", "--remotes");
+ addArgs(pb2, gitArg);
replacers.add(
new Replacer(
"^commit .*(.*\\n)+", "unpushed commits: " + pb2.directory() + "\n"));
@@ -1660,22 +1683,22 @@ public void process(Set checkouts) {
// TODO: use `if git merge-base --is-ancestor origin/master HEAD ; then ...` to
// determine whether this branch has no changes and thus can be deleted.
- pb4.command(git_executable, "merge-base", "--is-ancestor", "origin/master", "HEAD");
+ pb4.command(gitExecutable, "merge-base", "--is-ancestor", "origin/master", "HEAD");
break;
case HG:
- pb.command(hg_executable, "status");
- addArgs(pb, hg_arg);
+ pb.command(hgExecutable, "status");
+ addArgs(pb, hgArg);
if (debug) {
System.out.printf(
"invalidCertificate(%s) => %s%n", c.directory, invalidCertificate(c.directory));
}
if (invalidCertificate(c.directory)) {
- pb2.command(hg_executable, "outgoing", "-l", "1", "--config", "web.cacerts=");
+ pb2.command(hgExecutable, "outgoing", "-l", "1", "--config", "web.cacerts=");
} else {
- pb2.command(hg_executable, "outgoing", "-l", "1");
+ pb2.command(hgExecutable, "outgoing", "-l", "1");
}
- addArgs(pb2, hg_arg);
+ addArgs(pb2, hgArg);
if (insecure) {
addArg(pb2, "--insecure");
}
@@ -1687,8 +1710,8 @@ public void process(Set checkouts) {
replacers.add(
new Replacer(
"^\\n?comparing with .*\\nsearching for changes\\nno changes found\n", ""));
- pb3.command(hg_executable, "shelve", "-l");
- addArgs(pb3, hg_arg);
+ pb3.command(hgExecutable, "shelve", "-l");
+ addArgs(pb3, hgArg);
// Shelve is an optional extension, so don't print anything if not installed.
replacers3.add(new Replacer("^hg: unknown command 'shelve'\\n(.*\\n)+", ""));
replacers3.add(
@@ -1699,8 +1722,8 @@ public void process(Set checkouts) {
// "svn status" outputs an eighth column, if you pass the --show-updates switch: [* ]
replacers.add(
new Replacer("(^|\\n)([ACDIMRX?!~ ][CM ][L ][+ ][$ ]) *", "$1$2 " + dir + "/"));
- pb.command(svn_executable, "status");
- addArgs(pb, svn_arg);
+ pb.command(svnExecutable, "status");
+ addArgs(pb, svnArg);
break;
default:
assert false;
@@ -1722,14 +1745,14 @@ public void process(Set checkouts) {
"$1$2 " + dir + "/"));
assert c.repository != null;
pb.command(
- cvs_executable,
+ cvsExecutable,
// Including -d causes problems with CVS repositories
// that are embedded inside other repositories.
// "-d", c.repository,
"-Q",
"update",
"-d");
- addArgs(pb, cvs_arg);
+ addArgs(pb, cvsArg);
// $filter = "grep -v \"config: unrecognized keyword
// 'UseNewInfoFmtStrings'\"";
replacers.add(new Replacer("(cvs update: move away )", "$1" + dir + "/"));
@@ -1747,22 +1770,22 @@ public void process(Set checkouts) {
new Replacer(
"((^|\\n)CONFLICT \\(content\\): Merge conflict in )", "$1" + dir + "/"));
replacers.add(new Replacer("(^|\\n)([ACDMRU]\t)", "$1$2" + dir + "/"));
- pb.command(git_executable, "pull", "-q");
- addArgs(pb, git_arg);
+ pb.command(gitExecutable, "pull", "-q");
+ addArgs(pb, gitArg);
// prune branches; alternately do "git remote prune origin"; "git gc" doesn't do this.
- pb2.command(git_executable, "fetch", "-p");
+ pb2.command(gitExecutable, "fetch", "-p");
break;
case HG:
replacers.add(new Replacer("(^|\\n)([?!AMR] ) +", "$1$2 " + dir + "/"));
replacers.add(new Replacer("(^|\\n)abort: ", "$1"));
- pb.command(hg_executable, "-q", "update");
- addArgs(pb, hg_arg);
+ pb.command(hgExecutable, "-q", "update");
+ addArgs(pb, hgArg);
if (invalidCertificate(c.directory)) {
- pb2.command(hg_executable, "-q", "fetch", "--config", "web.cacerts=");
+ pb2.command(hgExecutable, "-q", "fetch", "--config", "web.cacerts=");
} else {
- pb2.command(hg_executable, "-q", "fetch");
+ pb2.command(hgExecutable, "-q", "fetch");
}
- addArgs(pb2, hg_arg);
+ addArgs(pb2, hgArg);
if (insecure) {
addArg(pb2, "--insecure");
}
@@ -1771,8 +1794,8 @@ public void process(Set checkouts) {
replacers.add(new Replacer("(^|\\n)([?!AMR] ) +", "$1$2 " + dir + "/"));
replacers.add(new Replacer("(svn: Failed to add file ')(.*')", "$1" + dir + "/$2"));
assert c.repository != null;
- pb.command(svn_executable, "-q", "update");
- addArgs(pb, svn_arg);
+ pb.command(svnExecutable, "-q", "update");
+ addArgs(pb, svnArg);
// $filter = "grep -v \"Killed by signal 15.\"";
break;
default:
@@ -1788,7 +1811,7 @@ public void process(Set checkouts) {
System.out.println(dir + ":");
}
if (dir.exists()) {
- if (action == CLONE && !redo_existing && !quiet) {
+ if (action == CLONE && !redoExisting && !quiet) {
System.out.println("Skipping checkout (dir already exists): " + dir);
continue;
}
@@ -1805,15 +1828,15 @@ public void process(Set checkouts) {
case CLONE:
if (!parent.exists()) {
if (show) {
- if (!dry_run) {
+ if (!dryRun) {
System.out.printf(
"Parent directory %s does not exist%s%n",
- parent, (dry_run ? "" : " (creating)"));
+ parent, (dryRun ? "" : " (creating)"));
} else {
System.out.printf(" mkdir -p %s%n", parent);
}
}
- if (!dry_run) {
+ if (!dryRun) {
if (!parent.mkdirs()) {
System.err.println("Could not create directory: " + parent);
System.exit(1);
@@ -1833,7 +1856,7 @@ public void process(Set checkouts) {
}
}
- if (print_directory) {
+ if (printDirectory) {
System.out.println(dir + " :");
}
perform_command(pb, replacers, showNormalOutput);
@@ -1918,7 +1941,7 @@ int perform_command(ProcessBuilder pb, List replacers, boolean showNor
if (show) {
System.out.println(command(pb));
}
- if (dry_run) {
+ if (dryRun) {
return 0;
}
// Perform the command
@@ -1987,7 +2010,7 @@ int perform_command(ProcessBuilder pb, List replacers, boolean showNor
// * when debugging
// * other circumstances?
// I could try printing always, to better understand this question.
- if (showNormalOutput || exitValue != 0 || debug_replacers || debug_process_output) {
+ if (showNormalOutput || exitValue != 0 || debugReplacers || debugProcessOutput) {
// Filter then print the output.
String output;
try {
@@ -1998,17 +2021,17 @@ int perform_command(ProcessBuilder pb, List replacers, boolean showNor
throw new Error("Exception getting process standard output");
}
- if (debug_replacers || debug_process_output) {
+ if (debugReplacers || debugProcessOutput) {
System.out.println("preoutput=<<<" + output + ">>>");
}
if (!output.equals("")) {
boolean noReplacement = false;
for (Replacer r : replacers) {
String printableRegexp = r.regexp.toString().replace("\r", "\\r").replace("\n", "\\n");
- if (debug_replacers) {
+ if (debugReplacers) {
System.out.println("midoutput_pre[" + printableRegexp + "]=<<<" + output + ">>>");
}
- String orig_output = output;
+ String origOutput = output;
// Don't loop, because some regexps will continue to match repeatedly
try {
output = r.replaceAll(output);
@@ -2019,19 +2042,18 @@ int perform_command(ProcessBuilder pb, List replacers, boolean showNor
System.out.println(" defaultDirectory = " + defaultDirectory);
System.out.println(" cmdLine = " + cmdLine);
System.out.println(" regexp = " + printableRegexp);
- System.out.println(
- " orig output (size " + orig_output.length() + ") = " + orig_output);
+ System.out.println(" orig output (size " + origOutput.length() + ") = " + origOutput);
System.out.println(" output (size " + output.length() + ") = " + output);
throw e;
}
- if (debug_replacers) {
+ if (debugReplacers) {
System.out.println("midoutput_post[" + printableRegexp + "]=<<<" + output + ">>>");
}
}
- if (debug_replacers || debug_process_output) {
+ if (debugReplacers || debugProcessOutput) {
System.out.println("postoutput=<<<" + output + ">>>");
}
- if (debug_replacers) {
+ if (debugReplacers) {
for (int i = 0; i < Math.min(100, output.length()); i++) {
System.out.println(
i + ": " + (int) output.charAt(i) + "\n \"" + output.charAt(i) + "\"");