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'),
def html_href (url,text): return '<a href="%s">%s</a>'%(url,text)
@staticmethod
def html_anchor (url,text): return '<a name="%s">%s</a>'%(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):
self.body += html
def html_store_pre (self, text):
if not hasattr(self,'body'): self.body=''
- self.body += '<pre>' + text + '</pre>'
+ self.body += '<pre>' + self.html_quote(text) + '</pre>'
def html_print (self, txt):
if not self.options.www:
print txt
else:
- self.html_store_pre(txt)
+ if not hasattr(self,'in_list') or not self.in_list:
+ self.html_store_raw('<ul>')
+ self.in_list=True
+ self.html_store_raw('<li>'+txt+'</li>')
+ def html_print_end (self):
+ if self.options.www:
+ self.html_store_raw ('</ul>')
@staticmethod
def html_dump_header(title):
- now=time.strftime("%Y-%m-%d %H:%M")
+ nowdate=time.strftime("%Y-%m-%d")
+ nowtime=time.strftime("%H:%M")
print """
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
</style>
</head>
<body>
-<p class='title'> %s - status at %s</p>
+<p class='title'> %s - status on %s at %s</p>
<ul>
-"""%(title,title,now)
+"""%(title,title,nowdate,nowtime)
@staticmethod
def html_dump_middle():
def html_dump_body(self):
if hasattr(self,'titles'):
for title in self.titles:
- print ('<hr />')
- print '<h1>',self.html_anchor(self.friendly_name(),title),'</h1>'
+ print '<hr /><h1>',self.html_anchor(self.friendly_name(),title),'</h1>'
if hasattr(self,'body'):
print self.body
+ print '<p class="top">',self.html_href('#','Back to top'),'</p>'
####################
@staticmethod
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()
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:
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())
attempt="%s/%s.spec"%(self.edge_dir(),self.name)
if os.path.isfile (attempt):
return attempt
- else:
- pattern="%s/*.spec"%self.edge_dir()
- try:
- return glob(pattern)[0]
- except:
- raise Exception, 'Cannot guess specfile for module %s -- pattern was %s'%(self.name,pattern)
+ 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:
new.close()
os.rename(newspecfile,specfile)
+ # returns all lines until the magic line
def unignored_lines (self, logfile):
result=[]
- 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:
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"
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)
##############################
def do_version (self):
- if self.options.www:
- self.html_store_title('Version for module %s' % self.friendly_name())
self.init_module_dir()
self.init_edge_dir()
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):
self.html_print ('Could not find %%define for %s'%varname)
if self.options.verbose:
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):
if diff_output:
print self.name
else:
- anchor=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 (%d chars)"%(anchor,len(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 ('<p> < (left) %s </p>'%link)
link=self.html_href(edge_url,edge_url)
self.html_store_raw ('<p> > (right) %s </p>'%link)
self.html_store_pre (diff_output)
elif not self.options.www:
- print 'x'*30,'module',anchor
+ print 'x'*30,'module',thename
print 'x'*20,'<',tag_url
print 'x'*20,'>',edge_url
print diff_output
# 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("""Setting tag %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
-"""%(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)
# 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)
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)
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
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):
f.write("Branch %s for module %s created (as new trunk) from tag %s\n"%(new_trunk_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 SVNBRANCH
+ print """You might now wish to review your tags files
+Please make sure you mention as appropriate
+%s-SVNBRANCH := %s""" %(self.name,branch_name)
##############################
class Package:
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*
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,
method(module)
except Exception,e:
if options.www:
- title='<span class="error"> Skipping module %s - failure: %s </span>'%(module.name, str(e))
+ title='<span class="error"> Skipping module %s - failure: %s </span>'%\
+ (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="Pending changes in %s"%options.www
+ modetitle="Changes to tag in %s"%options.www
elif mode == "version":
- modetitle="Version of latest tags in %s"%options.www
+ modetitle="Latest tags in %s"%options.www
modules.append(error_module)
error_module.html_dump_header(modetitle)
for module in modules:
git://git.onelab.eu / build.git / blobdiff