git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag myplc-5.0-18
[build.git]
/
module-tools.py
diff --git
a/module-tools.py
b/module-tools.py
index
d66f61d
..
e7c17c1
100755
(executable)
--- a/
module-tools.py
+++ b/
module-tools.py
@@
-21,7
+21,8
@@
RENAMED_SVN_MODULES = {
"MyPLC": "myplc",
"CoDemux": "codemux",
"NodeManager": "nodemanager",
"MyPLC": "myplc",
"CoDemux": "codemux",
"NodeManager": "nodemanager",
- "NodeUpdate": "nodeupdate"
+ "NodeUpdate": "nodeupdate",
+ "Monitor": "monitor"
}
def svn_to_git_name(module):
}
def svn_to_git_name(module):
@@
-1333,8
+1334,11
@@
def adopt_master (options, args):
for module in modules:
modobj=Module(module,options)
for tags_file in 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)
modobj.patch_tags_file(tags_file,'_unused_','master',fine_grain=False)
+ if options.verbose:
+ Command("git diff %s"%" ".join(args),options).run()
##############################
class Main:
##############################
class Main:
@@
-1433,6
+1437,8
@@
Branches:
help="run in verbose mode")
(options, args) = parser.parse_args()
options.workdir='unused'
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)
if len(args)==0 or len(options.modules)==0:
parser.print_help()
sys.exit(1)