469,645 Members | 1,702 Online
Bytes | Developer Community
New Post

Home Posts Topics Members FAQ

Post your question to a community of 469,645 developers. It's quick & easy.

Noob script needs some input: CVS PatchMaker

I needed a tool for extracting patches from CVS based on the log
messages. I.e. we mark our fixes and features with a "Bugdb XYZ"
And sometimes you need to move a fix/feature to another branch or maybe
you just want to inspect exactly what changes were related to a
specific bugdb issue.

Now I've searched hi and low for this and I now it's out there
somewhere bleeding obvious - can't imagine I'm the first to have this
thought. I just haven't been able to find it...
Well, that was an excellent opportunity to get some python practice, so
below is my first shot at the problem.

Any feedback on what would be "the pythonic way" to do this would be
much appreciated!

Usage:
cd myproject
patchmaker <regxpr>

Ouput is a diff of involved files+revs
Thank you,
/Holger
----------------------------------------------------------------------------------------------------------------------
#!/usr/bin/env python
# Copyright 2006 Holger Lindeberg Bille

import sys, re, os
import popen2

workingfile = re.compile("^Working file: *(.*)$")
revision = re.compile("^revision *(.*)$")
fileend =
re.compile("^===================================== ======================================")
details = re.compile("^date: *")
entryend = re.compile("^----------------------------")
branches = re.compile("^branches:( *(.*);)*")

class LogEntry:
def __init__(self):
self.rev = 0
self.prevrev = 0
self.text = []

def setName(self, name):
self.name = name

def read(self, file):
done = 0
for line in file:
regx = details.search(line)
if regx:
pass
else:
if entryend.search(line):
break
else:
if fileend.search(line):
done = 1
break
else:
self.text.append(line.strip())
return done

def GuessPrevRev(self):
pass

def filter(self, filter):
found = 0
for line in self.text:
if filter.search(line):
found = 1
break
return found

def calcPrevRev(self):
# todo: get this from CVS instead of guessing
self.rev = "1.1"
self.prevrev = "1.1"
ver = self.name.split(".")
n = int(ver.pop()) - 1
while len(ver) >= 1:
if n >= 1:
ver.append(str(n))
self.prevrev = ".".join(ver)
self.rev = self.name
break
else:
ver.pop() # throw this away
n = int(ver.pop())

def patchDump(self, file):
cmd = "cvs -q diff -u -b -r %s -r %s %s" % (self.prevrev,
self.rev, file)
# print cmd
outp, inp = popen2.popen2(cmd)
for line in outp:
print line,
outp.close()
inp.close()

def dump(self):
print "------------------------------------------"
print "rev = %s" % self.name
for line in self.text:
print line
class FileLog:
def __init__(self):
self.revs = []

def setName(self, name):
self.name = name

def read(self, file):
for line in file:
regx = revision.search(line)
if regx:
rev = LogEntry()
rev.setName(regx.group(1))
done = rev.read(file)
self.revs.append(rev)
if done:
break

def filter(self, filter):
found = 0
newrevs = []
for rev in self.revs:
if rev.filter(filter):
found = 1
newrevs.append(rev)
self.revs = newrevs
return found

def calcPrevRev(self):
for rev in self.revs:
rev.calcPrevRev()

def patchDump(self):
for rev in self.revs:
rev.patchDump(self.name)

def dump(self):
print "File = %s" % self.name
print "No. of revs %d" % len(self.revs)
for rev in self.revs:
rev.dump()
print "============================================= =="

class LogDB:
def __init__(self):
self.flogs = []

def read(self):
outp, inp = popen2.popen2('cvs -q log -N')
found = 0
for line in outp:
regx = workingfile.search(line)
if regx:
flog = FileLog()
flog.setName(regx.group(1))
flog.read(outp)
self.flogs.append(flog)
outp.close()
inp.close()

def filter(self, filter):
newflogs = []
for flog in self.flogs:
if flog.filter(filter):
newflogs.append(flog)
self.flogs = newflogs

def calcPrevRev(self):
for flog in self.flogs:
flog.calcPrevRev()

def patchDump(self):
for flog in self.flogs:
flog.patchDump()

def dump(self):
print "Starting dump"
print "============================================= =="
for flog in self.flogs:
flog.dump()

if len(sys.argv) != 2:
sys.stderr.write("wrong number of args")
sys.exit()
a = sys.argv[1]
a.encode('latin-1')
#print "arg = %s" % a
db = LogDB()
db.read()
#db.dump()
myfilter = re.compile(a)
db.filter(myfilter)
#db.dump()
db.calcPrevRev()
db.patchDump()

Jun 16 '06 #1
2 1124
On 16/06/2006 7:28 PM, Holger wrote:
Well, that was an excellent opportunity to get some python practice, so
below is my first shot at the problem.

