X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=70e2d1022673db5eb8921450db49fab99be4b94b;hb=449af2d7054ff48220e99b0df0ffe699e2b7805b;hp=cee125a92618a7688306d46f0f2bd38ceb6c4ae0;hpb=f672b73e678d5257993cac2f1ebc4a36511901f1;p=build.git diff --git a/module-tools.py b/module-tools.py index cee125a9..70e2d102 100755 --- a/module-tools.py +++ b/module-tools.py @@ -1,13 +1,32 @@ #!/usr/bin/python -u -subversion_id = "$Id$" - 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" + } + +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,11 +149,24 @@ class SvnRepository: 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) + 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, local, options, recursive=False): if recursive: svncommand = "svn co %s %s" % (remote, local) else: @@ -148,6 +180,10 @@ class SvnRepository: def remote_exists(cls, remote): return os.system("svn list %s &> /dev/null" % remote) == 0 + def tag_exists(self, tagname): + url = "%s/tags/%s" % (self.repo_root(), tagname) + return SvnRepository.remote_exists(url) + def update(self, subdir="", recursive=True): path = os.path.join(self.path, subdir) if recursive: @@ -159,19 +195,42 @@ class SvnRepository: 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 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 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(self): - return Command("svn diff %s" % self.path, 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): - Command("svn revert %s -R" % self.path, self.options).run_fatal() + 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 @@ -181,7 +240,6 @@ class SvnRepository: return os.path.exists(os.path.join(self.path, ".svn")) - class GitRepository: type = "git" @@ -189,20 +247,35 @@ class GitRepository: 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) + 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, 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 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) @@ -210,30 +283,52 @@ class GitRepository: 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): - return self.__run_command_in_repo("git pull") + 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/master") def to_branch(self, branch, remote=True): if remote: branch = "origin/%s" % branch - self.__run_command_in_repo("git checkout %s" % branch) + return self.__run_command_in_repo("git checkout %s" % branch) - def diff(self): - c = Command("git diff", self.options) + 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(): @@ -260,7 +355,11 @@ class Repository: @classmethod def has_moved_to_git(cls, module, config): - return SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (config['svnpath'], module)) + 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): @@ -293,17 +392,22 @@ class Module: 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 @@ -327,30 +431,14 @@ 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) self.repository = None self.build = None - 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) - def run (self,command): return Command(command,self.options).run() def run_fatal (self,command): @@ -370,32 +458,61 @@ class Module: if prompt(question,True): fun(*args) + 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 + + @classmethod + def git_remote_dir (cls, name): + return "%s@%s:/git/%s.git" % (cls.config['gituser'], cls.config['gitserver'], name) + + @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 ...", - GitRepository.checkout(Module.config['build'], Module.config, - options, depth=1) + + 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])) @@ -403,13 +520,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: @@ -421,75 +573,73 @@ that for other purposes than tagging"""%topdir 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) + self.repository = GitRepository.checkout(self.git_remote_dir(self.name), + self.module_dir, + self.options) else: - self.repository = SvnRepository.checkout(self.name, Module.config, + 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: - try: - self.repository = Repository(self.module_dir, self.options) - except: - raise Exception, 'Cannot find %s - check module name'%self.module_dir + 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', path - if not os.path.isdir(path): - self.repository.update(recursive=recursive, subdir=subdir) - 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' + print 'Checking whether', self.module_dir, 'needs being reverted' - repo=Repository(fullpath, self.options) - if not repo.is_clean(): - repo.revert() + 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 - Repository(fullpath, self.options).update() - - 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,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()) - - def update_edge_dir (self): - self.update_subdir(self.edge_dir()) + print 'Updating', self.module_dir + 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): @@ -615,60 +765,23 @@ that for other purposes than tagging"""%topdir for (k,v) in spec_dict.iteritems(): print k,'=',v - def mod_svn_url (self): - return "%s/%s"%(Module.config['svnpath'],self.name) - - def edge_url (self): - 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/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"%(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_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), - - if SvnRepository.remote_exists(url): - 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), - - if not SvnRepository.remote_exists(url): - 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 + raise Exception,'Something is wrong with module %s, cannot determine %s - exiting'%(self.name,err) + 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, -SVNPATH is replaced unconditionnally + # otherwise, -{SVNPATH,GITPATH} is replaced unconditionnally def patch_tags_file (self, tagsfile, oldname, newname,fine_grain=True): newtagsfile=tagsfile+".new" tags=open (tagsfile) @@ -690,17 +803,21 @@ that for other purposes than tagging"""%topdir # brute-force : change uncommented lines that define -SVNPATH else: if self.options.verbose: - 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]+"\ + print 'Searching for -SVNPATH or -GITPATH lines referring to /%s/\n\tin %s .. '%(self.name,tagsfile), + pattern="\A\s*(?P[^\s]+)-(SVNPATH|GITPATH)\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"%(attempt.group('make_name')) + if line.find("-GITPATH") >= 0: + modulepath = "%s-GITPATH"%(attempt.group('make_name')) + replacement = "%-32s:= %s/%s.git@%s\n"%(modulepath,attempt.group('url_main'),self.name,newname) + else: + modulepath = "%s-SVNPATH"%(attempt.group('make_name')) + replacement = "%-32s:= %s/%s/tags/%s\n"%(modulepath,attempt.group('url_main'),self.name,newname) if self.options.verbose: - print ' '+svnpath, - replacement = "%-32s:= %s/%s/tags/%s\n"%(svnpath,attempt.group('url_main'),self.name,newname) + print ' ' + modulepath, new.write(replacement) matches += 1 else: @@ -711,19 +828,49 @@ that for other purposes than tagging"""%topdir if self.options.verbose: print "%d changes"%matches return matches + def check_tag(self, tagname, need_it=False, old_svn_tag_name=None): + if self.options.verbose: + print "Checking %s repository tag: %s - " % (self.repository.type, tagname), + + found_tagname = tagname + found = self.repository.tag_exists(tagname) + if not found and old_svn_tag_name: + if self.options.verbose: + print "KO" + print "Checking %s repository tag: %s - " % (self.repository.type, old_svn_tag_name), + found = self.repository.tag_exists(old_svn_tag_name) + if found: + found_tagname = old_svn_tag_name + + if (found and need_it) or (not found and not need_it): + if self.options.verbose: + print "OK", + if found: print "- found" + else: print "- not found" + else: + if self.options.verbose: + print "KO" + if found: + raise Exception, "tag (%s) is already there" % tagname + else: + raise Exception, "can not find required tag (%s)" % tagname + + return found_tagname + + +############################## def do_tag (self): self.init_module_dir() - self.init_edge_dir() - self.revert_edge_dir() - self.update_edge_dir() + self.revert_module_dir() + self.update_module_dir() # parse specfile spec_dict = self.spec_dict() self.show_dict(spec_dict) # side effects - edge_url=self.edge_url() old_tag_name = self.tag_name(spec_dict) - old_tag_url=self.tag_url(spec_dict) + old_svn_tag_name = self.tag_name(spec_dict, old_svn_name=True) + if (self.options.new_version): # new version set on command line spec_dict[self.module_version_varname] = self.options.new_version @@ -733,16 +880,14 @@ that for other purposes than tagging"""%topdir new_taglevel = str ( int (spec_dict[self.module_taglevel_varname]) + 1) spec_dict[self.module_taglevel_varname] = new_taglevel - # sanity check new_tag_name = self.tag_name(spec_dict) - new_tag_url=self.tag_url(spec_dict) - self.check_svnpath_exists (edge_url,"edge track") - self.check_svnpath_exists (old_tag_url,"previous tag") - self.check_svnpath_not_exists (new_tag_url,"new tag") + + # sanity check + old_tag_name = self.check_tag(old_tag_name, need_it=True, old_svn_tag_name=old_svn_tag_name) + new_tag_name = self.check_tag(new_tag_name, need_it=False) # checking for diffs - diff_output=Command("svn diff %s %s"%(old_tag_url,edge_url), - self.options).output_of() + diff_output = self.repository.diff_with_tag(old_tag_name) if len(diff_output) == 0: if not prompt ("No pending difference in module %s, want to tag anyway"%self.name,False): return @@ -784,7 +929,9 @@ Please write a changelog for this new tag in the section above build = Repository(build_path, self.options) if self.options.build_branch: build.to_branch(self.options.build_branch) - + if not build.is_clean(): + build.revert() + tagsfiles=glob(build.path+"/*-tags*.mk") tagsdict=dict( [ (x,'todo') for x in tagsfiles ] ) default_answer = 'y' @@ -807,14 +954,14 @@ Please write a changelog for this new tag in the section above elif choice == 'f': self.patch_tags_file(tagsfile,old_tag_name,new_tag_name,fine_grain=False) elif choice == 'd': - self.run("svn diff %s"%tagsfile) + print build.diff(f=tagsfile) elif choice == 'r': - self.run("svn revert %s"%tagsfile) + build.revert(f=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 + print """y: change %(name)s-{SVNPATH,GITPATH} only if it currently refers to %(old_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 @@ -837,15 +984,154 @@ n: move to next file"""%locals() 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) + self.run_prompt("Create tag", self.repository.tag, new_tag_name, changelog_svn) if self.options.debug: print 'Preserving',changelog,'and stripped',changelog_svn else: os.unlink(changelog) os.unlink(changelog_svn) - + + +############################## + def do_version (self): + self.init_module_dir() + self.revert_module_dir() + self.update_module_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.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_diff (self): + self.init_module_dir() + self.revert_module_dir() + self.update_module_dir() + spec_dict = self.spec_dict() + self.show_dict(spec_dict) + + # side effects + tag_name = self.tag_name(spec_dict) + old_svn_tag_name = self.tag_name(spec_dict, old_svn_name=True) + + # sanity check + tag_name = self.check_tag(tag_name, need_it=True, old_svn_tag_name=old_svn_tag_name) + + if self.options.verbose: + print 'Getting diff' + diff_output = self.repository.diff_with_tag(tag_name) + + 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))) + + self.html_store_raw ('

