From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 25 Mar 2011 17:34:30 +0000 (+0100)
Subject: show diff once it's done
X-Git-Tag: 5.0-rc23~101
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c26cd5bbee8eb57efe5298814f3e531d10c4637e;p=build.git

show diff once it's done
---

diff --git a/module-tools.py b/module-tools.py
index d66f61de..81465617 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -1333,8 +1333,11 @@ def adopt_master (options, args):
     for module in modules: 
         modobj=Module(module,options)
         for tags_file in args:
-            print 'module',module,'tags_file',tags_file
+            if options.verbose:
+                print 'adopting master for',module,'in',tags_file
             modobj.patch_tags_file(tags_file,'_unused_','master',fine_grain=False)
+    if options.verbose:
+        Command("git diff %s"%" ".join(args),options).run()
 
 ##############################
 class Main:
@@ -1433,6 +1436,8 @@ Branches:
                               help="run in verbose mode")
             (options, args) = parser.parse_args()
             options.workdir='unused'
+            options.dry_run=False
+            options.mode='master'
             if len(args)==0 or len(options.modules)==0:
                 parser.print_help()
                 sys.exit(1)