X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=1239c2f8296cc98badcab1590f19566ea74028e6;hb=fe9a5b3d9762c6626d9d8cb82390a07a855ec150;hp=3f98391053a07f8723b1ea78f40a55d3c06caa24;hpb=f4c84b8465778e6c1fa2765704b67b6ba0d43713;p=build.git

diff --git a/module-tools.py b/module-tools.py
index 3f983910..1239c2f8 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -u
 
-import sys, os
+import sys, os, os.path
 import re
 import time
 import tempfile
@@ -16,14 +16,11 @@ RENAMED_SVN_MODULES = {
     "PLCAPI": "plcapi",
     "BootManager": "bootmanager",
     "BootCD": "bootcd",
-    "VserverReference": "vserver-reference",
-    "BootstrapFS": "bootstrapfs",
     "MyPLC": "myplc",
     "CoDemux": "codemux",
     "NodeManager": "nodemanager",
     "NodeUpdate": "nodeupdate",
     "Monitor": "monitor",
-
     }
 
 def svn_to_git_name(module):
@@ -272,7 +269,7 @@ class GitRepository:
     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.pathname(), out)
+        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)
@@ -417,7 +414,7 @@ class Repository:
 # 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--"
+    edit_magic_line="--This line, and those below, will be ignored--"
     setting_tag_format = "Setting tag %s"
     
     redirectors=[ # ('module_name_varname','name'),
@@ -787,7 +784,7 @@ that for other purposes than tagging""" % options.workdir
         result=[]
         white_line_matcher = re.compile("\A\s*\Z")
         for logline in file(logfile).readlines():
-            if logline.strip() == Module.svn_magic_line:
+            if logline.strip() == Module.edit_magic_line:
                 break
             elif white_line_matcher.match(logline):
                 continue
@@ -796,7 +793,7 @@ that for other purposes than tagging""" % options.workdir
         return result
 
     # creates a copy of the input with only the unignored lines
-    def stripped_magic_line_filename (self, filein, fileout ,new_tag_name):
+    def strip_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):
@@ -958,36 +955,36 @@ that for other purposes than tagging""" % options.workdir
             if not prompt ("No pending difference in module %s, want to tag anyway"%self.pathname,False):
                 return
 
-        # side effect in trunk's specfile
+        # side effect in head's specfile
         self.patch_spec_var(spec_dict)
 
         # prepare changelog file 
-        # we use the standard subversion magic string (see svn_magic_line)
+        # we use the standard subversion magic string (see edit_magic_line)
         # so we can provide useful information, such as version numbers and diff
         # in the same file
-        changelog="/tmp/%s-%d.edit"%(self.name,os.getpid())
-        changelog_svn="/tmp/%s-%d.svn"%(self.name,os.getpid())
+        changelog_plain="/tmp/%s-%d.edit"%(self.name,os.getpid())
+        changelog_strip="/tmp/%s-%d.strip"%(self.name,os.getpid())
         setting_tag_line=Module.setting_tag_format%new_tag_name
-        file(changelog,"w").write("""
+        file(changelog_plain,"w").write("""
 %s
 %s
 Please write a changelog for this new tag in the section above
-"""%(Module.svn_magic_line,setting_tag_line))
+"""%(Module.edit_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)
+            file(changelog_plain,"a").write('DIFF=========\n' + diff_output)
         
         if self.options.debug:
             prompt('Proceed ?')
 
         # edit it        
-        self.run("%s %s"%(self.options.editor,changelog))
+        self.run("%s %s"%(self.options.editor,changelog_plain))
         # 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)
+        self.strip_magic_line_filename(changelog_plain,changelog_strip,new_tag_name)
         # insert changelog in spec
         if self.options.changelog:
-            self.insert_changelog (changelog,old_tag_name,new_tag_name)
+            self.insert_changelog (changelog_plain,old_tag_name,new_tag_name)
 
         ## update build
         build_path = os.path.join(self.options.workdir,
@@ -1052,14 +1049,14 @@ n: move to next file"""%locals()
             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)
-        self.run_prompt("Create tag", self.repository.tag, new_tag_name, changelog_svn)
+        self.run_prompt("Commit module and build", commit_all_changes, changelog_strip)
+        self.run_prompt("Create tag", self.repository.tag, new_tag_name, changelog_strip)
 
         if self.options.debug:
