##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.

File last commit:

r1072:68e9cdaf
r1890:c3323314 merge
Show More
update_revnum.py
23 lines | 569 B | text/x-python | PythonLexer
#!/usr/bin/env python
""" Change the revision number in Release.py """
import os
import re,pprint
def verinfo():
out = os.popen('bzr version-info')
pairs = (l.split(':',1) for l in out)
d = dict(((k,v.strip()) for (k,v) in pairs))
return d
ver = verinfo()
pprint.pprint(ver)
rfile = open('../IPython/Release.py','rb').read()
newcont = re.sub(r'revision\s*=.*', "revision = '%s'" % ver['revno'], rfile)
newcont = re.sub(r'^branch\s*=[^=].*', "branch = '%s'" % ver['branch-nick'], newcont )
open('../IPython/Release.py','wb').write(newcont)