X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=1239c2f8296cc98badcab1590f19566ea74028e6;hb=b434b8b5e59ed43a48b4aaacb2df9a6ffaa5a6ae;hp=2a10dd30fca79cacbbd40929e52cf73690be1768;hpb=1da274c54037898e191f9b8dd8dcfeb303f98154;p=build.git diff --git a/module-tools.py b/module-tools.py index 2a10dd30..1239c2f8 100755 --- a/module-tools.py +++ b/module-tools.py @@ -414,7 +414,7 @@ class Repository: # 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'), @@ -784,7 +784,7 @@ that for other purposes than tagging""" % options.workdir 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 @@ -793,7 +793,7 @@ that for other purposes than tagging""" % options.workdir 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): @@ -959,32 +959,32 @@ that for other purposes than tagging""" % options.workdir 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)) +"""%(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) + 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,old_tag_name,new_tag_name) ## update build build_path = os.path.join(self.options.workdir, @@ -1049,14 +1049,14 @@ n: move to next file"""%locals() 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) ############################## @@ -1262,36 +1262,38 @@ def modules_diff(first, second): 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() @@ -1306,7 +1308,7 @@ def release_changelog(options, buildtag_old, buildtag_new): 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) @@ -1338,10 +1340,10 @@ def release_changelog(options, buildtag_old, buildtag_new): 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): @@ -1382,6 +1384,8 @@ Branches: 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 @@ -1579,8 +1583,8 @@ Branches: # 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) ####################