-            print 'Preserving',changelog,'and stripped',changelog_svn
+            print 'Preserving',changelog_plain,'and stripped',changelog_strip
         else:
-            os.unlink(changelog)
-            os.unlink(changelog_svn)
+            os.unlink(changelog_plain)
+            os.unlink(changelog_strip)
 
 
 ##############################
@@ -1265,27 +1262,38 @@ def modules_diff(first, second):
 
 def release_changelog(options, buildtag_old, buildtag_new):
 
-    tagfile = options.distrotags[0]
-    if not tagfile:
-        print "ERROR: provide a tagfile name (eg. onelab, onelab-k27, planetlab)"
+    # the command line expects new old, so we treat the tagfiles in the same order
+    nb_tags=len(options.distrotags)
+    if nb_tags==1:
+        tagfile_new=tagfile_old=options.distrotags[0]
+    elif nb_tags==2:
+        [tagfile_new,tagfile_old]=options.distrotags
+    else:
+        print "ERROR: provide one or two tagfile name (eg. onelab-k32-tags.mk)"
+        print "two tagfiles can be mentioned when a tagfile has been renamed"
         return
-    tagfile = "%s-tags.mk" % tagfile
-    
+
+    if options.dry_run:
+        print "------------------------------ Computing Changelog from"
+        print "buildtag_old",buildtag_old,"tagfile_old",tagfile_old
+        print "buildtag_new",buildtag_new,"tagfile_new",tagfile_new
+        return
+
     print '----'
     print '----'
     print '----'
     print '= build tag %s to %s =' % (buildtag_old, buildtag_new)
-    print '== distro %s (%s to %s) ==' % (tagfile, buildtag_old, buildtag_new)
+    print '== distro %s (%s to %s) ==' % (tagfile_new, buildtag_old, buildtag_new)
 
     build = Build("build@%s" % buildtag_old, options)
     build.init_module_dir()
-    first = build.get_modules(tagfile)
+    first = build.get_modules(tagfile_old)
 
     print ' * from', buildtag_old, build.repository.gitweb()
 
     build = Build("build@%s" % buildtag_new, options)
     build.init_module_dir()
-    second = build.get_modules(tagfile)
+    second = build.get_modules(tagfile_new)
 
     print ' * to', buildtag_new, build.repository.gitweb()
 
@@ -1300,7 +1308,7 @@ def release_changelog(options, buildtag_old, buildtag_new):
 
 
     for module in diff:
-        print '=== %s - %s to %s : package %s ===' % (tagfile, buildtag_old, buildtag_new, module)
+        print '=== %s - %s to %s : package %s ===' % (tagfile_new, buildtag_old, buildtag_new, module)
 
         first, second = diff[module]
         m = get_module(module, first)
@@ -1326,19 +1334,19 @@ def release_changelog(options, buildtag_old, buildtag_new):
             print ' * to', second, m.repository.gitweb()
 
         print '{{{'
-        os.system("diff -u %s %s" % (tmpfile, specfile))
+        os.system("diff -u %s %s | sed -e 's,%s,[[previous version]],'" % (tmpfile, specfile,tmpfile))
         print '}}}'
 
         os.unlink(tmpfile)
 
     for module in new_modules:
-        print '=== %s : new package in build %s ===' % (tagfile, module)
+        print '=== %s : new package in build %s ===' % (tagfile_new, module)
 
     for module in removed_modules:
-        print '=== %s : removed package from build %s ===' % (tagfile, module)
+        print '=== %s : removed package from build %s ===' % (tagfile_new, module)
 
 
-def adopt_master (options, args):
+def adopt_tag (options, args):
     modules=[]
     for module in options.modules:
         modules += module.split()
@@ -1346,8 +1354,8 @@ def adopt_master (options, args):
         modobj=Module(module,options)
         for tags_file in args:
             if options.verbose:
-                print 'adopting master for',module,'in',tags_file
-            modobj.patch_tags_file(tags_file,'_unused_','master',fine_grain=False)
+                print 'adopting tag %s for %s in %s'%(options.tag,module,tags_file)
+            modobj.patch_tags_file(tags_file,'_unused_',options.tag,fine_grain=False)
     if options.verbose:
         Command("git diff %s"%" ".join(args),options).run()
 
