X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=787d757a559e5dafdf01faf7d21ae6c6b718386a;hb=5a7db47c530d4390333af098ac3e664ab96d4502;hp=636379051b08008864993f2160c191ae0c47a5b7;hpb=e44cf289fd8c97099515ebf8428dc13ad193b10c;p=build.git diff --git a/module-tools.py b/module-tools.py index 63637905..787d757a 100755 --- a/module-tools.py +++ b/module-tools.py @@ -142,6 +142,7 @@ class Svnpath: class Module: svn_magic_line="--This line, and those below, will be ignored--" + setting_tag_format = "Setting tag %s" redirectors=[ # ('module_name_varname','name'), ('module_version_varname','version'), @@ -169,7 +170,7 @@ class Module: # for parsing module spec name:branch - matcher_branch_spec=re.compile("\A(?P[\w-]+):(?P[\w\.-]+)\Z") + matcher_branch_spec=re.compile("\A(?P[\w\.-]+):(?P[\w\.-]+)\Z") # special form for tagged module - for Build matcher_tag_spec=re.compile("\A(?P[\w-]+)@(?P[\w\.-]+)\Z") # parsing specfiles @@ -231,6 +232,84 @@ class Module: if prompt(question,True): self.run(command) + #################### + # store and restitute html fragments + @staticmethod + def html_href (url,text): return '%s'%(url,text) + @staticmethod + def html_anchor (url,text): return '%s'%(url,text) + # there must be some smarter means to do that - dirty for now + @staticmethod + def html_quote (text): + return text.replace('&','&').replace('<','<').replace('>','>') + + # only the fake error module has multiple titles + def html_store_title (self, title): + if not hasattr(self,'titles'): self.titles=[] + self.titles.append(title) + def html_store_raw (self, html): + if not hasattr(self,'body'): self.body='' + self.body += html + def html_store_pre (self, text): + if not hasattr(self,'body'): self.body='' + self.body += '

' + self.html_quote(text) + '

' + + def html_print (self, txt): + if not self.options.www: + print txt + else: + if not hasattr(self,'in_list') or not self.in_list: + self.html_store_raw('

'+txt+'

') + + @staticmethod + def html_dump_header(title): + nowdate=time.strftime("%Y-%m-%d") + nowtime=time.strftime("%H:%M (%Z)") + print """ + + + + %s + + + + +

%s - status on %s at %s

+"""%(title,title,nowdate,nowtime) + + @staticmethod + def html_dump_middle(): + print "" + + @staticmethod + def html_dump_footer(): + print "',self.html_href ('#'+self.friendly_name(),title),'' + + def html_dump_body(self): + if hasattr(self,'titles'): + for title in self.titles: + print '

',self.html_anchor(self.friendly_name(),title),'

' + if hasattr(self,'body'): + print self.body + print '

',self.html_href('#','Back to top'),'

' + + #################### @staticmethod def init_homedir (options): topdir=options.workdir @@ -251,7 +330,7 @@ that for other purposes than tagging"""%topdir Module.prompt_config() print "Checking ...", Command("svn co -N %s %s"%(Module.config['svnpath'],topdir),options).run_fatal() - Command("svn co -N %s/%s %s/%s"%(Module.config['svnpath'], + Command("svn co %s/%s %s/%s"%(Module.config['svnpath'], Module.config['build'], topdir, Module.config['build']),options).run_fatal() @@ -285,11 +364,13 @@ that for other purposes than tagging"""%topdir if not os.path.isdir (self.module_dir): raise Exception, 'Cannot find %s - check module name'%self.module_dir - def init_subdir (self,fullpath): + def init_subdir (self,fullpath, deep=False): if self.options.verbose: print 'Checking for',fullpath + opt="" + if not deep: opt="-N" if not os.path.isdir (fullpath): - self.run_fatal("svn update -N %s"%fullpath) + self.run_fatal("svn update %s %s"%(opt,fullpath)) def revert_subdir (self,fullpath): if self.options.fast_checks: @@ -306,15 +387,15 @@ that for other purposes than tagging"""%topdir return if self.options.verbose: print 'Updating',fullpath - self.run_fatal("svn update -N %s"%fullpath) + self.run_fatal("svn update %s"%fullpath) def init_edge_dir (self): # if branch, edge_dir is two steps down if hasattr(self,'branch'): - self.init_subdir("%s/branches"%self.module_dir) + self.init_subdir("%s/branches"%self.module_dir,deep=False) elif hasattr(self,'tagname'): - self.init_subdir("%s/tags"%self.module_dir) - self.init_subdir(self.edge_dir()) + self.init_subdir("%s/tags"%self.module_dir,deep=False) + self.init_subdir(self.edge_dir(),deep=True) def revert_edge_dir (self): self.revert_subdir(self.edge_dir()) @@ -326,14 +407,21 @@ that for other purposes than tagging"""%topdir attempt="%s/%s.spec"%(self.edge_dir(),self.name) if os.path.isfile (attempt): return attempt - else: - try: - return glob("%s/*.spec"%self.edge_dir())[0] - except: - raise Exception, 'Cannot guess specfile for module %s'%self.name + pattern1="%s/*.spec"%self.edge_dir() + level1=glob(pattern1) + if level1: + return level1[0] + pattern2="%s/*/*.spec"%self.edge_dir() + level2=glob(pattern2) + if level2: + return level2[0] + raise Exception, 'Cannot guess specfile for module %s -- patterns were %s or %s'%(self.name,pattern1,pattern2) def all_specnames (self): - return glob("%s/*.spec"%self.edge_dir()) + level1=glob("%s/*.spec"%self.edge_dir()) + if level1: return level1 + level2=glob("%s/*/*.spec"%self.edge_dir()) + return level2 def parse_spec (self, specfile, varnames): if self.options.verbose: @@ -409,21 +497,27 @@ that for other purposes than tagging"""%topdir new.close() os.rename(newspecfile,specfile) + # returns all lines until the magic line def unignored_lines (self, logfile): result=[] - exclude="Tagging module %s"%self.name white_line_matcher = re.compile("\A\s*\Z") for logline in file(logfile).readlines(): if logline.strip() == Module.svn_magic_line: break - if logline.find(exclude) >= 0: - continue elif white_line_matcher.match(logline): continue else: result.append(logline.strip()+'\n') return result + # creates a copy of the input with only the unignored lines + def stripped_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): for specfile in self.all_specnames(): newspecfile=specfile+".new" @@ -463,12 +557,13 @@ that for other purposes than tagging"""%topdir else: return "%s/trunk"%(self.mod_url()) + def last_tag (self, spec_dict): + return "%s-%s"%(spec_dict[self.module_version_varname],spec_dict[self.module_taglevel_varname]) + def tag_name (self, spec_dict): try: - return "%s-%s-%s"%(#spec_dict[self.module_name_varname], - self.name, - spec_dict[self.module_version_varname], - spec_dict[self.module_taglevel_varname]) + return "%s-%s"%(self.name, + self.last_tag(spec_dict)) except KeyError,err: raise Exception, 'Something is wrong with module %s, cannot determine %s - exiting'%(self.name,err) @@ -508,18 +603,21 @@ that for other purposes than tagging"""%topdir self.revert_edge_dir() self.update_edge_dir() spec_dict = self.spec_dict() + if self.options.www: + self.html_store_title('Version for module %s (%s)' % (self.friendly_name(),self.last_tag(spec_dict))) for varname in self.varnames: if not spec_dict.has_key(varname): - print 'Could not find %%define for %s'%varname + self.html_print ('Could not find %%define for %s'%varname) return else: - print "%-16s %s"%(varname,spec_dict[varname]) + self.html_print ("%-16s %s"%(varname,spec_dict[varname])) if self.options.show_urls: - print "%-16s %s"%('edge url',self.edge_url()) - print "%-16s %s"%('latest tag url',self.tag_url(spec_dict)) + self.html_print ("%-16s %s"%('edge url',self.edge_url())) + self.html_print ("%-16s %s"%('latest tag url',self.tag_url(spec_dict))) if self.options.verbose: - print "%-16s %s"%('main specfile:',self.main_specname()) - print "%-16s %s"%('specfiles:',self.all_specnames()) + self.html_print ("%-16s %s"%('main specfile:',self.main_specname())) + self.html_print ("%-16s %s"%('specfiles:',self.all_specnames())) + self.html_print_end() ############################## def do_list (self): @@ -621,8 +719,18 @@ The module-sync function has the following limitations if diff_output: print self.name else: - if not self.options.only or diff_output: - print 'x'*30,'module',self.friendly_name() + thename=self.friendly_name() + do_print=False + if self.options.www and diff_output: + self.html_store_title("Diffs in module %s (%s) : %d chars"%(\ + thename,self.last_tag(spec_dict),len(diff_output))) + link=self.html_href(tag_url,tag_url) + self.html_store_raw ('

< (left) %s

'%link) + link=self.html_href(edge_url,edge_url) + self.html_store_raw ('

> (right) %s

'%link) + self.html_store_pre (diff_output) + elif not self.options.www: + print 'x'*30,'module',thename print 'x'*20,'<',tag_url print 'x'*20,'>',edge_url print diff_output @@ -651,14 +759,16 @@ The module-sync function has the following limitations # brute-force : change uncommented lines that define -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[^\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[^\s]+)-SVNPATH\s*(=|:=)\s*(?P[^\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 @@ -713,12 +823,14 @@ The module-sync function has the following limitations # we use the standard subversion magic string (see svn_magic_line) # 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 - + changelog="/tmp/%s-%d.edit"%(self.name,os.getpid()) + changelog_svn="/tmp/%s-%d.svn"%(self.name,os.getpid()) + setting_tag_line=Module.setting_tag_format%new_tag_name + file(changelog,"w").write(""" +%s %s Please write a changelog for this new tag in the section above -"""%(self.name,new_tag_name,Module.svn_magic_line)) +"""%(Module.svn_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) @@ -728,6 +840,9 @@ Please write a changelog for this new tag in the section above # edit it self.run("%s %s"%(self.options.editor,changelog)) + # 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) # insert changelog in spec if self.options.changelog: self.insert_changelog (changelog,old_tag_name,new_tag_name) @@ -748,14 +863,16 @@ Please write a changelog for this new tag in the section above tagsfiles=glob(build.edge_dir()+"/*-tags*.mk") tagsdict=dict( [ (x,'todo') for x in tagsfiles ] ) default_answer = 'y' + tagsfiles.sort() while True: - for (tagsfile,status) in tagsdict.iteritems(): + for tagsfile in tagsfiles: + status=tagsdict[tagsfile] basename=os.path.basename(tagsfile) print ".................... Dealing with %s"%basename while tagsdict[tagsfile] == 'todo' : choice = prompt ("insert %s in %s "%(new_tag_name,basename),default_answer, [ ('y','es'), ('n', 'ext'), ('f','orce'), - ('d','iff'), ('r','evert'), ('h','elp') ] , + ('d','iff'), ('r','evert'), ('c', 'at'), ('h','elp') ] , allow_outside=True) if choice == 'y': self.patch_tags_file(tagsfile,old_tag_name,new_tag_name,fine_grain=True) @@ -768,16 +885,19 @@ Please write a changelog for this new tag in the section above self.run("svn diff %s"%tagsfile) elif choice == 'r': self.run("svn revert %s"%tagsfile) + elif choice == 'c': + self.run("cat %s"%tagsfile) else: name=self.name print """y: change %(name)s-SVNPATH only if it currently refers to %(old_tag_name)s -f: unconditionnally change any line setting %(name)s-SVNPATH to using %(new_tag_name)s +f: unconditionnally change any line that assigns %(name)s-SVNPATH to using %(new_tag_name)s d: show current diff for this tag file r: revert that tag file +c: cat the current tag file n: move to next file"""%locals() if prompt("Want to review changes on tags files",False): - tagsdict = dict ( [ (x, 'todo') for tagsfile in tagsfiles ] ) + tagsdict = dict ( [ (x, 'todo') for x in tagsfiles ] ) default_answer='d' else: break @@ -786,13 +906,14 @@ n: move to next file"""%locals() paths += self.edge_dir() + " " paths += build.edge_dir() + " " self.run_prompt("Review module and build","svn diff " + paths) - self.run_prompt("Commit module and build","svn commit --file %s %s"%(changelog,paths)) - self.run_prompt("Create tag","svn copy --file %s %s %s"%(changelog,edge_url,new_tag_url)) + self.run_prompt("Commit module and build","svn commit --file %s %s"%(changelog_svn,paths)) + self.run_prompt("Create tag","svn copy --file %s %s %s"%(changelog_svn,edge_url,new_tag_url)) if self.options.debug: - print 'Preserving',changelog + print 'Preserving',changelog,'and stripped',changelog_svn else: os.unlink(changelog) + os.unlink(changelog_svn) ############################## def do_branch (self): @@ -801,9 +922,11 @@ n: move to next file"""%locals() # 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 @@ -863,31 +986,44 @@ will be based on latest tag %s and *not* on the current trunk"""%(self.name,bran # create commit log file tmp="/tmp/branching-%d"%os.getpid() f=open(tmp,"w") - f.write("Branch %s for module %s created (as new trunk) from tag %s\n"%(new_trunk_name,self.name,latest_tag_name)) + f.write("Branch %s for module %s created (as new trunk) from tag %s\n"%(branch_name,self.name,latest_tag_name)) f.close() - # we're done, let's commit the stuff + # review the renumbering changes in trunk command="svn diff %s"%self.edge_dir() - self.run_prompt("Review changes in trunk",command) - command="svn copy --file %s %s %s"%(tmp,self.edge_url(),branch_url) + self.run_prompt("Review (renumbering) changes in trunk",command) + # create branch + command="svn copy --file %s %s %s"%(tmp,tag_url,branch_url) self.run_prompt("Create branch",command) + # commit trunk command="svn commit --file %s %s"%(tmp,self.edge_dir()) self.run_prompt("Commit trunk",command) + # create initial tag for the new trunk new_tag_url=self.tag_url(spec_dict) - command="svn copy --file %s %s %s"%(tmp,self.edge_url(),new_tag_url) + command="svn copy --file %s %s %s"%(tmp,tag_url,new_tag_url) self.run_prompt("Create initial tag in trunk",command) os.unlink(tmp) + # print message about BRANCH + print """You might now wish to review your tags files +Please make sure you mention as appropriate +%s-BRANCH := %s""" %(self.name,branch_name) ############################## class Package: - def __init__(self, package, module, svnpath, spec): + def __init__(self, package, module, svnpath, spec,options): self.package=package self.module=module - self.svnpath=svnpath + self.svnrev = None + self.svnpath=svnpath + if svnpath.rfind('@') > 0: + self.svnpath, self.svnrev = svnpath.split('@') self.spec=spec - self.specpath="%s/%s"%(svnpath,spec) + self.specpath="%s/%s"%(self.svnpath,self.spec) + if self.svnrev: + self.specpath += "@%s" % self.svnrev self.basename=os.path.basename(svnpath) + self.options=options # returns a http URL to the trac path where full diff can be viewed (between self and pkg) # typically http://svn.planet-lab.org/changeset?old_path=Monitor%2Ftags%2FMonitor-1.0-7&new_path=Monitor%2Ftags%2FMonitor-1.0-13 @@ -903,20 +1039,36 @@ class Package: return "%s://%s/changeset?old_path=%s&new_path=%s"%(method,hostname,self_path,pkg_path) else: return None + + def inline_full_diff (self, pkg): + print '{{{' + command='svn diff %s %s'%(self.svnpath,pkg.svnpath) + Command(command,self.options).run() + print '}}}' def details (self): return "[%s %s] [%s (spec)]"%(self.svnpath,self.basename,self.specpath) 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 buildtag == "trunk": + module_name="build" + self.display="trunk" + self.svnpath="http://svn.planet-lab.org/svn/build/trunk" + # if the buildtag start with a : (to use a branch rather than a tag) + elif 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): @@ -935,6 +1087,9 @@ class Build (Module): make_options="--no-print-directory -C %s stage1=true PLDISTRO=%s PLDISTROTAGS=%s 2> /dev/null"%(self.edge_dir(),distro,distrotag) command="make %s packages"%make_options make_packages=Command(command,self.options).output_of() + if self.options.verbose: + print 'obtaining packages information with command:' + print command pkg_line=re.compile("\Apackage=(?P[^\s]+)\s+ref_module=(?P[^\s]+)\s.*\Z") for line in make_packages.split("\n"): if not line: @@ -953,7 +1108,7 @@ class Build (Module): svnpath=Command(command,self.options).output_of().strip() command="make %s +%s-SPEC"%(make_options,package) spec=Command(command,self.options).output_of().strip() - result[package]=Package(package,module,svnpath,spec) + result[module]=Package(package,module,svnpath,spec,self.options) return result def get_distrotags (self): @@ -987,13 +1142,12 @@ class Release: 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 @@ -1013,35 +1167,49 @@ class Release: 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 packages_old=build_old.get_packages(distrotag) pnames_old=set(packages_old.keys()) - if options.verbose: print 'got packages for ',buildtag_old - # get created, deprecated, and preserved package names + # get names of created, deprecated, and preserved modules pnames_created = list(pnames_new-pnames_old) - pnames_created.sort() pnames_deprecated = list(pnames_old-pnames_new) - pnames_deprecated.sort() pnames = list(pnames_new.intersection(pnames_old)) + + pnames_created.sort() + pnames_deprecated.sort() pnames.sort() - if options.verbose: print "Found new/deprecated/preserved pnames",pnames_new,pnames_deprecated,pnames + if options.verbose: + print '--------------------' + print 'got packages for ',build_new.display + print pnames_new + print '--------------------' + print 'got packages for ',build_old.display + print pnames_old + print '--------------------' + print "Found new modules",pnames_created + print '--------------------' + print "Found deprecated modules",pnames_deprecated + print '--------------------' + print "Found preserved modules",pnames + print '--------------------' # 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 @@ -1063,27 +1231,35 @@ class Release: 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: - print ' * [%s View full diff]'%trac_diff_url - print '{{{' - for line in specdiff.split('\n'): - if not line: - continue - if Release.discard_matcher.match(line): - continue - if line[0] in ['@']: - print '----------' - elif line[0] in ['+','-']: - print_fold(line) - print '}}}' + if options.inline_diff: + pobj_old.inline_full_diff(pobj_new) + else: + trac_diff_url=pobj_old.trac_full_diff(pobj_new) + if trac_diff_url: + print ' * [%s View full diff]'%trac_diff_url + else: + print ' * No full diff available' + print '{{{' + for line in specdiff.split('\n'): + if not line: + continue + if Release.discard_matcher.match(line): + continue + if line[0] in ['@']: + print '----------' + elif line[0] in ['+','-']: + print_fold(line) + print '}}}' ############################## class Main: module_usage="""Usage: %prog [options] module_desc [ .. module_desc ] +Revision: $Revision$ + module-tools : a set of tools to manage subversion tags and specfile requires the specfile to either * define *version* and *taglevel* @@ -1098,6 +1274,12 @@ Branches: """ 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 + You can refer to the build trunk by just mentioning 'trunk', e.g. + release-changelog -t coblitz-tags.mk coblitz-2.01-rc6 trunk """ common_usage="""More help: see http://svn.planet-lab.org/wiki/ModuleTools""" @@ -1136,7 +1318,7 @@ Branches: break if not mode: print "Unsupported command",sys.argv[0] - print "Supported commands:" + Modes.modes.keys.join(" ") + print "Supported commands:" + " ".join(Main.modes.keys()) sys.exit(1) if mode not in Main.release_modes: @@ -1172,9 +1354,9 @@ Branches: if mode == "sync" : parser.add_option("-m","--message", action="store", dest="message", default=None, help="specify log message") - if mode == "diff" : - parser.add_option("-o","--only", action="store_true", dest="only", default=False, - help="report diff only for modules that exhibit differences") + 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" : parser.add_option("-l","--list", action="store_true", dest="list", default=False, help="just list modules that exhibit differences") @@ -1192,6 +1374,8 @@ Branches: else: parser.add_option("-n","--dry-run",action="store_true",dest="dry_run",default=False, help="dry run - shell commands are only displayed") + parser.add_option("-i","--inline-diff",action="store_true",dest="inline_diff",default=False, + help="calls svn diff on whole module, not just only the spec file") parser.add_option("-t","--distrotags",action="callback",callback=Main.optparse_list, dest="distrotags", default=[], nargs=1,type="string", help="""specify distro-tags files, e.g. onelab-tags-4.2.mk @@ -1205,7 +1389,7 @@ Branches: help="skip safety checks, such as svn updates -- use with care") # default verbosity depending on function - temp - verbose_modes= ['tag','sync'] + verbose_modes= ['tag', 'sync', 'branch'] if mode not in verbose_modes: parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False, @@ -1219,6 +1403,8 @@ Branches: options.mode=mode if not hasattr(options,'dry_run'): options.dry_run=False + if not hasattr(options,'www'): + options.www=False options.debug=False ########## release-* @@ -1242,16 +1428,42 @@ Branches: parser.print_help() sys.exit(1) Module.init_homedir(options) - for modname in args: - module=Module(modname,options) - if len(args)>1 and mode not in Main.silent_modes: + + # 2 passes for www output + modules=[ Module(modname,options) for modname in args ] + # hack: create a dummy Module to store errors/warnings + error_module = Module('__errors__',options) + + # pass 1 : do it, except if options.www + for module in modules: + if len(args)>1 and mode not in Main.silent_modes and not options.www: print '========================================',module.friendly_name() # call the method called do_ method=Module.__dict__["do_%s"%mode] try: method(module) except Exception,e: - print 'Skipping failed %s: '%modname,e + if options.www: + title=' Skipping module %s - failure: %s '%\ + (module.friendly_name(), str(e)) + error_module.html_store_title(title) + else: + print 'Skipping module %s: '%modname,e + + # in which case we do the actual printing in the second pass + if options.www: + if mode == "diff": + modetitle="Changes to tag in %s"%options.www + elif mode == "version": + modetitle="Latest tags in %s"%options.www + modules.append(error_module) + error_module.html_dump_header(modetitle) + for module in modules: + module.html_dump_toc() + Module.html_dump_middle() + for module in modules: + module.html_dump_body() + Module.html_dump_footer() #################### if __name__ == "__main__" :