# support for tagged module is minimal, and is for the Build class only
class Module:
- svn_magic_line="--This line, and those below, will be ignored--"
+ edit_magic_line="--This line, and those below, will be ignored--"
setting_tag_format = "Setting tag %s"
redirectors=[ # ('module_name_varname','name'),
result=[]
white_line_matcher = re.compile("\A\s*\Z")
for logline in file(logfile).readlines():
- if logline.strip() == Module.svn_magic_line:
+ if logline.strip() == Module.edit_magic_line:
break
elif white_line_matcher.match(logline):
continue
return result
# creates a copy of the input with only the unignored lines
- def stripped_magic_line_filename (self, filein, fileout ,new_tag_name):
+ def strip_magic_line_filename (self, filein, fileout ,new_tag_name):
f=file(fileout,'w')
f.write(self.setting_tag_format%new_tag_name + '\n')
for line in self.unignored_lines(filein):
f.write(line)
f.close()
- def insert_changelog (self, logfile, oldtag, newtag):
+ def insert_changelog (self, logfile, newtag):
for specfile in self.all_specnames():
newspecfile=specfile+".new"
if self.options.verbose:
return "%s-%s" % (base_tag_name, self.last_tag(spec_dict))
+ pattern_format="\A\s*%(module)s-(SVNPATH|GITPATH)\s*(=|:=)\s*(?P<url_main>[^\s]+)/%(module)s[^\s]+"
+
+ def is_mentioned_in_tagsfile (self, tagsfile):
+ # so that %(module)s gets replaced from format
+ module=self.name
+ module_matcher = re.compile(Module.pattern_format % locals())
+ with open(tagsfile) as f:
+ for line in f.readlines():
+ if module_matcher.match(line): return True
+ return False
+
##############################
# using fine_grain means replacing only those instances that currently refer to this tag
# otherwise, <module>-{SVNPATH,GITPATH} is replaced unconditionnally
else:
if self.options.verbose:
print 'Searching for -SVNPATH or -GITPATH lines referring to /%s/\n\tin %s .. '%(self.pathname,tagsfile),
- pattern="\A\s*%s-(SVNPATH|GITPATH)\s*(=|:=)\s*(?P<url_main>[^\s]+)/%s[^\s]+"\
- %(self.name,self.name)
- matcher_module=re.compile(pattern)
+ # so that %(module)s gets replaced from format
+ module=self.name
+ module_matcher=re.compile(Module.pattern_format % locals())
for line in tags.readlines():
- attempt=matcher_module.match(line)
+ attempt=module_matcher.match(line)
if attempt:
if line.find("-GITPATH") >= 0:
modulepath = "%s-GITPATH"%self.name
spec_dict = self.spec_dict()
self.show_dict(spec_dict)
- # side effects
- old_tag_name = self.tag_name(spec_dict)
- old_svn_tag_name = self.tag_name(spec_dict, old_svn_name=True)
+ # compute previous tag - if not bypassed
+ if not self.options.bypass:
+ old_tag_name = self.tag_name(spec_dict)
+ # sanity check
+ old_tag_name = self.check_tag(old_tag_name, need_it=True)
if (self.options.new_version):
# new version set on command line
spec_dict[self.module_taglevel_varname] = new_taglevel
new_tag_name = self.tag_name(spec_dict)
-
# sanity check
- old_tag_name = self.check_tag(old_tag_name, need_it=True, old_svn_tag_name=old_svn_tag_name)
new_tag_name = self.check_tag(new_tag_name, need_it=False)
# checking for diffs
- diff_output = self.repository.diff_with_tag(old_tag_name)
- if len(diff_output) == 0:
- if not prompt ("No pending difference in module %s, want to tag anyway"%self.pathname,False):
- return
+ if not self.options.bypass:
+ diff_output = self.repository.diff_with_tag(old_tag_name)
+ if len(diff_output) == 0:
+ if not prompt ("No pending difference in module %s, want to tag anyway"%self.pathname,False):
+ return
# side effect in head's specfile
self.patch_spec_var(spec_dict)
# prepare changelog file
- # we use the standard subversion magic string (see svn_magic_line)
+ # we use the standard subversion magic string (see edit_magic_line)
# so we can provide useful information, such as version numbers and diff
# in the same file
- changelog="/tmp/%s-%d.edit"%(self.name,os.getpid())
- changelog_svn="/tmp/%s-%d.svn"%(self.name,os.getpid())
+ changelog_plain="/tmp/%s-%d.edit"%(self.name,os.getpid())
+ changelog_strip="/tmp/%s-%d.strip"%(self.name,os.getpid())
setting_tag_line=Module.setting_tag_format%new_tag_name
- file(changelog,"w").write("""
+ file(changelog_plain,"w").write("""
%s
%s
-Please write a changelog for this new tag in the section above
-"""%(Module.svn_magic_line,setting_tag_line))
+Please write a changelog for this new tag in the section below
+"""%(Module.edit_magic_line,setting_tag_line))
- if not self.options.verbose or prompt('Want to see diffs while writing changelog',True):
- file(changelog,"a").write('DIFF=========\n' + diff_output)
+ if self.options.bypass:
+ pass
+ elif prompt('Want to see diffs while writing changelog',True):
+ file(changelog_plain,"a").write('DIFF=========\n' + diff_output)
if self.options.debug:
prompt('Proceed ?')
# edit it
- self.run("%s %s"%(self.options.editor,changelog))
+ self.run("%s %s"%(self.options.editor,changelog_plain))
# strip magic line in second file - looks like svn has changed its magic line with 1.6
# so we do the job ourselves
- self.stripped_magic_line_filename(changelog,changelog_svn,new_tag_name)
+ self.strip_magic_line_filename(changelog_plain,changelog_strip,new_tag_name)
# insert changelog in spec
if self.options.changelog:
- self.insert_changelog (changelog,old_tag_name,new_tag_name)
+ self.insert_changelog (changelog_plain,new_tag_name)
## update build
build_path = os.path.join(self.options.workdir,
default_answer = 'y'
tagsfiles.sort()
while True:
+ # do not bother if in bypass mode
+ if self.options.bypass: break
for tagsfile in tagsfiles:
+ if not self.is_mentioned_in_tagsfile (tagsfile):
+ if self.options.verbose: print "tagsfile %s does not mention %s - skipped"%(tagsfile,self.name)
+ continue
status=tagsdict[tagsfile]
basename=os.path.basename(tagsfile)
print ".................... Dealing with %s"%basename
build.commit(log)
self.run_prompt("Review module and build", diff_all_changes)
- self.run_prompt("Commit module and build", commit_all_changes, changelog_svn)
- self.run_prompt("Create tag", self.repository.tag, new_tag_name, changelog_svn)
+ self.run_prompt("Commit module and build", commit_all_changes, changelog_strip)
+ self.run_prompt("Create tag", self.repository.tag, new_tag_name, changelog_strip)
if self.options.debug:
- print 'Preserving',changelog,'and stripped',changelog_svn
+ print 'Preserving',changelog_plain,'and stripped',changelog_strip
else:
- os.unlink(changelog)
- os.unlink(changelog_svn)
+ os.unlink(changelog_plain)
+ os.unlink(changelog_strip)
##############################
def release_changelog(options, buildtag_old, buildtag_new):
- try:
- tagfile = options.distrotags[0]
- if not tagfile: raise
- except:
- print "ERROR: provide a tagfile name (eg. onelab, onelab-k27, planetlab)"
- return
- # mmh, sounds wrong to blindly add the extension
- # if in a build directory, guess from existing files
- if os.path.isfile (tagfile):
- pass
- elif os.path.isfile ("%s-tags.mk" % tagfile):
- tagfile="%s-tags.mk" % tagfile
+ # the command line expects new old, so we treat the tagfiles in the same order
+ nb_tags=len(options.distrotags)
+ if nb_tags==1:
+ tagfile_new=tagfile_old=options.distrotags[0]
+ elif nb_tags==2:
+ [tagfile_new,tagfile_old]=options.distrotags
else:
- tagfile = "%s-tags.mk" % tagfile
-
+ print "ERROR: provide one or two tagfile name (eg. onelab-k32-tags.mk)"
+ print "two tagfiles can be mentioned when a tagfile has been renamed"
+ return
+
+ if options.dry_run:
+ print "------------------------------ Computing Changelog from"
+ print "buildtag_old",buildtag_old,"tagfile_old",tagfile_old
+ print "buildtag_new",buildtag_new,"tagfile_new",tagfile_new
+ return
+
print '----'
print '----'
print '----'
print '= build tag %s to %s =' % (buildtag_old, buildtag_new)
- print '== distro %s (%s to %s) ==' % (tagfile, buildtag_old, buildtag_new)
+ print '== distro %s (%s to %s) ==' % (tagfile_new, buildtag_old, buildtag_new)
build = Build("build@%s" % buildtag_old, options)
build.init_module_dir()
- first = build.get_modules(tagfile)
+ first = build.get_modules(tagfile_old)
print ' * from', buildtag_old, build.repository.gitweb()
build = Build("build@%s" % buildtag_new, options)
build.init_module_dir()
- second = build.get_modules(tagfile)
+ second = build.get_modules(tagfile_new)
print ' * to', buildtag_new, build.repository.gitweb()
for module in diff:
- print '=== %s - %s to %s : package %s ===' % (tagfile, buildtag_old, buildtag_new, module)
+ print '=== %s - %s to %s : package %s ===' % (tagfile_new, buildtag_old, buildtag_new, module)
first, second = diff[module]
m = get_module(module, first)
os.unlink(tmpfile)
for module in new_modules:
- print '=== %s : new package in build %s ===' % (tagfile, module)
+ print '=== %s : new package in build %s ===' % (tagfile_new, module)
for module in removed_modules:
- print '=== %s : removed package from build %s ===' % (tagfile, module)
+ print '=== %s : removed package from build %s ===' % (tagfile_new, module)
def adopt_tag (options, args):
release-changelog :4.2 4.2-rc25
You can refer to the build trunk by just mentioning 'trunk', e.g.
release-changelog -t coblitz-tags.mk coblitz-2.01-rc6 trunk
+ You can use 2 different tagfile names if that was renamed meanwhile
+ release-changelog -t onelab-tags.mk 5.0-rc29 -t onelab-k32-tags.mk 5.0-rc28
"""
adopt_usage="""Usage: %prog [options] tag-file[s]
With this command you can adopt a specifi tag or branch in your tag files
parser=OptionParser(usage=usage)
# the 'adopt' mode is really special and doesn't share any option
- if mode=='adopt':
+ if mode == 'adopt':
parser.add_option("-m","--module",action="append",dest="modules",default=[],
help="modules, can be used several times or with quotes")
parser.add_option("-t","--tag",action="store", dest="tag", default='master',
return
# the other commands (module-* and release-changelog) share the same skeleton
- if mode == "tag" or mode == 'branch':
+ if mode in [ 'tag', 'branch'] :
parser.add_option("-s","--set-version",action="store",dest="new_version",default=None,
help="set new version and reset taglevel to 0")
- if mode == "tag" :
+ parser.add_option("-0","--bypass",action="store_true",dest="bypass",default=False,
+ help="skip checks on existence of the previous tag")
+ if mode == 'tag' :
parser.add_option("-c","--no-changelog", action="store_false", dest="changelog", default=True,
help="do not update changelog section in specfile when tagging")
parser.add_option("-b","--build-branch", action="store", dest="build_branch", default=None,
help="specify a build branch; used for locating the *tags.mk files where adoption is to take place")
- if mode == "tag" or mode == "sync" :
+ if mode in [ 'tag', 'sync' ] :
parser.add_option("-e","--editor", action="store", dest="editor", default=default_editor(),
help="specify editor")
- if mode in ["diff","version"] :
+ if mode in ['diff','version'] :
parser.add_option("-W","--www", action="store", dest="www", default=False,
help="export diff in html format, e.g. -W trunk")
- if mode == "diff" :
+ if mode == 'diff' :
parser.add_option("-l","--list", action="store_true", dest="list", default=False,
help="just list modules that exhibit differences")
# if we provide, say a b c d, we want to build (a,b) (b,c) and (c,d)
# remember that the changelog in the twiki comes latest first, so
# we typically have here latest latest-1 latest-2
- for (tag_to,tag_from) in zip ( args[:-1], args [1:]):
- release_changelog(options, tag_from,tag_to)
+ for (tag_new,tag_old) in zip ( args[:-1], args [1:]):
+ release_changelog(options, tag_old, tag_new)
####################
git://git.onelab.eu / build.git / blobdiff