Fix ExtMerge pattern for tags and octopus branches

Fix the ExtMerge pattern to handle more merge subject forms:

 - Multiple branches from URL:
     Merge branches '...' and '...' of ...://...

 - Merging tags from URL:
     Merge tag '...' of ...://...
     Merge tags '...' and '...' of ...://...

 - Merging URL into specific branch:
     Merge ... of ...://... into ...

This allows treeplot to pick up many more external merges, especially in
recent releases, that would otherwise have been treated as internal
merges and often been accounted for in [No tree].

Signed-off-by: James Hogan <james.hogan@imgtec.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/patterns.py b/patterns.py
index 175ac3e..df56d6b 100644
--- a/patterns.py
+++ b/patterns.py
@@ -40,7 +40,7 @@ patterns = {
     #
     # Merges are described with a variety of lines.
     #
-    'ExtMerge': re.compile(r'^ +Merge( branch .* of)? ([^ ]+:[^ ]+)\n$'),
+    'ExtMerge': re.compile(r'^ +Merge( (branch|branches|tag|tags) .* of)? ([^ ]+:[^ ]+)( into .*)?\n$'),
     'IntMerge': re.compile(r'^ +(Merge|Pull) .* into .*$'),
     # PIntMerge2 = re.compile(r"^ +Merge branch(es)? '.*$"),
     'IntMerge2': re.compile(r"^ +Merge .*$"),
diff --git a/treeplot b/treeplot
index 616d7da..c4cec87 100755
--- a/treeplot
+++ b/treeplot
@@ -178,7 +178,7 @@ def GetCommit():
         #
         m = patterns['ExtMerge'].match(line)
         if m:
-            merge.addtree(LookupTree(m.group(2)))
+            merge.addtree(LookupTree(m.group(3)))
             return merge
         #
         # OK, maybe it's internal