torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite documentation on primary branch usage for Tor.git.

Browse Source 
This patch is part of a series of patches where we try to change our
primary branch name of tor.git from master to main.

See: tpo/core/team#2
This commit is contained in:
Alexander Færøy
2021-05-25 11:33:58 +00:00
parent e247aab4ec
commit 8d4bbc337b
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/maint/findMergedChanges.pl
+12 -12
View File
@@ -9,7 +9,7 @@ sub nChanges {
# requires perl 5.8. Avoids shell issues if we ever get a changes
# file named by the parents of Little Johnny Tables.
open F, "-|", "git", "log", "--no-merges", "--pretty=format:%H", $branches, "--", $fname
or die "$!";
or die "$!";
my @changes = <F>;
return scalar @changes
}
@@ -22,13 +22,13 @@ Usage:
findMergedChanges.pl [--merged/--unmerged/--weird/--list] [--branch=<branchname] [--head=<branchname>] changes/*
A change is "merged" if it has ever been merged to release-0.2.4 and it has had
no subsequent changes in master.
no subsequent changes in main.
A change is "unmerged" if it has never been merged to release-0.2.4 and it
has had changes in master.
has had changes in main.
A change is "weird" if it has been merged to release-0.2.4 and it *has* had
subsequent changes in master.
subsequent changes in main.
Suggested application:
findMergedChanges.pl --merged changes/* | xargs -n 1 git rm
@@ -37,18 +37,18 @@ EOF
}
my $target_branch = "origin/release-0.2.4";
my $head = "origin/master";
my $head = "origin/main";
while (@ARGV and $ARGV[0] =~ /^--/) {
my $flag = shift @ARGV;
if ($flag =~ /^--(weird|merged|unmerged|list)/) {
$look_for_type = $1;
$look_for_type = $1;
} elsif ($flag =~ /^--branch=(\S+)/) {
$target_branch = $1;
} elsif ($flag =~ /^--head=(\S+)/) {
$head = $1;
} else {
die "Unrecognized flag $flag";
die "Unrecognized flag $flag";
}
}
@@ -58,16 +58,16 @@ for my $changefile (@ARGV) {
my $type;
if ($n_merged != 0 and $n_postmerged == 0) {
$type = "merged";
$type = "merged";
} elsif ($n_merged == 0 and $n_postmerged != 0) {
$type = "unmerged";
$type = "unmerged";
} else {
$type = "weird";
$type = "weird";
}
if ($type eq $look_for_type) {
print "$changefile\n";
print "$changefile\n";
} elsif ($look_for_type eq 'list') {
printf "% 8s: %s\n", $type, $changefile;
printf "% 8s: %s\n", $type, $changefile;
}
}