X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=e3aaba7a240a1c1bc4dc3f968c7c5f9430efc087;hb=c634de4062cb0ba627fd799e7a8084839239fc4d;hp=ce2f90bf3e857dedd8f29896379af6e99aa1223c;hpb=e26d250242c5360e6edf559dbb2eb499cffdd31a;p=build.git diff --git a/module-tools.py b/module-tools.py index ce2f90bf..e3aaba7a 100755 --- a/module-tools.py +++ b/module-tools.py @@ -1,13 +1,38 @@ #!/usr/bin/python -u -subversion_id = "$Id$" - -import sys, os, os.path +import sys, os import re import time from glob import glob from optparse import OptionParser +# HARDCODED NAME CHANGES +# +# Moving to git we decided to rename some of the repositories. Here is +# a map of name changes applied in git repositories. +RENAMED_SVN_MODULES = { + "PLEWWW": "plewww", + "PLCAPI": "plcapi", + "BootManager": "bootmanager", + "BootCD": "bootcd", + "VserverReference": "vserver-reference", + "BootstrapFS": "bootstrapfs", + "MyPLC": "myplc", + "NodeManager": "nodemanager" + } + +def svn_to_git_name(module): + if RENAMED_SVN_MODULES.has_key(module): + return RENAMED_SVN_MODULES[module] + return module + +def git_to_svn_name(module): + for key in RENAMED_SVN_MODULES: + if module == RENAMED_SVN_MODULES[key]: + return key + return module + + # e.g. other_choices = [ ('d','iff') , ('g','uess') ] - lowercase def prompt (question,default=True,other_choices=[],allow_outside=False): if not isinstance (other_choices,list): @@ -130,35 +155,88 @@ class SvnRepository: self.path = path self.options = options + def name(self): + return os.path.basename(self.path) + + def url(self): + out = Command("svn info %s" % self.path, self.options).output_of() + for line in out.split('\n'): + if line.startswith("URL:"): + return line.split()[1].strip() + + def repo_root(self): + out = Command("svn info %s" % self.path, self.options).output_of() + for line in out.split('\n'): + if line.startswith("Repository Root:"): + root = line.split()[2].strip() + return "%s/%s" % (root, self.name()) + @classmethod - def checkout(cls, remote, path, options, recursive=False): + def checkout(cls, remote, local, options, recursive=False): if recursive: - svncommand = "svn co %s %s" % (remote, path) + svncommand = "svn co %s %s" % (remote, local) else: - svncommand = "svn co -N %s %s" % (remote, path) - Command("rm -rf %s" % path, options).run_silent() + svncommand = "svn co -N %s %s" % (remote, local) + Command("rm -rf %s" % local, options).run_silent() Command(svncommand, options).run_fatal() - return SvnRepository(path, options) + + return SvnRepository(local, options) @classmethod def remote_exists(cls, remote): return os.system("svn list %s &> /dev/null" % remote) == 0 - def update(self, recursive=True): + def tag_exists(self, tagname): + url = "%s/tags/%s" % (self.repo_root(), tagname) + return SvnRepository.remote_exists(url) + + def update(self, subdir="", recursive=True, branch=None): + path = os.path.join(self.path, subdir) if recursive: - svncommand = "svn up %s" % self.path + svncommand = "svn up %s" % path else: - svncommand = "svn up -N %s" % self.path + 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() + self.path, self.options).output_of() Command("svn commit -F %s %s" % (logfile, self.path), self.options).run_fatal() - def revert(self): - Command("svn revert %s -R" % self.path, self.options).run_fatal() + def to_branch(self, branch): + remote = "%s/branches/%s" % (self.repo_root(), branch) + SvnRepository.checkout(remote, self.path, self.options, recursive=True) + + def to_tag(self, tag): + remote = "%s/tags/%s" % (self.repo_root(), branch) + SvnRepository.checkout(remote, self.path, self.options, recursive=True) + + def tag(self, tagname, logfile): + tag_url = "%s/tags/%s" % (self.repo_root(), tagname) + self_url = self.url() + Command("svn copy -F %s %s %s" % (logfile, self_url, tag_url), self.options).run_fatal() + + def diff(self, f=""): + if f: + f = os.path.join(self.path, f) + else: + f = self.path + return Command("svn diff %s" % f, self.options).output_of(True) + + def diff_with_tag(self, tagname): + tag_url = "%s/tags/%s" % (self.repo_root(), tagname) + return Command("svn diff %s %s" % (tag_url, self.url()), + self.options).output_of(True) + + def revert(self, f=""): + if f: + Command("svn revert %s" % os.path.join(self.path, f), self.options).run_fatal() + else: + # revert all + Command("svn revert %s -R" % self.path, self.options).run_fatal() + Command("svn status %s | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\\ /g' | xargs rm -rf " % + self.path, self.options).run_silent() def is_clean(self): command="svn status %s" % self.path @@ -168,7 +246,6 @@ class SvnRepository: return os.path.exists(os.path.join(self.path, ".svn")) - class GitRepository: type = "git" @@ -176,38 +253,92 @@ class GitRepository: self.path = path self.options = options + def name(self): + return os.path.basename(self.path) + + def url(self): + self.repo_root() + + def repo_root(self): + c = Command("git remote show origin", self.options) + out = self.__run_in_repo(c.output_of) + for line in out.split('\n'): + if line.strip().startswith("Fetch URL:"): + repo = line.split()[2] + @classmethod - def checkout(cls, remote, path, options, depth=1, recursive=None): - Command("rm -rf %s" % path, options).run_silent() - Command("git clone --depth %d %s %s" % (depth, remote, path), options).run_fatal() - return GitRepository(path, options) + def checkout(cls, remote, local, options, depth=1): + 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): + def tag_exists(self, tagname): + command = 'git tag -l | grep "^%s$"' % tagname + c = Command(command, self.options) + out = self.__run_in_repo(c.output_of, with_stderr=True) + return len(out) > 0 + + def __run_in_repo(self, fun, *args, **kwargs): cwd = os.getcwd() os.chdir(self.path) - ret = fun(*args) + ret = fun(*args, **kwargs) os.chdir(cwd) return ret - def __run_command_in_repo(self, command): + def __run_command_in_repo(self, command, ignore_errors=False): c = Command(command, self.options) - return self.__run_in_repo(c.run_fatal) + if ignore_errors: + return self.__run_in_repo(c.output_of) + else: + return self.__run_in_repo(c.run_fatal) + + def update(self, subdir=None, recursive=None, branch="master"): + if branch == "master": + self.__run_command_in_repo("git checkout %s" % branch) + else: + self.__run_command_in_repo("git checkout origin/%s" % branch) + self.__run_command_in_repo("git fetch origin --tags") + self.__run_command_in_repo("git fetch origin") + self.__run_command_in_repo("git merge --ff origin/%s" % branch) + + def to_branch(self, branch, remote=True): + if remote: + branch = "origin/%s" % branch + return self.__run_command_in_repo("git checkout %s" % branch) - def update(self, recursive=None): - return self.__run_command_in_repo("git pull") + def to_tag(self, tag): + return self.__run_command_in_repo("git checkout %s" % tag) + + def tag(self, tagname, logfile): + self.__run_command_in_repo("git tag %s -F %s" % (tagname, logfile)) + self.commit(logfile) + + def diff(self, f=""): + c = Command("git diff %s" % f, self.options) + return self.__run_in_repo(c.output_of, with_stderr=True) + + def diff_with_tag(self, tagname): + c = Command("git diff %s" % tagname, 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 add .", ignore_errors=True) + self.__run_command_in_repo("git add -u", ignore_errors=True) + self.__run_command_in_repo("git commit -F %s" % logfile, ignore_errors=True) self.__run_command_in_repo("git push") + self.__run_command_in_repo("git push --tags") - def revert(self): - self.__run_command_in_repo("git --no-pager reset --hard") - self.__run_command_in_repo("git --no-pager clean -f") + def revert(self, f=""): + if f: + self.__run_command_in_repo("git checkout %s" % f) + else: + # revert all + 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(): @@ -232,6 +363,14 @@ class Repository: if self.repo.is_valid(): break + @classmethod + def has_moved_to_git(cls, module, config): + module = git_to_svn_name(module) + # check if the module is already in Git +# return SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (config['svnpath'], module)) + return GitRepository.remote_exists(Module.git_remote_dir(module)) + + @classmethod def remote_exists(cls, remote): for repo in Repository.supported_repo_types: @@ -262,17 +401,23 @@ class Module: 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"), + ('gituser', "Enter your user name (login name) on git server", commands.getoutput("id -un")), ("build", "Enter the name of your build module","build"), ('username',"Enter your firstname and lastname for changelogs",""), ("email","Enter your email address for changelogs",""), ] - @staticmethod - def prompt_config (): - for (key,message,default) in Module.configKeys: - Module.config[key]="" - while not Module.config[key]: - Module.config[key]=raw_input("%s [%s] : "%(message,default)).strip() or default + @classmethod + def prompt_config_option(cls, key, message, default): + cls.config[key]=raw_input("%s [%s] : "%(message,default)).strip() or default + + @classmethod + def prompt_config (cls): + for (key,message,default) in cls.configKeys: + cls.config[key]="" + while not cls.config[key]: + cls.prompt_config_option(key, message, default) # for parsing module spec name:branch @@ -296,153 +441,88 @@ class Module: else: self.name=module_spec + # when available prefer to use git module name internally + self.name = svn_to_git_name(self.name) + self.options=options self.module_dir="%s/%s"%(options.workdir,self.name) - - def friendly_name (self): - 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 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/trunk"%(self.module_dir) - - def tags_dir (self): - return "%s/tags"%(self.module_dir) + self.repository = None + self.build = None 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) - #################### - # 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 + def friendly_name (self): + if hasattr(self,'branch'): + return "%s:%s"%(self.name,self.branch) + elif hasattr(self,'tagname'): + return "%s@%s"%(self.name,self.tagname) else: - if not hasattr(self,'in_list') or not self.in_list: - self.html_store_raw('
%s - status on %s at %s
-',self.html_href('#','Back to top'),'
' + @classmethod + def svn_remote_dir (cls, name): + name = git_to_svn_name(name) + svn = cls.config['svnpath'] + if svn.endswith('/'): + return "%s%s" % (svn, name) + return "%s/%s" % (svn, name) + + def svn_selected_remote(self): + svn_name = git_to_svn_name(self.name) + remote = self.svn_remote_dir(svn_name) + if hasattr(self,'branch'): + remote = "%s/branches/%s" % (remote, self.branch) + elif hasattr(self,'tagname'): + remote = "%s/tags/%s" % (remote, self.tagname) + else: + remote = "%s/trunk" % remote + return remote #################### - @staticmethod - def init_homedir (options): - topdir=options.workdir + @classmethod + def init_homedir (cls, options): if options.verbose and options.mode not in Main.silent_modes: - print 'Checking for',topdir - storage="%s/%s"%(topdir,Module.config_storage) + print 'Checking for', options.workdir + storage="%s/%s"%(options.workdir, cls.config_storage) # sanity check. Either the topdir exists AND we have a config/storage # or topdir does not exist and we create it # to avoid people use their own daily svn repo - if os.path.isdir(topdir) and not os.path.isfile(storage): + if os.path.isdir(options.workdir) and not os.path.isfile(storage): print """The directory %s exists and has no CONFIG file If this is your regular working directory, please provide another one as the module-* commands need a fresh working dir. Make sure that you do not use -that for other purposes than tagging"""%topdir +that for other purposes than tagging""" % options.workdir sys.exit(1) - if not os.path.isdir (topdir): - 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 %s/%s %s/%s"%(Module.config['svnpath'], - Module.config['build'], - topdir, - Module.config['build']),options).run_fatal() + + def checkout_build(): + print "Checking out build module..." + remote = cls.git_remote_dir(cls.config['build']) + local = os.path.join(options.workdir, cls.config['build']) + GitRepository.checkout(remote, local, options, depth=1) print "OK" - - # store config + + def store_config(): f=file(storage,"w") for (key,message,default) in Module.configKeys: f.write("%s=%s\n"%(key,Module.config[key])) @@ -450,13 +530,48 @@ that for other purposes than tagging"""%topdir if options.debug: print 'Stored',storage Command("cat %s"%storage,options).run() - else: + + def read_config(): # read config f=open(storage) for line in f.readlines(): (key,value)=re.compile("^(.+)=(.+)$").match(line).groups() Module.config[key]=value f.close() + + if not os.path.isdir (options.workdir): + print "Cannot find",options.workdir,"let's create it" + Command("mkdir -p %s" % options.workdir, options).run_silent() + cls.prompt_config() + checkout_build() + store_config() + else: + read_config() + # check missing config options + old_layout = False + for (key,message,default) in cls.configKeys: + if not Module.config.has_key(key): + print "Configuration changed for module-tools" + cls.prompt_config_option(key, message, default) + old_layout = True + + if old_layout: + Command("rm -rf %s" % options.workdir, options).run_silent() + Command("mkdir -p %s" % options.workdir, options).run_silent() + checkout_build() + store_config() + + build_dir = os.path.join(options.workdir, cls.config['build']) + if not os.path.isdir(build_dir): + checkout_build() + else: + build = Repository(build_dir, options) + if not build.is_clean(): + print "build module needs a revert" + build.revert() + print "OK" + build.update() + if options.verbose and options.mode not in Main.silent_modes: print '******** Using config' for (key,message,default) in Module.configKeys: @@ -465,68 +580,82 @@ that for other purposes than tagging"""%topdir def init_module_dir (self): if self.options.verbose: print 'Checking for',self.module_dir + if not os.path.isdir (self.module_dir): - self.run_fatal("svn update -N %s"%self.module_dir) - if not os.path.isdir (self.module_dir): + if Repository.has_moved_to_git(self.name, Module.config): + self.repository = GitRepository.checkout(self.git_remote_dir(self.name), + self.module_dir, + self.options) + else: + remote = self.svn_selected_remote() + self.repository = SvnRepository.checkout(remote, + self.module_dir, + self.options, recursive=False) + + self.repository = Repository(self.module_dir, self.options) + if self.repository.type == "svn": + # check if module has moved to git + if Repository.has_moved_to_git(self.name, Module.config): + Command("rm -rf %s" % self.module_dir, self.options).run_silent() + self.init_module_dir() + # check if we have the required branch/tag + if self.repository.url() != self.svn_selected_remote(): + Command("rm -rf %s" % self.module_dir, self.options).run_silent() + self.init_module_dir() + + elif self.repository.type == "git": + if hasattr(self,'branch'): + self.repository.to_branch(self.branch) + elif hasattr(self,'tagname'): + self.repository.to_tag(self.tagname) + + else: raise Exception, 'Cannot find %s - check module name'%self.module_dir - 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 %s %s"%(opt,fullpath)) - def revert_subdir (self,fullpath): + def revert_module_dir (self): if self.options.fast_checks: - if self.options.verbose: print 'Skipping revert of %s'%fullpath + if self.options.verbose: print 'Skipping revert of %s' % self.module_dir 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) + print 'Checking whether', self.module_dir, 'needs being reverted' + + if not self.repository.is_clean(): + self.repository.revert() - def update_subdir (self,fullpath): + def update_module_dir (self): if self.options.fast_checks: - if self.options.verbose: print 'Skipping update of %s'%fullpath + if self.options.verbose: print 'Skipping update of %s' % self.module_dir return if self.options.verbose: - print 'Updating',fullpath - self.run_fatal("svn update %s"%fullpath) + print 'Updating', self.module_dir - 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,deep=False) + self.repository.update(branch=self.branch) elif hasattr(self,'tagname'): - 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()) - - def update_edge_dir (self): - self.update_subdir(self.edge_dir()) + self.repository.update(branch=self.tagname) + else: + self.repository.update() def main_specname (self): - attempt="%s/%s.spec"%(self.edge_dir(),self.name) + attempt="%s/%s.spec"%(self.module_dir,self.name) if os.path.isfile (attempt): return attempt - pattern1="%s/*.spec"%self.edge_dir() + pattern1="%s/*.spec"%self.module_dir level1=glob(pattern1) if level1: return level1[0] - pattern2="%s/*/*.spec"%self.edge_dir() + pattern2="%s/*/*.spec"%self.module_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): - level1=glob("%s/*.spec"%self.edge_dir()) + level1=glob("%s/*.spec" % self.module_dir) if level1: return level1 - level2=glob("%s/*/*.spec"%self.edge_dir()) + level2=glob("%s/*/*.spec" % self.module_dir) return level2 def parse_spec (self, specfile, varnames): @@ -652,198 +781,23 @@ that for other purposes than tagging"""%topdir for (k,v) in spec_dict.iteritems(): print k,'=',v - def mod_url (self): - return "%s/%s"%(Module.config['svnpath'],self.name) - - def edge_url (self): - if hasattr(self,'branch'): - return "%s/branches/%s"%(self.mod_url(),self.branch) - elif hasattr(self,'tagname'): - return "%s/tags/%s"%(self.mod_url(),self.tagname) - 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"%(self.name, - self.last_tag(spec_dict)) + return "%s-%s" % (spec_dict[self.module_version_varname], + spec_dict[self.module_taglevel_varname]) 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)) - - 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 self.options.verbose: print 'exists - OK' - else: - if self.options.verbose: print 'KO' - raise Exception, 'Could not find %s URL %s'%(message,url) - - def check_svnpath_not_exists (self, url, message): - if self.options.fast_checks: - return - if self.options.verbose: - print 'Checking url (%s) %s'%(url,message), - ok=not Svnpath(url,self.options).url_exists() - if ok: - if self.options.verbose: print 'does not exist - OK' - else: - if self.options.verbose: print 'KO' - raise Exception, '%s URL %s already exists - exiting'%(message,url) - - # locate specfile, parse it, check it and show values - -############################## - def do_version (self): - 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) - return - else: - self.html_print ("%-16s %s"%(varname,spec_dict[varname])) - if self.options.show_urls: - 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: - 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): -# 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 hasattr(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_module_dir() - self.init_edge_dir() - self.revert_edge_dir() - self.update_edge_dir() - spec_dict = self.spec_dict() + raise Exception,'Something is wrong with module %s, cannot determine %s - exiting'%(self.name,err) - 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_module_dir() - 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: - 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 + def tag_name (self, spec_dict, old_svn_name=False): + base_tag_name = self.name + if old_svn_name: + base_tag_name = git_to_svn_name(self.name) + return "%s-%s" % (base_tag_name, self.last_tag(spec_dict)) + ############################## # using fine_grain means replacing only those instances that currently refer to this tag - # otherwise,< (left) %s
' % tag_name) + self.html_store_raw ('> (right) %s
' % thename) + self.html_store_pre (diff_output) + elif not self.options.www: + print 'x'*30,'module',thename + print 'x'*20,'<',tag_name + print 'x'*20,'>',thename + print diff_output - def get_distrotags (self): - return [os.path.basename(p) for p in glob("%s/*tags*mk"%self.edge_dir())] +############################## + # store and restitute html fragments + @staticmethod + def html_href (url,text): return '%s'%(url,text) -class DiffCache: + @staticmethod + def html_anchor (url,text): return '%s'%(url,text) - def __init__ (self): - self._cache={} + @staticmethod + def html_quote (text): + return text.replace('&','&').replace('<','<').replace('>','>') - def key(self, frompath,topath): - return frompath+'-to-'+topath + # 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 fetch (self, frompath, topath): - key=self.key(frompath,topath) - if not self._cache.has_key(key): - return None - return self._cache[key] + def html_store_raw (self, html): + if not hasattr(self,'body'): self.body='' + self.body += html - def store (self, frompath, topath, diff): - key=self.key(frompath,topath) - self._cache[key]=diff + def html_store_pre (self, text): + if not hasattr(self,'body'): self.body='' + self.body += '' + self.html_quote(text) + '' -class Release: + 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('
%s - status on %s at %s
+',self.html_href('#','Back to top'),'
' + ############################## class Main: @@ -1434,17 +1223,8 @@ Branches: usage = Main.release_usage usage += Main.common_usage - parser=OptionParser(usage=usage,version=subversion_id) + parser=OptionParser(usage=usage) - 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") @@ -1456,34 +1236,25 @@ Branches: 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 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") - - if mode == 'version': - parser.add_option("-u","--url", action="store_true", dest="show_urls", default=False, - help="display URLs") default_modules_list=os.path.dirname(sys.argv[0])+"/modules.list" - if mode not in Main.release_modes: - parser.add_option("-a","--all",action="store_true",dest="all_modules",default=False, - help="run on all modules as found in %s"%default_modules_list) - parser.add_option("-f","--file",action="store",dest="modules_list",default=None, - help="run on all modules found in specified file") - 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 + parser.add_option("-a","--all",action="store_true",dest="all_modules",default=False, + help="run on all modules as found in %s"%default_modules_list) + parser.add_option("-f","--file",action="store",dest="modules_list",default=None, + help="run on all modules found in specified file") + 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", @@ -1502,8 +1273,6 @@ Branches: else: parser.add_option("-q","--quiet", action="store_false", dest="verbose", default=True, help="run in quiet (non-verbose) mode") -# parser.add_option("-d","--debug", action="store_true", dest="debug", default=False, -# help="debug mode - mostly more verbose") (options, args) = parser.parse_args() options.mode=mode if not hasattr(options,'dry_run'): @@ -1512,63 +1281,53 @@ Branches: options.www=False options.debug=False - ########## release-* - if mode in Main.release_modes : - ########## changelog - if len(args) <= 1: + ########## module-* + if len(args) == 0: + if options.all_modules: + options.modules_list=default_modules_list + if options.modules_list: + args=Command("grep -v '#' %s"%options.modules_list,options).output_of().split() + else: parser.print_help() sys.exit(1) - Module.init_homedir(options) - for n in range(len(args)-1): - [t_new,t_old]=args[n:n+2] - Release.do_changelog (t_new,t_old,options) - else: - ########## module-* - if len(args) == 0: - if options.all_modules: - options.modules_list=default_modules_list - if options.modules_list: - args=Command("grep -v '#' %s"%options.modules_list,options).output_of().split() - else: - parser.print_help() - sys.exit(1) - Module.init_homedir(options) + Module.init_homedir(options) + - # 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) + 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: + for module in modules: + if len(args)>1 and mode not in Main.silent_modes: + if not options.www: print '========================================',module.friendly_name() - # call the method called do_