From 87e24c3aa672a7849c3ab28e1b325fc878afc70d Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Wed, 12 Feb 2014 14:50:18 +0100 Subject: [PATCH] - do_commit: added --no-message option Commit without specifying a log comment. Fixes #73. --- osc/commandline.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index fec67f93..5fe8f3c4 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -4273,6 +4273,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. @cmdln.alias('checkin') @cmdln.option('-m', '--message', metavar='TEXT', help='specify log message TEXT') + @cmdln.option('-n', '--no-message', default=False, action='store_true', + help='do not specify a log message') @cmdln.option('-F', '--file', metavar='FILE', help='read log message from FILE, \'-\' denotes standard input.') @cmdln.option('-f', '--force', default=False, action="store_true", @@ -4321,7 +4323,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. if conf.config['do_package_tracking'] and is_project_dir(arg): try: prj = Project(arg) - if not msg: + if not msg and not opts.no_message: msg = edit_message() prj.commit(msg=msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) except oscerr.ExtRuntimeError as e: @@ -4353,13 +4355,13 @@ Please submit there instead, or use --nodevelproject to force direct submission. pac.todo.sort() for prj_path, packages in prj_paths.items(): prj = Project(prj_path) - if not msg: + if not msg and not opts.no_message: msg = get_commit_msg(prj.absdir, pac_objs[prj_path]) prj.commit(packages, msg=msg, files=files, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) store_unlink_file(prj.absdir, '_commit_msg') for pac in single_paths: p = Package(pac) - if not msg: + if not msg and not opts.no_message: msg = get_commit_msg(p.absdir, [p]) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) store_unlink_file(p.absdir, '_commit_msg') @@ -4369,7 +4371,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. if not p.todo: p.todo = p.filenamelist + p.filenamelist_unvers p.todo.sort() - if not msg: + if not msg and not opts.no_message: msg = get_commit_msg(p.absdir, [p]) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) store_unlink_file(p.absdir, '_commit_msg')