nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance findMergedChanges to allow looking at non-release targets

Browse Source
This commit is contained in:
Nick Mathewson 2011-07-18 12:43:39 -04:00
parent be5aa47b55
commit bb105ef1f6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/findMergedChanges.pl
View File

@ -36,18 +36,22 @@ Suggested application:
EOF
}
my $target_branch = "origin/release-0.2.2";
while (@ARGV and $ARGV[0] =~ /^--/) {
my $flag = shift @ARGV;
if ($flag =~ /^--(weird|merged|unmerged|list)/) {
$look_for_type = $1;
} elsif ($flag =~ /^--branch=(\S+)/) {
$target_branch = $1;
} else {
die "Unrecognized flag $flag";
}
}
for my $changefile (@ARGV) {
my $n_merged = nChanges("origin/release-0.2.2", $changefile);
my $n_postmerged = nChanges("origin/release-0.2.2..origin/master", $changefile);
my $n_merged = nChanges($target_branch, $changefile);
my $n_postmerged = nChanges("${target_branch}..origin/master", $changefile);
my $type;
if ($n_merged != 0 and $n_postmerged == 0) {