X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=189e383746b5cb88f54d2fcf0bad9e0637561c01;hb=f5cab4881fdf442e53eca4b697753f440e937e00;hp=e0cf838017be4f264747d79fcd1e0127f37e7178;hpb=2af4c64f98ea223613e8864419576d65aef39b34;p=build.git diff --git a/module-tools.py b/module-tools.py index e0cf8380..189e3837 100755 --- a/module-tools.py +++ b/module-tools.py @@ -11,7 +11,16 @@ from optparse import OptionParser # 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" + "PLEWWW": "plewww", + "PLCAPI": "plcapi", + "BootManager": "bootmanager", + "BootCD": "bootcd", + "VserverReference": "vserver-reference", + "BootstrapFS": "bootstrapfs", + "MyPLC": "myplc", + "CoDemux": "codemux", + "NodeManager": "nodemanager", + "NodeUpdate": "nodeupdate" } def svn_to_git_name(module): @@ -183,7 +192,7 @@ class SvnRepository: url = "%s/tags/%s" % (self.repo_root(), tagname) return SvnRepository.remote_exists(url) - def update(self, subdir="", recursive=True): + def update(self, subdir="", recursive=True, branch=None): path = os.path.join(self.path, subdir) if recursive: svncommand = "svn up %s" % path @@ -194,7 +203,7 @@ 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 to_branch(self, branch): @@ -260,7 +269,7 @@ class GitRepository: repo = line.split()[2] @classmethod - def checkout(cls, remote, local, options, depth=1): + def checkout(cls, remote, local, options, depth=0): 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) @@ -289,16 +298,34 @@ class GitRepository: else: return self.__run_in_repo(c.run_fatal) - def update(self, subdir=None, recursive=None): - self.__run_command_in_repo("git pull") - self.__run_command_in_repo("git pull --tags") + def __is_commit_id(self, id): + c = Command("git show %s | grep commit | awk '{print $2;}'" % id, self.options) + ret = self.__run_in_repo(c.output_of, with_stderr=False) + if ret.strip() == id: + return True + return False + + def update(self, subdir=None, recursive=None, branch="master"): + if branch == "master": + self.__run_command_in_repo("git checkout %s" % branch) + else: + self.to_branch(branch, remote=True) + self.__run_command_in_repo("git fetch origin --tags") + self.__run_command_in_repo("git fetch origin") + if not self.__is_commit_id(branch): + # we don't need to merge anythign for commit ids. + self.__run_command_in_repo("git merge --ff origin/%s" % branch) def to_branch(self, branch, remote=True): + self.revert() if remote: - branch = "origin/%s" % branch + command = "git branch --track %s origin/%s" % (branch, branch) + c = Command(command, self.options) + self.__run_in_repo(c.output_of, with_stderr=True) return self.__run_command_in_repo("git checkout %s" % branch) def to_tag(self, tag): + self.revert() return self.__run_command_in_repo("git checkout %s" % tag) def tag(self, tagname, logfile): @@ -313,10 +340,14 @@ class GitRepository: 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", ignore_errors=True) + def commit(self, logfile, branch="master"): + 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") + if branch == "master" or self.__is_commit_id(branch): + self.__run_command_in_repo("git push") + else: + self.__run_command_in_repo("git push origin %s:%s" % (branch, branch)) self.__run_command_in_repo("git push --tags") def revert(self, f=""): @@ -351,9 +382,12 @@ class Repository: break @classmethod - def has_moved_to_git(cls, module, svnpath): - module = git_to_svn_name(module) - return SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (svnpath, module)) + def has_moved_to_git(cls, module, config): + module = svn_to_git_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): @@ -386,7 +420,7 @@ 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", os.getlogin()), + ('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",""), @@ -566,7 +600,7 @@ that for other purposes than tagging""" % options.workdir print 'Checking for',self.module_dir if not os.path.isdir (self.module_dir): - if Repository.has_moved_to_git(self.name, Module.config['svnpath']): + 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) @@ -579,7 +613,7 @@ that for other purposes than tagging""" % options.workdir 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['svnpath']): + 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 @@ -613,7 +647,13 @@ that for other purposes than tagging""" % options.workdir return if self.options.verbose: print 'Updating', self.module_dir - self.repository.update() + + if hasattr(self,'branch'): + self.repository.update(branch=self.branch) + elif hasattr(self,'tagname'): + self.repository.update(branch=self.tagname) + else: + self.repository.update() def main_specname (self): attempt="%s/%s.spec"%(self.module_dir,self.name) @@ -775,7 +815,7 @@ that for other purposes than tagging""" % options.workdir ############################## # 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) @@ -797,17 +837,21 @@ that for other purposes than tagging""" % options.workdir # 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: @@ -951,7 +995,7 @@ Please write a changelog for this new tag in the section above 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 @@ -969,7 +1013,10 @@ n: move to next file"""%locals() print self.repository.diff() def commit_all_changes(log): - self.repository.commit(log) + if hasattr(self,'branch'): + self.repository.commit(log, branch=self.branch) + else: + self.repository.commit(log) build.commit(log) self.run_prompt("Review module and build", diff_all_changes) @@ -1273,7 +1320,8 @@ Branches: 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: