From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 Jul 2011 16:43:39 +0000 (-0400)
Subject: Enhance findMergedChanges to allow looking at non-release targets
X-Git-Tag: tor-0.2.3.2-alpha~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb105ef1f604720f50466d0b375a73c3927dd010;p=thirdparty%2Ftor.git

Enhance findMergedChanges to allow looking at non-release targets
---

diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl
index 460424f309..46e070f943 100755
--- a/contrib/findMergedChanges.pl
+++ b/contrib/findMergedChanges.pl
@@ -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) {