]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Enhance findMergedChanges to allow looking at non-release targets
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Jul 2011 16:43:39 +0000 (12:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Jul 2011 16:43:39 +0000 (12:43 -0400)
contrib/findMergedChanges.pl

index 460424f309a2597fe304226661371d0aa769664a..46e070f943e8e1f8a1142c511bfb0bcc098a92fb 100755 (executable)
@@ -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) {