Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix up pattern use in treeplot

The utility as a whole is still somewhat on the fragile side, though.
  • Loading branch information...
commit 0cc9c05b3aab01488078d39859f640c25bc54d3e 1 parent 6dace6e
Jonathan Corbet authored

Showing 1 changed file with 5 additions and 5 deletions. Show diff stats Hide diff stats

  1. +5 5 treeplot
10 treeplot
@@ -11,7 +11,7 @@
11 11 # Public License, version 2.
12 12 #
13 13 import sys
14   -import patterns
  14 +from patterns import patterns
15 15
16 16 #
17 17 # The various types of commit we understand.
@@ -141,7 +141,7 @@ def GetCommit():
141 141 line = GetLine()
142 142 if not line:
143 143 return None
144   - m = patterns.Pcommit.match(line)
  144 + m = patterns['commit'].match(line)
145 145 if m:
146 146 break
147 147
@@ -176,18 +176,18 @@ def GetCommit():
176 176 #
177 177 # Maybe it's an external merge?
178 178 #
179   - m = patterns.PExtMerge.match(line)
  179 + m = patterns['ExtMerge'].match(line)
180 180 if m:
181 181 merge.addtree(LookupTree(m.group(2)))
182 182 return merge
183 183 #
184 184 # OK, maybe it's internal
185 185 #
186   - if patterns.PIntMerge.match(line) or patterns.PIntMerge2.match(line):
  186 + if patterns['IntMerge'].match(line) or patterns['IntMerge2'].match(line):
187 187 #print 'Internal:', line[:-1]
188 188 merge.internal = 1
189 189 return merge
190   - m = patterns.Pcommit.match(line)
  190 + m = patterns['commit'].match(line)
191 191 if m:
192 192 print 'Hit next commit (%s) looking for merge line' % (m.group(1))
193 193 SaveLine(line)

0 comments on commit 0cc9c05

Please sign in to comment.
Something went wrong with that request. Please try again.