X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=3ddfb6da9b485813a5afeb94c915541e3cbbfeca;hb=6719939f372ab2089ba5fda311eac9db9be50657;hp=1afe04e2d4abcfd49407cb1d850599cd57cb7020;hpb=c12a8ed6c6af1f59940b3538bdb0d3b945915114;p=build.git diff --git a/module-tools.py b/module-tools.py index 1afe04e2..3ddfb6da 100755 --- a/module-tools.py +++ b/module-tools.py @@ -3,6 +3,7 @@ import sys, os import re import time +import tempfile from glob import glob from optparse import OptionParser @@ -261,6 +262,11 @@ class GitRepository: def url(self): return self.repo_root() + def gitweb(self): + c = Command("git show | grep commit | awk '{print $2;}'", self.options) + out = self.__run_in_repo(c.output_of).strip() + return "http://git.onelab.eu/?p=%s.git;a=commit;h=%s" % (self.name(), out) + def repo_root(self): c = Command("git remote show origin", self.options) out = self.__run_in_repo(c.output_of) @@ -437,7 +443,6 @@ class Module: while not cls.config[key]: cls.prompt_config_option(key, message, default) - # for parsing module spec name:branch matcher_branch_spec=re.compile("\A(?P[\w\.-]+):(?P[\w\.-]+)\Z") # special form for tagged module - for Build @@ -445,19 +450,34 @@ class Module: # parsing specfiles matcher_rpm_define=re.compile("%(define|global)\s+(\S+)\s+(\S*)\s*") - def __init__ (self,module_spec,options): - # parse module spec + @classmethod + def parse_module_spec(cls, module_spec): + name = branch_or_tagname = module_type = "" + attempt=Module.matcher_branch_spec.match(module_spec) if attempt: - self.name=attempt.group('name') - self.branch=attempt.group('branch') + module_type = "branch" + name=attempt.group('name') + branch_or_tagname=attempt.group('branch') else: attempt=Module.matcher_tag_spec.match(module_spec) if attempt: - self.name=attempt.group('name') - self.tagname=attempt.group('tagname') + module_type = "tag" + name=attempt.group('name') + branch_or_tagname=attempt.group('tagname') else: - self.name=module_spec + name=module_spec + return name, branch_or_tagname, module_type + + + def __init__ (self,module_spec,options): + # parse module spec + self.name, branch_or_tagname, module_type = self.parse_module_spec(module_spec) + + if module_type == "branch": + self.branch=branch_or_tagname + elif module_type == "tag": + self.tagname=branch_or_tagname # when available prefer to use git module name internally self.name = svn_to_git_name(self.name) @@ -623,6 +643,7 @@ that for other purposes than tagging""" % options.workdir elif self.repository.type == "git": if hasattr(self,'branch'): + print "to branch", self.branch self.repository.to_branch(self.branch) elif hasattr(self,'tagname'): self.repository.to_tag(self.tagname) @@ -1171,6 +1192,115 @@ span.error {text-weight:bold; color: red; } print '

',self.html_href('#','Back to top'),'

' + +class Build(Module): + + def __get_modules(self, tagfile): + self.init_module_dir() + modules = {} + + tagfile = os.path.join(self.module_dir, tagfile) + for line in open(tagfile): + try: + name, url = line.split(':=') + name, git_or_svn_path = name.rsplit('-', 1) + modules[name.strip()] = (git_or_svn_path.strip(), url.strip()) + except: + pass + return modules + + def get_modules(self, tagfile): + modules = self.__get_modules(tagfile) + for module in modules: + module_type = tag_or_branch = "" + + path_type, url = modules[module] + if path_type == "GITPATH": + module_spec = os.path.split(url)[-1].replace(".git","") + name, tag_or_branch, module_type = self.parse_module_spec(module_spec) + else: + tag_or_branch = os.path.split(url)[-1].strip() + if url.find('/tags/') >= 0: + module_type = "tag" + elif url.find('/branches/') >= 0: + module_type = "branch" + + modules[module] = {"module_type" : module_type, + "path_type": path_type, + "tag_or_branch": tag_or_branch, + "url":url} + return modules + + + +def modules_diff(first, second): + diff = {} + + for module in first: + if first[module]['tag_or_branch'] != second[module]['tag_or_branch']: + diff[module] = (first[module]['tag_or_branch'], second[module]['tag_or_branch']) + + first_set = set(first.keys()) + second_set = set(second.keys()) + + new_modules = list(second_set - first_set) + removed_modules = list(first_set - second_set) + + return diff, new_modules, removed_modules + +def release_changelog(options, buildtag_old, buildtag_new, tagfile): + + print '= build tag %s to %s =' % (buildtag_old, buildtag_new) + print '== distro %s (%s to %s) ==' % (tagfile, buildtag_old, buildtag_new) + + build = Build("build@%s" % buildtag_old, options) + build.init_module_dir() + first = build.get_modules(tagfile) + + print '* from', buildtag_old, build.repository.gitweb() + + build = Build("build@%s" % buildtag_new, options) + build.init_module_dir() + second = build.get_modules(tagfile) + + print '* to', buildtag_new, build.repository.gitweb() + + diff, new_modules, removed_modules = modules_diff(first, second) + + for module in diff: + + print '=== %s - %s to %s : package %s ===' % (tagfile, buildtag_old, buildtag_new, module) + + first, second = diff[module] + m = Module("%s@%s" % (module, first), options) + os.system('rm -rf %s' % m.module_dir) + m.init_module_dir() + + print '* from', first, m.repository.gitweb() + + specfile = m.main_specname() + (tmpfd, tmpfile) = tempfile.mkstemp() + os.system("cp -f /%s %s" % (specfile, tmpfile)) + + m = Module("%s@%s" % (module, second), options) + m.init_module_dir() + specfile = m.main_specname() + + print '* to', second, m.repository.gitweb() + + print '{{{' + os.system("diff -u %s %s" % (tmpfile, specfile)) + print '}}}' + + os.unlink(tmpfile) + + for module in new_modules: + print '=== %s : new package in build %s ===' % (tagfile, module) + + for module in removed_modules: + print '=== %s : removed package from build %s ===' % (tagfile, module) + + ############################## class Main: @@ -1315,42 +1445,46 @@ Branches: 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) + if mode not in Main.release_modes: + 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: - 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: - 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 len(args)>1 and mode not in Main.silent_modes: + 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: + 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() + else: + release_changelog(options, *args) + + #################### if __name__ == "__main__" : try: