Skip to content

Use local variables instead of recomputing #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mernst merged 2 commits into from
May 31, 2026
Merged

Use local variables instead of recomputing #514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afb609d
Use local variables instead of recomputing
mernst May 31, 2026
805fe9f
Fix formatting
mernst May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/main/java/org/plumelib/multiversioncontrol/MultiVersionControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,8 +1093,10 @@ static void addCheckoutCvs(File cvsDir, File parentDir, Set<Checkout> checkouts)

String pathInRepo = FilesPlume.readString(repositoryFile.toPath()).trim();
@NonNull File repoFileRoot = new File(pathInRepo);
while (repoFileRoot.getParentFile() != null) {
repoFileRoot = repoFileRoot.getParentFile();
for (File parent = repoFileRoot.getParentFile();
parent != null;
parent = repoFileRoot.getParentFile()) {
repoFileRoot = parent;
}

// strip common suffix off of local dir and repo url
Expand Down Expand Up @@ -1292,10 +1294,11 @@ static FilePair removeCommonSuffixDirs(File p1, File p2, File p2Limit, String p1
&& r2 != null
&& (p2Limit == null || !r2.equals(p2Limit))
&& r1.getName().equals(r2.getName())) {
if (p1Contains != null && !new File(r1.getParentFile(), p1Contains).isDirectory()) {
File r1Parent = r1.getParentFile();
if (p1Contains != null && !new File(r1Parent, p1Contains).isDirectory()) {
break;
}
r1 = r1.getParentFile();
r1 = r1Parent;
r2 = r2.getParentFile();
}
if (debug) {
Expand Down Expand Up @@ -1633,7 +1636,7 @@ public void process(Set<Checkout> checkouts) {
replacers.add(
new Replacer(
"(^|\\n)# Your branch is ahead of .*\\n",
"$1unpushed changesets: " + pb.directory() + "\n"));
"$1unpushed changesets: " + dir + "\n"));
replacers.add(new Replacer("(^|\\n)([?][?]) ", "$1$2 " + dir + "/"));
replacers.add(
new Replacer(
Expand All @@ -1643,7 +1646,7 @@ public void process(Set<Checkout> checkouts) {
replacers.add(
new Replacer(
"(^|\\n)# Your branch is behind .*\\n",
"$1unpushed changesets: " + pb.directory() + "\n"));
"$1unpushed changesets: " + dir + "\n"));

// Could remove all other output, but this could suppress messages
// replacers.add(new Replacer("(^|\\n)#.*\\n", "$1"));
Expand Down Expand Up @@ -1683,16 +1686,15 @@ public void process(Set<Checkout> checkouts) {
replacers.add(
new Replacer(
"^comparing with .*\\nsearching for changes\\nchangeset[^\001]*",
"unpushed changesets: " + pb.directory() + "\n"));
"unpushed changesets: " + dir + "\n"));
replacers.add(
new Replacer(
"^\\n?comparing with .*\\nsearching for changes\\nno changes found\n", ""));
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(
new Replacer("^(.*\\n)+", "shelved changes: " + pb.directory() + "\n"));
replacers3.add(new Replacer("^(.*\\n)+", "shelved changes: " + dir + "\n"));
}
case SVN -> {
// Handle some changes.
Expand Down