subversion_id = "$Id$"
-import sys, os, os.path
+import sys, os
import re
import time
from glob import glob
editor = "emacs"
return editor
+### fold long lines
+fold_length=132
+
+def print_fold (line):
+ while len(line) >= fold_length:
+ print line[:fold_length],'\\'
+ line=line[fold_length:]
+ print line
+
class Command:
def __init__ (self,command,options):
self.command=command
self.tmp="/tmp/command-%d"%os.getpid()
def run (self):
+ if self.options.dry_run:
+ print 'dry_run',self.command
+ return 0
if self.options.verbose and self.options.mode not in Main.silent_modes:
print '+',self.command
sys.stdout.flush()
return os.system(self.command)
def run_silent (self):
+ if self.options.dry_run:
+ print 'dry_run',self.command
+ return 0
if self.options.verbose:
print '+',self.command,' .. ',
sys.stdout.flush()
# returns stdout, like bash's $(mycommand)
def output_of (self,with_stderr=False):
+ if self.options.dry_run:
+ print 'dry_run',self.command
+ return 'dry_run output'
tmp="/tmp/status-%d"%os.getpid()
if self.options.debug:
print '+',self.command,' .. ',
print 'Done',
return result
-class Svnpath:
- def __init__(self,path,options):
- self.path=path
- self.options=options
- def url_exists (self):
- return os.system("svn list %s &> /dev/null"%self.path) == 0
+class SvnRepository:
+ type = "svn"
+
+ def __init__(self, path, options):
+ self.path = path
+ self.options = options
+
+ @classmethod
+ def checkout(cls, module, config, options, recursive=False):
+ remote = "%s/%s" % (config['svnpath'], module)
+ local = os.path.join(options.workdir, module)
+
+ if recursive:
+ svncommand = "svn co %s %s" % (remote, local)
+ else:
+ svncommand = "svn co -N %s %s" % (remote, local)
+ Command("rm -rf %s" % local, options).run_silent()
+ Command(svncommand, options).run_fatal()
+
+ return SvnRepository(local, options)
+
+ @classmethod
+ def remote_exists(cls, remote):
+ return os.system("svn list %s &> /dev/null" % remote) == 0
+
+ def update(self, subdir="", recursive=True):
+ path = os.path.join(self.path, subdir)
+ if recursive:
+ svncommand = "svn up %s" % path
+ else:
+ svncommand = "svn up -N %s" % path
+ Command(svncommand, self.options).run_fatal()
+
+ def commit(self, logfile):
+ # add all new files to the repository
+ Command("svn status %s | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\\ /g' | xargs svn add" %
+ self.path, self.options).run_silent()
+ Command("svn commit -F %s %s" % (logfile, self.path), self.options).run_fatal()
+
+ def tag(self, from_url, to_url, logfile):
+ # TODO: get svn url from svn info output
+ # and only require tagname and logfile parameters
+ Command("svn copy -F %s %s %s" % (logfile, from_url, to_url), self.options).run_fatal()
+
+ def diff(self):
+ return Command("svn diff %s" % self.path, self.options).output_of(True)
+
+ def revert(self):
+ Command("svn revert %s -R" % self.path, self.options).run_fatal()
+
+ def is_clean(self):
+ command="svn status %s" % self.path
+ return len(Command(command,self.options).output_of(True)) == 0
+
+ def is_valid(self):
+ return os.path.exists(os.path.join(self.path, ".svn"))
+
+
+
+class GitRepository:
+ type = "git"
+
+ def __init__(self, path, options):
+ self.path = path
+ self.options = options
+
+ @classmethod
+ def checkout(cls, module, config, options, depth=1):
+ remote = "%s:/git/%s.git" % (config['gitserver'], module)
+ local = os.path.join(options.workdir, module)
+
+ Command("rm -rf %s" % local, options).run_silent()
+ Command("git clone --depth %d %s %s" % (depth, remote, local), options).run_fatal()
+
+ return GitRepository(local, options)
+
+ @classmethod
+ def remote_exists(cls, remote):
+ return os.system("git --no-pager ls-remote %s &> /dev/null" % remote) == 0
+
+ def __run_in_repo(self, fun, *args, **kwargs):
+ cwd = os.getcwd()
+ os.chdir(self.path)
+ ret = fun(*args, **kwargs)
+ os.chdir(cwd)
+ return ret
+
+ def __run_command_in_repo(self, command):
+ c = Command(command, self.options)
+ return self.__run_in_repo(c.run_fatal)
- def dir_needs_revert (self):
- command="svn status %s"%self.path
- return len(Command(command,self.options).output_of(True)) != 0
- # turns out it's the same implem.
- def file_needs_commit (self):
- command="svn status %s"%self.path
- return len(Command(command,self.options).output_of(True)) != 0
+ def update(self, subdir=None, recursive=None):
+ return self.__run_command_in_repo("git pull")
+ def to_branch(self, branch, remote=True):
+ if remote:
+ branch = "origin/%s" % branch
+ self.__run_command_in_repo("git checkout %s" % branch)
+
+ def diff(self):
+ c = Command("git diff", self.options)
+ return self.__run_in_repo(c.output_of, with_stderr=True)
+
+ def commit(self, logfile):
+ self.__run_command_in_repo("git add -A")
+ self.__run_command_in_repo("git commit -F %s" % logfile)
+ self.__run_command_in_repo("git push")
+
+ def revert(self):
+ self.__run_command_in_repo("git --no-pager reset --hard")
+ self.__run_command_in_repo("git --no-pager clean -f")
+
+ def is_clean(self):
+ def check_commit():
+ command="git status"
+ s="nothing to commit (working directory clean)"
+ return Command(command, self.options).output_of(True).find(s) >= 0
+ return self.__run_in_repo(check_commit)
+
+ def is_valid(self):
+ return os.path.exists(os.path.join(self.path, ".git"))
+
+
+class Repository:
+ """ Generic repository """
+ supported_repo_types = [SvnRepository, GitRepository]
+
+ def __init__(self, path, options):
+ self.path = path
+ self.options = options
+ for repo in self.supported_repo_types:
+ self.repo = repo(self.path, self.options)
+ if self.repo.is_valid():
+ break
+
+ @classmethod
+ def has_moved_to_git(cls, module, config):
+ return SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (config['svnpath'], module))
+
+ @classmethod
+ def remote_exists(cls, remote):
+ for repo in Repository.supported_repo_types:
+ if repo.remote_exists(remote):
+ return True
+ return False
+
+ def __getattr__(self, attr):
+ return getattr(self.repo, attr)
+
+
+
+# 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--"
+ setting_tag_format = "Setting tag %s"
redirectors=[ # ('module_name_varname','name'),
('module_version_varname','version'),
import commands
configKeys=[ ('svnpath',"Enter your toplevel svnpath",
"svn+ssh://%s@svn.planet-lab.org/svn/"%commands.getoutput("id -un")),
+ ('gitserver', "Enter your git server's hostname", "git.onelab.eu"),
("build", "Enter the name of your build module","build"),
('username',"Enter your firstname and lastname for changelogs",""),
("email","Enter your email address for changelogs",""),
# 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
matcher_rpm_define=re.compile("%(define|global)\s+(\S+)\s+(\S*)\s*")
def __init__ (self,module_spec,options):
self.name=attempt.group('name')
self.branch=attempt.group('branch')
else:
- self.name=module_spec
- self.branch=None
+ attempt=Module.matcher_tag_spec.match(module_spec)
+ if attempt:
+ self.name=attempt.group('name')
+ self.tagname=attempt.group('tagname')
+ else:
+ self.name=module_spec
self.options=options
- self.moddir="%s/%s"%(options.workdir,self.name)
+ self.module_dir="%s/%s"%(options.workdir,self.name)
+ self.repository = None
+ self.build = None
def friendly_name (self):
- if not self.branch:
- return self.name
- else:
+ if hasattr(self,'branch'):
return "%s:%s"%(self.name,self.branch)
+ elif hasattr(self,'tagname'):
+ return "%s@%s"%(self.name,self.tagname)
+ else:
+ return self.name
def edge_dir (self):
- if not self.branch:
- return "%s/trunk"%(self.moddir)
+ if hasattr(self,'branch'):
+ return "%s/branches/%s"%(self.module_dir,self.branch)
+ elif hasattr(self,'tagname'):
+ return "%s/tags/%s"%(self.module_dir,self.tagname)
else:
- return "%s/branches/%s"%(self.moddir,self.branch)
+ return "%s/trunk"%(self.module_dir)
def tags_dir (self):
- return "%s/tags"%(self.moddir)
+ return "%s/tags"%(self.module_dir)
def run (self,command):
return Command(command,self.options).run()
def run_fatal (self,command):
return Command(command,self.options).run_fatal()
- def run_prompt (self,message,command):
+ def run_prompt (self,message,fun, *args):
+ fun_msg = "%s(%s)" % (fun.func_name, ",".join(args))
if not self.options.verbose:
while True:
choice=prompt(message,True,('s','how'))
if choice is True:
- self.run(command)
+ fun(*args)
return
elif choice is False:
- return
- else:
- print 'About to run:',command
+ print 'About to run function:', fun_msg
else:
- question=message+" - want to run " + command
+ question=message+" - want to run function: " + fun_msg
if prompt(question,True):
- self.run(command)
+ fun(*args)
+
+ ####################
@staticmethod
def init_homedir (options):
topdir=options.workdir
print "Cannot find",topdir,"let's create it"
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'],
- Module.config['build'],
- topdir,
- Module.config['build']),options).run_fatal()
+ GitRepository.checkout(Module.config['build'], Module.config,
+ options, depth=1)
print "OK"
# store config
for (key,message,default) in Module.configKeys:
print '\t',key,'=',Module.config[key]
- def init_moddir (self):
+ def init_module_dir (self):
if self.options.verbose:
- print 'Checking for',self.moddir
- if not os.path.isdir (self.moddir):
- self.run_fatal("svn up -N %s"%self.moddir)
- if not os.path.isdir (self.moddir):
- raise Exception, 'Cannot find %s - check module name'%self.moddir
+ print 'Checking for',self.module_dir
- def init_subdir (self,fullpath):
+ if not os.path.isdir (self.module_dir):
+ if Repository.has_moved_to_git(self.name, Module.config):
+ self.repository = GitRepository.checkout(self.name, Module.config,
+ self.options, depth=1)
+ else:
+ self.repository = SvnRepository.checkout(self.name, Module.config,
+ self.options, recursive=False)
+ else:
+ try:
+ self.repository = Repository(self.module_dir, self.options)
+ except:
+ raise Exception, 'Cannot find %s - check module name'%self.module_dir
+
+ def init_subdir (self,subdir, recursive=True):
+ path = os.path.join(self.repository.path, subdir)
if self.options.verbose:
- print 'Checking for',fullpath
- if not os.path.isdir (fullpath):
- self.run_fatal("svn up -N %s"%fullpath)
+ print 'Checking for', path
+ if not os.path.isdir(path):
+ self.repository.update(recursive=recursive, subdir=subdir)
def revert_subdir (self,fullpath):
if self.options.fast_checks:
return
if self.options.verbose:
print 'Checking whether',fullpath,'needs being reverted'
- if Svnpath(fullpath,self.options).dir_needs_revert():
- self.run_fatal("svn revert -R %s"%fullpath)
+
+ repo=Repository(fullpath, self.options)
+ if not repo.is_clean():
+ repo.revert()
def update_subdir (self,fullpath):
if self.options.fast_checks:
return
if self.options.verbose:
print 'Updating',fullpath
- self.run_fatal("svn update -N %s"%fullpath)
+ Repository(fullpath, self.options).update()
def init_edge_dir (self):
# if branch, edge_dir is two steps down
- if self.branch:
- self.init_subdir("%s/branches"%self.moddir)
- self.init_subdir(self.edge_dir())
+ if hasattr(self,'branch'):
+ self.init_subdir("%s/branches"%self.module_dir,recursive=False)
+ elif hasattr(self,'tagname'):
+ self.init_subdir("%s/tags"%self.module_dir,recursive=False)
+ self.init_subdir(self.edge_dir(),recursive=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:
- 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:
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"
for (k,v) in spec_dict.iteritems():
print k,'=',v
- def mod_url (self):
+ def mod_svn_url (self):
return "%s/%s"%(Module.config['svnpath'],self.name)
def edge_url (self):
- if not self.branch:
- return "%s/trunk"%(self.mod_url())
+ if hasattr(self,'branch'):
+ return "%s/branches/%s"%(self.mod_svn_url(),self.branch)
+ elif hasattr(self,'tagname'):
+ return "%s/tags/%s"%(self.mod_svn_url(),self.tagname)
else:
- return "%s/branches/%s"%(self.mod_url(),self.branch)
+ return "%s/trunk"%(self.mod_svn_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 tag_url (self, spec_dict):
- return "%s/tags/%s"%(self.mod_url(),self.tag_name(spec_dict))
+ return "%s/tags/%s"%(self.mod_svn_url(),self.tag_name(spec_dict))
def check_svnpath_exists (self, url, message):
if self.options.fast_checks:
return
if self.options.verbose:
print 'Checking url (%s) %s'%(url,message),
- ok=Svnpath(url,self.options).url_exists()
- if ok:
+
+ if SvnRepository.remote_exists(url):
if self.options.verbose: print 'exists - OK'
else:
if self.options.verbose: print 'KO'
return
if self.options.verbose:
print 'Checking url (%s) %s'%(url,message),
- ok=not Svnpath(url,self.options).url_exists()
- if ok:
+
+ if not SvnRepository.remote_exists(url):
if self.options.verbose: print 'does not exist - OK'
else:
if self.options.verbose: print 'KO'
# locate specfile, parse it, check it and show values
-##############################
- def do_version (self):
- self.init_moddir()
- self.init_edge_dir()
- self.revert_edge_dir()
- self.update_edge_dir()
- spec_dict = self.spec_dict()
- for varname in self.varnames:
- if not spec_dict.has_key(varname):
- print 'Could not find %%define for %s'%varname
- return
- else:
- 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))
- if self.options.verbose:
- print "%-16s %s"%('main specfile:',self.main_specname())
- print "%-16s %s"%('specfiles:',self.all_specnames())
-
-##############################
- def do_list (self):
-# print 'verbose',self.options.verbose
-# print 'list_tags',self.options.list_tags
-# print 'list_branches',self.options.list_branches
-# print 'all_modules',self.options.all_modules
-
- (verbose,branches,pattern,exact) = (self.options.verbose,self.options.list_branches,
- self.options.list_pattern,self.options.list_exact)
-
- extra_command=""
- extra_message=""
- if self.branch:
- pattern=self.branch
- if pattern or exact:
- if exact:
- if verbose: grep="%s/$"%exact
- else: grep="^%s$"%exact
- else:
- grep=pattern
- extra_command=" | grep %s"%grep
- extra_message=" matching %s"%grep
-
- if not branches:
- message="==================== tags for %s"%self.friendly_name()
- command="svn list "
- if verbose: command+="--verbose "
- command += "%s/tags"%self.mod_url()
- command += extra_command
- message += extra_message
- if verbose: print message
- self.run(command)
-
- else:
- message="==================== branches for %s"%self.friendly_name()
- command="svn list "
- if verbose: command+="--verbose "
- command += "%s/branches"%self.mod_url()
- command += extra_command
- message += extra_message
- if verbose: print message
- self.run(command)
-
-##############################
- sync_warning="""*** WARNING
-The module-sync function has the following limitations
-* it does not handle changelogs
-* it does not scan the -tags*.mk files to adopt the new tags"""
-
- def do_sync(self):
- if self.options.verbose:
- print Module.sync_warning
- if not prompt('Want to proceed anyway'):
- return
-
- self.init_moddir()
- self.init_edge_dir()
- self.revert_edge_dir()
- self.update_edge_dir()
- spec_dict = self.spec_dict()
-
- edge_url=self.edge_url()
- tag_name=self.tag_name(spec_dict)
- tag_url=self.tag_url(spec_dict)
- # check the tag does not exist yet
- self.check_svnpath_not_exists(tag_url,"new tag")
-
- if self.options.message:
- svnopt='--message "%s"'%self.options.message
- else:
- svnopt='--editor-cmd=%s'%self.options.editor
- self.run_prompt("Create initial tag",
- "svn copy %s %s %s"%(svnopt,edge_url,tag_url))
-
-##############################
- def do_diff (self,compute_only=False):
- self.init_moddir()
- self.init_edge_dir()
- self.revert_edge_dir()
- self.update_edge_dir()
- spec_dict = self.spec_dict()
- self.show_dict(spec_dict)
-
- edge_url=self.edge_url()
- tag_url=self.tag_url(spec_dict)
- self.check_svnpath_exists(edge_url,"edge track")
- self.check_svnpath_exists(tag_url,"latest tag")
- command="svn diff %s %s"%(tag_url,edge_url)
- if compute_only:
- if self.options.verbose:
- print 'Getting diff with %s'%command
- diff_output = Command(command,self.options).output_of()
- # if used as a utility
- if compute_only:
- return (spec_dict,edge_url,tag_url,diff_output)
- # otherwise print the result
- if self.options.list:
- if diff_output:
- print self.name
- else:
- if not self.options.only or diff_output:
- print 'x'*30,'module',self.friendly_name()
- print 'x'*20,'<',tag_url
- print 'x'*20,'>',edge_url
- print diff_output
##############################
# using fine_grain means replacing only those instances that currently refer to this tag
# 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
return matches
def do_tag (self):
- self.init_moddir()
+ self.init_module_dir()
self.init_edge_dir()
self.revert_edge_dir()
self.update_edge_dir()
diff_output=Command("svn diff %s %s"%(old_tag_url,edge_url),
self.options).output_of()
if len(diff_output) == 0:
- if not prompt ("No difference in trunk for module %s, want to tag anyway"%self.name,False):
+ if not prompt ("No pending difference in module %s, want to tag anyway"%self.name,False):
return
# side effect in trunk's specfile
# 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)
# 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)
## update build
- try:
- buildname=Module.config['build']
- except:
- buildname="build"
+ build_path = os.path.join(self.options.workdir,
+ Module.config['build'])
+ build = Repository(build_path, self.options)
if self.options.build_branch:
- buildname+=":"+self.options.build_branch
- build = Module(buildname,self.options)
- build.init_moddir()
- build.init_edge_dir()
- build.revert_edge_dir()
- build.update_edge_dir()
+ build.to_branch(self.options.build_branch)
- tagsfiles=glob(build.edge_dir()+"/*-tags*.mk")
+ tagsfiles=glob(build.path+"/*-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=""
- paths += self.edge_dir() + " "
- paths += build.edge_dir() + " "
- self.run_prompt("Review trunk and build","svn diff " + paths)
- self.run_prompt("Commit trunk 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))
+ def diff_all_changes():
+ print build.diff()
+ print self.repository.diff()
+
+ def commit_all_changes(log):
+ self.repository.commit(log)
+ 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)
+ # TODO: implement repository.tag() for git
+ self.run_prompt("Create tag", self.repository.tag, edge_url, new_tag_url, changelog_svn)
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):
-
- # save self.branch if any, as a hint for the new branch
- # 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:
- new_trunk_name=self.branch
- self.branch=None
-
- # compute diff - a way to initialize the whole stuff
- # do_diff already does edge_dir initialization
- # and it checks that edge_url and tag_url exist as well
- (spec_dict,edge_url,tag_url,diff_listing) = self.do_diff(compute_only=True)
-
- # the version name in the trunk becomes the new branch name
- branch_name = spec_dict[self.module_version_varname]
-
- # figure new branch name (the one for the trunk) if not provided on the command line
- if not new_trunk_name:
- # heuristic is to assume 'version' is a dot-separated name
- # we isolate the rightmost part and try incrementing it by 1
- version=spec_dict[self.module_version_varname]
- try:
- m=re.compile("\A(?P<leftpart>.+)\.(?P<rightmost>[^\.]+)\Z")
- (leftpart,rightmost)=m.match(version).groups()
- incremented = int(rightmost)+1
- new_trunk_name="%s.%d"%(leftpart,incremented)
- except:
- raise Exception, 'Cannot figure next branch name from %s - exiting'%version
-
- # record starting point tagname
- latest_tag_name = self.tag_name(spec_dict)
-
- print "**********"
- print "Using starting point %s (%s)"%(tag_url,latest_tag_name)
- print "Creating branch %s & moving trunk to %s"%(branch_name,new_trunk_name)
- print "**********"
-
- # print warning if pending diffs
- if diff_listing:
- print """*** WARNING : Module %s has pending diffs on its trunk
-It is safe to proceed, but please note that branch %s
-will be based on latest tag %s and *not* on the current trunk"""%(self.name,branch_name,latest_tag_name)
- while True:
- answer = prompt ('Are you sure you want to proceed with branching',True,('d','iff'))
- if answer is True:
- break
- elif answer is False:
- raise Exception,"User quit"
- elif answer == 'd':
- print '<<<< %s'%tag_url
- print '>>>> %s'%edge_url
- print diff_listing
-
- branch_url = "%s/%s/branches/%s"%(Module.config['svnpath'],self.name,branch_name)
- self.check_svnpath_not_exists (branch_url,"new branch")
-
- # patching trunk
- spec_dict[self.module_version_varname]=new_trunk_name
- spec_dict[self.module_taglevel_varname]='0'
- # remember this in the trunk for easy location of the current branch
- spec_dict['module_current_branch']=branch_name
- self.patch_spec_var(spec_dict,True)
-
- # 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.close()
-
- # we're done, let's commit the stuff
- 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("Create branch",command)
- command="svn commit --file %s %s"%(tmp,self.edge_dir())
- self.run_prompt("Commit trunk",command)
- new_tag_url=self.tag_url(spec_dict)
- command="svn copy --file %s %s %s"%(tmp,self.edge_url(),new_tag_url)
- self.run_prompt("Create initial tag in trunk",command)
- os.unlink(tmp)
##############################
class Main:
- usage="""Usage: %prog options module_desc [ .. module_desc ]
-Purpose:
- manage subversion tags and specfile
- requires the specfile to define *version* and *taglevel*
+ module_usage="""Usage: %prog [options] module_desc [ .. module_desc ]
+
+module-tools : a set of tools to manage subversion tags and specfile
+ requires the specfile to either
+ * define *version* and *taglevel*
OR alternatively
- redirection variables module_version_varname / module_taglevel_varname
+ * define redirection variables module_version_varname / module_taglevel_varname
Trunk:
by default, the trunk of modules is taken into account
in this case, just mention the module name as <module_desc>
Branches:
if you wish to work on a branch rather than on the trunk,
you can use something like e.g. Mom:2.1 as <module_desc>
-More help:
- see http://svn.planet-lab.org/wiki/ModuleTools
"""
+ 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"""
modes={
'list' : "displays a list of available tags or branches",
'version' : "check latest specfile and print out details",
- 'diff' : "show difference between trunk and latest tag",
+ 'diff' : "show difference between module (trunk or branch) and latest tag",
'tag' : """increment taglevel in specfile, insert changelog in specfile,
create new tag and and monitor its adoption in build/*-tags*.mk""",
'branch' : """create a branch for this module, from the latest tag on the trunk,
and change trunk's version number to reflect the new branch name;
you can specify the new branch name by using module:branch""",
- 'sync' : """create a tag from the trunk
+ 'sync' : """create a tag from the module
this is a last resort option, mostly for repairs""",
+ 'changelog' : """extract changelog between build tags
+ expected arguments are a list of tags""",
}
silent_modes = ['list']
+ release_modes = ['changelog']
+
+ @staticmethod
+ def optparse_list (option, opt, value, parser):
+ try:
+ setattr(parser.values,option.dest,getattr(parser.values,option.dest)+value.split())
+ except:
+ setattr(parser.values,option.dest,value.split())
def run(self):
break
if not mode:
print "Unsupported command",sys.argv[0]
+ print "Supported commands:" + " ".join(Main.modes.keys())
sys.exit(1)
- Main.usage += "\nmodule-%s : %s"%(mode,Main.modes[mode])
- all_modules=os.path.dirname(sys.argv[0])+"/modules.list"
+ if mode not in Main.release_modes:
+ usage = Main.module_usage
+ usage += Main.common_usage
+ usage += "\nmodule-%s : %s"%(mode,Main.modes[mode])
+ else:
+ usage = Main.release_usage
+ usage += Main.common_usage
- parser=OptionParser(usage=Main.usage,version=subversion_id)
+ parser=OptionParser(usage=usage,version=subversion_id)
- if mode == 'list':
- parser.add_option("-b","--branches",action="store_true",dest="list_branches",default=False,
- help="list branches")
- parser.add_option("-t","--tags",action="store_false",dest="list_branches",
- help="list tags")
- parser.add_option("-m","--match",action="store",dest="list_pattern",default=None,
- help="grep pattern for filtering output")
- parser.add_option("-x","--exact-match",action="store",dest="list_exact",default=None,
- help="exact grep pattern for filtering output")
if mode == "tag" or mode == '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" or mode == "sync" :
parser.add_option("-e","--editor", action="store", dest="editor", default=default_editor(),
help="specify editor")
- 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 == "diff" :
- parser.add_option("-l","--list", action="store_true", dest="list", default=False,
- help="just list modules that exhibit differences")
-
- if mode == 'version':
- parser.add_option("-u","--url", action="store_true", dest="show_urls", default=False,
- help="display URLs")
- # default verbosity depending on function - temp
- parser.add_option("-a","--all",action="store_true",dest="all_modules",default=False,
- help="run on all modules as found in %s"%all_modules)
- verbose_default=False
- if mode in ['tag','sync'] : verbose_default = True
- parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=verbose_default,
- help="run in verbose mode")
- if mode not in ['version','list']:
- parser.add_option("-q","--quiet", action="store_false", dest="verbose",
- help="run in quiet (non-verbose) mode")
+ default_modules_list=os.path.dirname(sys.argv[0])+"/modules.list"
+ 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("-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
+-- can be set multiple times, or use quotes""")
+
parser.add_option("-w","--workdir", action="store", dest="workdir",
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")
- parser.add_option("-d","--debug", action="store_true", dest="debug", default=False,
- help="debug mode - mostly more verbose")
+
+ # default verbosity depending on function - temp
+ verbose_modes= ['tag', 'sync', 'branch']
+
+ if mode not in verbose_modes:
+ parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
+ help="run in verbose mode")
+ else:
+ parser.add_option("-q","--quiet", action="store_false", dest="verbose", default=True,
+ help="run in quiet (non-verbose) mode")
(options, args) = parser.parse_args()
options.mode=mode
+ if not hasattr(options,'dry_run'):
+ options.dry_run=False
+ if not hasattr(options,'www'):
+ options.www=False
+ options.debug=False
+ ########## module-*
if len(args) == 0:
- if options.all_modules:
- args=Command("grep -v '#' %s"%all_modules,options).output_of().split()
- else:
- parser.print_help()
- sys.exit(1)
+ parser.print_help()
+ sys.exit(1)
Module.init_homedir(options)
- for modname in args:
- module=Module(modname,options)
+
+ modules=[ Module(modname,options) for modname in args ]
+ for module in modules:
if len(args)>1 and mode not in Main.silent_modes:
print '========================================',module.friendly_name()
# call the method called do_<mode>
try:
method(module)
except Exception,e:
- print 'Skipping failed %s: '%modname,e
+ import traceback
+ traceback.print_exc()
+ print 'Skipping module %s: '%modname,e
+####################
if __name__ == "__main__" :
try:
Main().run()
except KeyboardInterrupt:
print '\nBye'
-
git://git.onelab.eu / build.git / blobdiff