< (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 + +############################## + # 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) + + @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('
    ') + self.in_list=True + self.html_store_raw('
  • '+txt+'
    • ') + + def html_print_end (self): + if self.options.www: + self.html_store_raw ('
') + + @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'),'

' + ############################## class Main: @@ -921,7 +1207,7 @@ Branches: usage = Main.release_usage usage += Main.common_usage - parser=OptionParser(usage=usage,version=subversion_id) + parser=OptionParser(usage=usage) if mode == "tag" or mode == 'branch': parser.add_option("-s","--set-version",action="store",dest="new_version",default=None, @@ -934,8 +1220,20 @@ Branches: if mode == "tag" or mode == "sync" : parser.add_option("-e","--editor", action="store", dest="editor", default=default_editor(), help="specify editor") + + 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") default_modules_list=os.path.dirname(sys.argv[0])+"/modules.list" + 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", @@ -969,22 +1267,51 @@ Branches: ########## module-* if len(args) == 0: - parser.print_help() - sys.exit(1) + 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) + modules=[ Module(modname,options) for modname in args ] + # hack: create a dummy Module to store errors/warnings + error_module = Module('__errors__',options) + for module in modules: if len(args)>1 and mode not in Main.silent_modes: - print '========================================',module.friendly_name() + if not options.www: + print '========================================',module.friendly_name() # call the method called do_ method=Module.__dict__["do_%s"%mode] try: method(module) except Exception,e: - import traceback - traceback.print_exc() - print 'Skipping module %s: '%modname,e + if options.www: + title=' Skipping module %s - failure: %s '%\ + (module.friendly_name(), str(e)) + error_module.html_store_title(title) + else: + import traceback + traceback.print_exc() + print 'Skipping module %s: '%modname,e + + 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__" :