# for parsing module spec name:branch
- matcher_branch_spec=re.compile("\A(?P<name>[\w-]+):(?P<branch>[\w\.-]+)\Z")
+ matcher_branch_spec=re.compile("\A(?P<name>[\w\.-]+):(?P<branch>[\w\.-]+)\Z")
# special form for tagged module - for Build
matcher_tag_spec=re.compile("\A(?P<name>[\w-]+)@(?P<tagname>[\w\.-]+)\Z")
# parsing specfiles
if os.path.isfile (attempt):
return attempt
else:
+ pattern="%s/*.spec"%self.edge_dir()
try:
- return glob("%s/*.spec"%self.edge_dir())[0]
+ return glob(pattern)[0]
except:
- raise Exception, 'Cannot guess specfile for module %s'%self.name
+ raise Exception, 'Cannot guess specfile for module %s -- pattern was %s'%(self.name,pattern)
def all_specnames (self):
return glob("%s/*.spec"%self.edge_dir())
def unignored_lines (self, logfile):
result=[]
- exclude="Tagging module %s"%self.name
+ exclude="Setting tag %s"%self.name
white_line_matcher = re.compile("\A\s*\Z")
for logline in file(logfile).readlines():
if logline.strip() == Module.svn_magic_line:
# brute-force : change uncommented lines that define <module>-SVNPATH
else:
if self.options.verbose:
- print 'Setting %s-SVNPATH for using %s\n\tin %s .. '%(self.name,newname,tagsfile),
- pattern="\A\s*%s-SVNPATH\s*(=|:=)\s*(?P<url_main>[^\s]+)/%s/[^\s]+"\
- %(self.name,self.name)
+ print 'Searching for -SVNPATH lines referring to /%s/\n\tin %s .. '%(self.name,tagsfile),
+ pattern="\A\s*(?P<make_name>[^\s]+)-SVNPATH\s*(=|:=)\s*(?P<url_main>[^\s]+)/%s/[^\s]+"\
+ %(self.name)
matcher_module=re.compile(pattern)
for line in tags.readlines():
attempt=matcher_module.match(line)
if attempt:
- svnpath="%s-SVNPATH"%self.name
+ svnpath="%s-SVNPATH"%(attempt.group('make_name'))
+ if self.options.verbose:
+ print ' '+svnpath,
replacement = "%-32s:= %s/%s/tags/%s\n"%(svnpath,attempt.group('url_main'),self.name,newname)
new.write(replacement)
matches += 1
# so we can provide useful information, such as version numbers and diff
# in the same file
changelog="/tmp/%s-%d.txt"%(self.name,os.getpid())
- file(changelog,"w").write("""Tagging module %s - %s
+ file(changelog,"w").write("""Setting tag %s
%s
Please write a changelog for this new tag in the section above
-"""%(self.name,new_tag_name,Module.svn_magic_line))
+"""%(new_tag_name,Module.svn_magic_line))
if not self.options.verbose or prompt('Want to see diffs while writing changelog',True):
file(changelog,"a").write('DIFF=========\n' + diff_output)
# do this before anything else and restore .branch to None,
# as this is part of the class's logic
new_trunk_name=None
- if self.branch:
+ if hasattr(self,'branch'):
new_trunk_name=self.branch
- self.branch=None
+ del self.branch
+ elif self.options.new_version:
+ new_trunk_name = self.options.new_version
# compute diff - a way to initialize the whole stuff
# do_diff already does edge_dir initialization
class Build (Module):
- def __init__ (self, buildtag,options):
- self.buildtag=buildtag
- Module.__init__(self,"build@%s"%buildtag,options)
-
# we cannot get build's svnpath as for other packages as we'd get something in svn+ssh
# xxx quick & dirty
- def get_svnpath (self):
- self.svnpath="http://svn.planet-lab.org/svn/build/tags/%s"%self.buildtag
+ def __init__ (self, buildtag,options):
+ self.buildtag=buildtag
+ # if the buildtag start with a : (to use a branch rather than a tag)
+ if buildtag.find(':') == 0 :
+ module_name="build%(buildtag)s"%locals()
+ self.display=buildtag[1:]
+ self.svnpath="http://svn.planet-lab.org/svn/build/branches/%s"%self.display
+ else :
+ module_name="build@%(buildtag)s"%locals()
+ self.display=buildtag
+ self.svnpath="http://svn.planet-lab.org/svn/build/tags/%s"%self.buildtag
+ Module.__init__(self,module_name,options)
@staticmethod
def get_distro_from_distrotag (distrotag):
print "----"
print "----"
print "----"
- print "= build tag %s to %s = #build-%s"%(buildtag_old,buildtag_new,buildtag_new)
(build_new,build_old) = (Build (buildtag_new,options), Build (buildtag_old,options))
+ print "= build tag %s to %s = #build-%s"%(build_old.display,build_new.display,build_new.display)
for b in (build_new,build_old):
b.init_module_dir()
b.init_edge_dir()
b.update_edge_dir()
- b.get_svnpath()
# find out the tags files that are common, unless option was specified
if options.distrotags:
distrotags=options.distrotags
first_distrotag=False
else:
print '----'
- print '== distro %s (%s to %s) == #distro-%s-%s'%(distrotag,buildtag_old,buildtag_new,distro,buildtag_new)
+ print '== distro %s (%s to %s) == #distro-%s-%s'%(distrotag,build_old.display,build_new.display,distro,build_new.display)
print ' * from %s/%s'%(build_old.svnpath,distrotag)
print ' * to %s/%s'%(build_new.svnpath,distrotag)
# parse make packages
packages_new=build_new.get_packages(distrotag)
pnames_new=set(packages_new.keys())
- if options.verbose: print 'got packages for ',buildtag_new
+ if options.verbose: print 'got packages for ',build_new.display
packages_old=build_old.get_packages(distrotag)
pnames_old=set(packages_old.keys())
- if options.verbose: print 'got packages for ',buildtag_old
+ if options.verbose: print 'got packages for ',build_old.display
# get created, deprecated, and preserved package names
pnames_created = list(pnames_new-pnames_old)
# display created and deprecated
for name in pnames_created:
- print '=== %s : new package %s -- appeared in %s === #package-%s-%s-%s'%(distrotag,name,buildtag_new,name,distro,buildtag_new)
+ print '=== %s : new package %s -- appeared in %s === #package-%s-%s-%s'%(
+ distrotag,name,build_new.display,name,distro,build_new.display)
pobj=packages_new[name]
print ' * %s'%pobj.details()
for name in pnames_deprecated:
- print '=== %s : package %s -- deprecated, last occurrence in %s === #package-%s-%s-%s'%(distrotag,name,buildtag_old,name,distro,buildtag_new)
+ print '=== %s : package %s -- deprecated, last occurrence in %s === #package-%s-%s-%s'%(
+ distrotag,name,build_old.display,name,distro,build_new.display)
pobj=packages_old[name]
if not pobj.svnpath:
print ' * codebase stored in CVS, specfile is %s'%pobj.spec
if options.verbose: print 'got diff from cache'
if not specdiff:
continue
- print '=== %s - %s to %s : package %s === #package-%s-%s-%s'%(distrotag,buildtag_old,buildtag_new,name,name,distro,buildtag_new)
+ print '=== %s - %s to %s : package %s === #package-%s-%s-%s'%(
+ distrotag,build_old.display,build_new.display,name,name,distro,build_new.display)
print ' * from %s to %s'%(pobj_old.details(),pobj_new.details())
trac_diff_url=pobj_old.trac_full_diff(pobj_new)
if trac_diff_url:
"""
release_usage="""Usage: %prog [options] tag1 .. tagn
Extract release notes from the changes in specfiles between several build tags, latest first
+ Examples:
+ release-changelog 4.2-rc25 4.2-rc24 4.2-rc23 4.2-rc22
+ You can refer to a (build) branch by prepending a colon, like in
+ release-changelog :4.2 4.2-rc25
"""
common_usage="""More help:
see http://svn.planet-lab.org/wiki/ModuleTools"""
parser.add_option("-u","--url", action="store_true", dest="show_urls", default=False,
help="display URLs")
+ default_modules_list=os.path.dirname(sys.argv[0])+"/modules.list"
if mode not in Main.release_modes:
- all_modules=os.path.dirname(sys.argv[0])+"/modules.list"
parser.add_option("-a","--all",action="store_true",dest="all_modules",default=False,
- help="run on all modules as found in %s"%all_modules)
+ help="run on all modules as found in %s"%default_modules_list)
+ parser.add_option("-f","--file",action="store",dest="modules_list",default=None,
+ help="run on all modules found in specified file")
else:
parser.add_option("-n","--dry-run",action="store_true",dest="dry_run",default=False,
help="dry run - shell commands are only displayed")
default="%s/%s"%(os.getenv("HOME"),"modules"),
help="""name for dedicated working dir - defaults to ~/modules
** THIS MUST NOT ** be your usual working directory""")
- parser.add_option("-f","--fast-checks",action="store_true",dest="fast_checks",default=False,
+ parser.add_option("-F","--fast-checks",action="store_true",dest="fast_checks",default=False,
help="skip safety checks, such as svn updates -- use with care")
# default verbosity depending on function - temp
parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
help="run in verbose mode")
else:
- parser.add_parser("-q","--quiet", action="store_false", dest="verbose", default=True,
+ parser.add_option("-q","--quiet", action="store_false", dest="verbose", default=True,
help="run in quiet (non-verbose) mode")
# parser.add_option("-d","--debug", action="store_true", dest="debug", default=False,
# help="debug mode - mostly more verbose")
########## module-*
if len(args) == 0:
if options.all_modules:
- args=Command("grep -v '#' %s"%all_modules,options).output_of().split()
+ options.modules_list=default_modules_list
+ if options.modules_list:
+ args=Command("grep -v '#' %s"%options.modules_list,options).output_of().split()
else:
parser.print_help()
sys.exit(1)
git://git.onelab.eu / build.git / blobdiff