From: Jonathan Corbet <corbet@lwn.net>
Date: Tue, 13 Dec 2011 19:21:18 +0000 (-0700)
Subject: Fix up pattern use in treeplot
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0cc9c05b3aab01488078d39859f640c25bc54d3e;p=people%2Flarsk%2Fxenproject-org-gitdm.git

Fix up pattern use in treeplot

The utility as a whole is still somewhat on the fragile side, though.
---

diff --git a/treeplot b/treeplot
index 3e128be..616d7da 100755
--- a/treeplot
+++ b/treeplot
@@ -11,7 +11,7 @@
 # Public License, version 2.
 #
 import sys
-import patterns
+from patterns import patterns
 
 #
 # The various types of commit we understand.
@@ -141,7 +141,7 @@ def GetCommit():
         line = GetLine()
         if not line:
             return None
-        m = patterns.Pcommit.match(line)
+        m = patterns['commit'].match(line)
         if m:
             break
 
@@ -176,18 +176,18 @@ def GetCommit():
         #
         # Maybe it's an external merge?
         #
-        m = patterns.PExtMerge.match(line)
+        m = patterns['ExtMerge'].match(line)
         if m:
             merge.addtree(LookupTree(m.group(2)))
             return merge
         #
         # OK, maybe it's internal
         #
-        if patterns.PIntMerge.match(line) or patterns.PIntMerge2.match(line):
+        if patterns['IntMerge'].match(line) or patterns['IntMerge2'].match(line):
             #print 'Internal:', line[:-1]
             merge.internal = 1
             return merge
-        m = patterns.Pcommit.match(line)
+        m = patterns['commit'].match(line)
         if m:
             print 'Hit next commit (%s) looking for merge line' % (m.group(1))
             SaveLine(line)