mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-11 16:36:14 +01:00
Code

Merge pull request #148 from lnussel/master

Browse Source 
allow force commit
This commit is contained in:
Adrian Schröter 2015-08-13 07:50:58 +02:00
commit 3b203e67a9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/commandline.py
View File

@ -4453,7 +4453,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('-F', '--file', metavar='FILE', @cmdln.option('-F', '--file', metavar='FILE',
help='read log message from FILE, \'-\' denotes standard input.') help='read log message from FILE, \'-\' denotes standard input.')
@cmdln.option('-f', '--force', default=False, action="store_true", @cmdln.option('-f', '--force', default=False, action="store_true",
help='ignored') help='force commit, even if there were no changes')
@cmdln.option('--skip-validation', default=False, action="store_true", @cmdln.option('--skip-validation', default=False, action="store_true",
help='deprecated, don\'t use it') help='deprecated, don\'t use it')
@cmdln.option('-v', '--verbose', default=False, action="store_true", @cmdln.option('-v', '--verbose', default=False, action="store_true",
@ -4552,13 +4552,13 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if repl in('y', 'Y'): if repl in('y', 'Y'):
can_branch = True can_branch = True
prj.commit(packages, msg=msg, files=files, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, can_branch=can_branch) prj.commit(packages, msg=msg, files=files, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, can_branch=can_branch, force=opts.force)
store_unlink_file(prj.absdir, '_commit_msg') store_unlink_file(prj.absdir, '_commit_msg')
for pac in single_paths: for pac in single_paths:
p = Package(pac) p = Package(pac)
if not msg and not opts.no_message: if not msg and not opts.no_message:
msg = get_commit_msg(p.absdir, [p]) msg = get_commit_msg(p.absdir, [p])
p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, force=opts.force)
store_unlink_file(p.absdir, '_commit_msg') store_unlink_file(p.absdir, '_commit_msg')
else: else:
for p in pacs: for p in pacs:
@ -4567,7 +4567,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
p.todo.sort() p.todo.sort()
if not msg and not opts.no_message: if not msg and not opts.no_message:
msg = get_commit_msg(p.absdir, [p]) msg = get_commit_msg(p.absdir, [p])
p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, force=opts.force)
store_unlink_file(p.absdir, '_commit_msg') store_unlink_file(p.absdir, '_commit_msg')
@cmdln.option('-r', '--revision', metavar='REV', @cmdln.option('-r', '--revision', metavar='REV',

8
osc/core.py
View File

@ -918,7 +918,7 @@ class Project:
finally: finally:
self.write_packages() self.write_packages()
def commit(self, pacs = (), msg = '', files = {}, verbose = False, skip_local_service_run = False, can_branch=False): def commit(self, pacs = (), msg = '', files = {}, verbose = False, skip_local_service_run = False, can_branch=False, force=False):
if len(pacs): if len(pacs):
try: try:
for pac in pacs: for pac in pacs:
@ -937,7 +937,7 @@ class Project:
else: else:
p = Package(os.path.join(self.dir, pac)) p = Package(os.path.join(self.dir, pac))
p.todo = todo p.todo = todo
p.commit(msg, verbose=verbose, skip_local_service_run=skip_local_service_run, can_branch=can_branch) p.commit(msg, verbose=verbose, skip_local_service_run=skip_local_service_run, can_branch=can_branch, force=force)
elif pac in self.pacs_unvers and not is_package_dir(os.path.join(self.dir, pac)): elif pac in self.pacs_unvers and not is_package_dir(os.path.join(self.dir, pac)):
print('osc: \'%s\' is not under version control' % pac) print('osc: \'%s\' is not under version control' % pac)
elif pac in self.pacs_broken: elif pac in self.pacs_broken:
@ -1355,7 +1355,7 @@ class Package:
todo.append(n.get('name')) todo.append(n.get('name'))
return todo return todo
def commit(self, msg='', verbose=False, skip_local_service_run=False, can_branch=False): def commit(self, msg='', verbose=False, skip_local_service_run=False, can_branch=False, force=False):
# commit only if the upstream revision is the same as the working copy's # commit only if the upstream revision is the same as the working copy's
upstream_rev = self.latest_rev() upstream_rev = self.latest_rev()
if self.rev != upstream_rev: if self.rev != upstream_rev:
@ -1427,7 +1427,7 @@ class Package:
% (filename, st)) % (filename, st))
todo_send[filename] = f.md5 todo_send[filename] = f.md5
if not real_send and not todo_delete and not self.islinkrepair() and not self.ispulled(): if not force and not real_send and not todo_delete and not self.islinkrepair() and not self.ispulled():
print('nothing to do for package %s' % self.name) print('nothing to do for package %s' % self.name)
return 1 return 1