Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 18686:0bca4d31f647
backout: remove unnecessary frobbing of addremove option
There's no way for addremove to show up in backout's opts dictionary. It
was being set manually because cmdutil.commit expected it to be there
(and would throw an exception if it wasn't). This was fixed waaaaaaay
back in:
changeset: 5829:784073457a0f
user: Kirill Smelkov <kirr@mns.spb.ru>
date: Thu Jan 10 12:07:18 2008 +0300
summary: cmdutil.commit: extract 'addremove' from opts carefully
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Tue, 12 Feb 2013 15:47:30 +0000 |
| parents | fafdff7e9c43 |
| children | 1d183b33f007 |
comparison
equal
deleted
inserted
replaced
| 18685:fafdff7e9c43 | 18686:0bca4d31f647 |
|---|---|
| 466 return hg.update(repo, op1) | 466 return hg.update(repo, op1) |
| 467 finally: | 467 finally: |
| 468 ui.setconfig('ui', 'forcemerge', '') | 468 ui.setconfig('ui', 'forcemerge', '') |
| 469 | 469 |
| 470 commit_opts = opts.copy() | 470 commit_opts = opts.copy() |
| 471 commit_opts['addremove'] = False | |
| 472 if not commit_opts['message'] and not commit_opts['logfile']: | 471 if not commit_opts['message'] and not commit_opts['logfile']: |
| 473 # we don't translate commit messages | 472 # we don't translate commit messages |
| 474 commit_opts['message'] = "Backed out changeset %s" % short(node) | 473 commit_opts['message'] = "Backed out changeset %s" % short(node) |
| 475 commit_opts['force_editor'] = True | 474 commit_opts['force_editor'] = True |
| 476 commit(ui, repo, **commit_opts) | 475 commit(ui, repo, **commit_opts) |