[Svnmerge] Fwd: Svnmerge merge --summarize

[Archie Cobbs]

FYI... email sent from a non-subscriber...

---------- Forwarded message ----------
From: Mike Meyer <mwm at neosynapse.net>
To: svnmerge at orcaware.com
Date: Wed, 17 Oct 2007 15:55:47 -0400
Subject: Svnmerge merge --summarize
It was suggested I send this to the svnmerge list....

I tend to deal with merging changes from a handful of groups working
on the same project. For me, figuring out which files a change touches
is more important than the details of the change, as that will tell me
which group the change is from, and hence whether or not I need to pay
attention to it at this time.

The --diff option to avail is the right idea for this, but a bit to
much detail. So I've added the --summarize option to avail as well,
which just adds the "--summarize" option to the "svn diff" command
that --diff issues, giving me just the files list.

In hopes that others might find this useful, here's the patch.

   Thanks,
   <mike


Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 5713)
+++ svnmerge.py (revision 5815)
@@ -1091,7 +1091,12 @@
         for start,end in revs.normalized():
             svn_command('log --incremental -v -r %d:%d %s' % \
                         (start, end, source_url))
-    elif display_style == "diffs":
+    elif display_style in ("diffs", "summarize"):
+        if display_style == 'summarize':
+            summarize = '--summarize '
+        else:
+            summarize = ''
+
         for start, end in revs.normalized():
             print
             if start == end:
@@ -1103,7 +1108,8 @@

             # Note: the starting revision number to 'svn diff' is
             # NOT inclusive so we have to subtract one from ${START}.
-            svn_command("diff -r %d:%d %s" % (start - 1, end, source_url))
+            svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize,
+                                                 source_url))
     else:
         assert False, "unhandled display style: %s" % display_style

@@ -1849,6 +1855,10 @@
                value="diffs",
                default="revisions",
                help="show corresponding diff instead of revision list"),
+        Option("--summarize",
+               dest="avail-display",
+               value="summarize",
+               help="show summarized diff instead of revision list"),
         Option("-l", "--log",
                dest="avail-display",
                value="logs",



-- 
Archie L. Cobbs
CTO, Awarix, Inc.
http://www.awarix.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20071018/aa2ffd41/attachment.html>