@@ -1361,11 +1369,11 @@ module-tools : a set of tools to manage subversion tags and specfile
   * define *version* and *taglevel*
   OR alternatively 
   * define redirection variables module_version_varname / module_taglevel_varname
-Trunk:
-  by default, the trunk of modules is taken into account
+Master:
+  by default, the 'master' branch of modules is the target
   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, 
+  if you wish to work on another branch, 
   you can use something like e.g. Mom:2.1 as <module_desc>
 """
     release_usage="""Usage: %prog [options] tag1 .. tagn
@@ -1376,12 +1384,15 @@ Branches:
       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
+  You can use 2 different tagfile names if that was renamed meanwhile
+      release-changelog -t onelab-tags.mk 5.0-rc29 -t onelab-k32-tags.mk 5.0-rc28
 """
-    master_usage="""Usage: %prog [options] tag-file[s]
-  With this command you can adopt one or several masters in your tag files
+    adopt_usage="""Usage: %prog [options] tag-file[s]
+  With this command you can adopt a specifi tag or branch in your tag files
     This should be run in your daily build workdir; no call of git nor svn is done
   Examples:
-    module-master -m "plewww plcapi" -m Monitor onelab*tags.mk
+    adopt-tag -m "plewww plcapi" -m Monitor onelab*tags.mk
+    adopt-tag -m sfa -t sfa-1.0-33 *tags.mk
 """
     common_usage="""More help:
   see http://svn.planet-lab.org/wiki/ModuleTools"""
@@ -1399,13 +1410,13 @@ Branches:
                 this is a last resort option, mostly for repairs""",
         'changelog' : """extract changelog between build tags
                 expected arguments are a list of tags""",
-        'master' : """locally adopt master or trunk for some modules""",
+        'adopt' : """locally adopt a specific tag""",
         }
 
     silent_modes = ['list']
     # 'changelog' is for release-changelog
-    # 'master' is for 'adopt-master'
-    regular_modes = set(modes.keys()).difference(set(['changelog','master']))
+    # 'adopt' is for 'adopt-tag'
+    regular_modes = set(modes.keys()).difference(set(['changelog','adopt']))
 
     @staticmethod
     def optparse_list (option, opt, value, parser):
@@ -1417,7 +1428,8 @@ Branches:
     def run(self):
 
         mode=None
-        for function in Main.modes.keys():
+        # hack - need to check for adopt first as 'adopt-tag' contains tag..
+        for function in [ 'adopt' ] + Main.modes.keys():
             if sys.argv[0].find(function) >= 0:
                 mode = function
                 break
@@ -1434,26 +1446,28 @@ Branches:
         elif mode=='changelog':
             usage = Main.release_usage
             usage += Main.common_usage
-        elif mode=='master':
-            usage = Main.master_usage
+        elif mode=='adopt':
+            usage = Main.adopt_usage
             usage += Main.common_usage
 
         parser=OptionParser(usage=usage)
         
-        # the 'master' mode is really special and doesn't share any option
-        if mode=='master':
+        # the 'adopt' mode is really special and doesn't share any option
+        if mode=='adopt':
             parser.add_option("-m","--module",action="append",dest="modules",default=[],
                               help="modules, can be used several times or with quotes")
+            parser.add_option("-t","--tag",action="store", dest="tag", default='master',
+                              help="specify the tag to adopt, default is 'master'")
             parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False, 
                               help="run in verbose mode")
             (options, args) = parser.parse_args()
             options.workdir='unused'
             options.dry_run=False
-            options.mode='master'
+            options.mode='adopt'
             if len(args)==0 or len(options.modules)==0:
                 parser.print_help()
                 sys.exit(1)
-            adopt_master (options,args)
+            adopt_tag (options,args)
             return 
 
         # the other commands (module-* and release-changelog) share the same skeleton
@@ -1566,7 +1580,11 @@ Branches:
                     module.html_dump_body()
                 Module.html_dump_footer()
         else:
-            release_changelog(options, *args)
+            # if we provide, say a b c d, we want to build (a,b) (b,c) and (c,d)
+            # remember that the changelog in the twiki comes latest first, so
+            # we typically have here latest latest-1 latest-2
+            for (tag_new,tag_old) in zip ( args[:-1], args [1:]):
+                release_changelog(options, tag_old, tag_new)
             
     
 ####################