[tor-commits] [tor/master] Make findMergedChanges.pl print a usage msg when started with no args

[nickm at torproject.org]

commit 751e40805556fadec616aa79150f12e3bf87c46b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 29 15:26:19 2011 -0400

    Make findMergedChanges.pl print a usage msg when started with no args
    
    Otherwise I need to figure out what it does and how to make it do it
    every time I want to use it.  It did that unixy thing where running
    it with no arguments printed nothing and returned.
---
 contrib/findMergedChanges.pl |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl
index 1694716..460424f 100755
--- a/contrib/findMergedChanges.pl
+++ b/contrib/findMergedChanges.pl
@@ -16,6 +16,26 @@ sub nChanges {
 
 my $look_for_type = "merged";
 
+if (! @ARGV) {
+    print <<EOF
+Usage:
+   findMergedChanges.pl [--merged/--unmerged/--weird/--list] changes/*
+
+A change is "merged" if it has ever been merged to release-0.2.2 and it has had
+no subsequent changes in master.
+
+A change is "unmerged" if it has never been merged to release-0.2.2 and it
+has had changes in master.
+
+A change is "weird" if it has been merged to release-0.2.2 and it *has* had
+subsequent changes in master.
+
+Suggested application:
+   findMergedChanges.pl --merged changes/* | xargs -n 1 git rm
+
+EOF
+}
+
 while (@ARGV and $ARGV[0] =~ /^--/) {
     my $flag = shift @ARGV;
     if ($flag =~ /^--(weird|merged|unmerged|list)/) {