Any feedback on what would be "the pythonic way" to do this would be
much appreciated!
#!/usr/bin/env python
# Copyright 2006 Holger Lindeberg Bille

import sys, re, os
import popen2

workingfile = re.compile("^Working file: *(.*)$")
revision = re.compile("^revision *(.*)$")
fileend =
re.compile("^===================================== ======================================")
details = re.compile("^date: *")
entryend = re.compile("^----------------------------")
branches = re.compile("^branches:( *(.*);)*")

class LogEntry:
def __init__(self):
self.rev = 0
self.prevrev = 0
self.text = []

def setName(self, name):
self.name = name

def read(self, file):
done = 0
for line in file:
regx = details.search(line)
if regx:
pass
else:
if entryend.search(line):
break
else:
if fileend.search(line):
done = 1
break
else:
self.text.append(line.strip())
return done
IMHO that flight of geese heading equatorwards for winter is not Xic for
any language X. Compare with:
| def read(self, file):
| done = 0
| for line in file:
| regx = details.search(line)
| if regx:
| pass
| elif entryend.search(line):
| break
| elif fileend.search(line):
| done = 1
| break
| else:
| self.text.append(line.strip())
| return done

2nd comment: Make a habit of NOT using the names of built-ins like
"file" for your own names. Pretend they are reserved words. Doesn't
matter in this case, but will save you grief some day soon.

3rd comment: Read the section in the re manual that explains the
difference between search and match. Searching for "^foo" will give the
same results as using match() with "foo" or the redundantly anchored
"^foo". However some regex engines when presented with
re.search("^foo", "x" * 10000)
will note that there is no joy at offset 0, there is no point (given the
anchor "^") of looking at offset 1, and return almost immediately.
Others (cough, cough) will check at offset 1, 2, ...
Ponder these results:

python -mtimeit -s"import re;rx=re.compile('^foo');txt='x'*10000"
"rx.match(txt)"
100000 loops, best of 3: 1.2 usec per loop

python -mtimeit -s"import re;rx=re.compile('foo');txt='x'*10000" "
rx.search(txt)"
10000 loops, best of 3: 19.8 usec per loop

python -mtimeit -s"import re;rx=re.compile('^foo');txt='x'*10000"
"rx.search(txt)"
1000 loops, best of 3: 201 usec per loop

4th comment: what you have called "regx" is a match object. "mobj" might
be a better choice. The term "regex" is applied to a pattern, or
sometimes to the compiled re object.
def GuessPrevRev(self):
pass

def filter(self, filter):
Ugh. THREE filters: the built-in, the argument, and the method.
In any case, this method doesn't perform a filtering operation, and the
arg is not a filter, it's an re pattern. Suggestion:
def anyLinesMatch(self, pattern):
found = 0
for line in self.text:
if filter.search(line):
found = 1
break
return found
[snip]
class FileLog:
def __init__(self):
self.revs = []
[snip]
def filter(self, filter):
found = 0
newrevs = []
for rev in self.revs:
if rev.filter(filter):
Waahhh! The filter count has now hit 4.
found = 1
newrevs.append(rev)
self.revs = newrevs
return found
[snip]

class LogDB:
def __init__(self):
self.flogs = [] [snip] def filter(self, filter):
newflogs = []
for flog in self.flogs:
if flog.filter(filter): See above. newflogs.append(flog)
self.flogs = newflogs

[snip]

HTH,
John
Jun 17 '06 #2

John Machin wrote:
Any feedback on what would be "the pythonic way" to do this would be
much appreciated!
--snip--
IMHO that flight of geese heading equatorwards for winter is not Xic for
any language X. Compare with:
He he, good point.
2nd comment: Make a habit of NOT using the names of built-ins like
"file" for your own names. Pretend they are reserved words. Doesn't
matter in this case, but will save you grief some day soon.

Agree.
3rd comment: Read the section in the re manual that explains the
difference between search and match. Searching for "^foo" will give the
same results as using match() with "foo" or the redundantly anchored
"^foo". However some regex engines when presented with
Good point.
4th comment: what you have called "regx" is a match object. "mobj" might
be a better choice. The term "regex" is applied to a pattern, or
sometimes to the compiled re object. ]
HTH,
John


Thank you for taking the time :-)
All points are noted.

Holger,

Jun 19 '06 #3

This discussion thread is closed

Replies have been disabled for this discussion.

Similar topics

2 posts views Thread by Rtritell | last post: by
4 posts views Thread by areese801 | last post: by
1 post views Thread by henry | last post: by
3 posts views Thread by Mr. Roper | last post: by
By using this site, you agree to our Privacy Policy and Terms of Use.