[PATCH 2 of 6] backout: remove unnecessary frobbing of addremove option

Kevin Bullock kbullock+mercurial at ringworld.org
Wed Feb 13 13:47:44 CST 2013

# HG changeset patch
# User Kevin Bullock <kbullock at ringworld.org>
# Date 1360684050 0
# Node ID 67fff6f7f7bbe643f8cb21567d05d1533589c94d
# Parent  a6300d15b1e82121a9b646126ba35809068f340e
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 at mns.spb.ru>
date:        Thu Jan 10 12:07:18 2008 +0300
summary:     cmdutil.commit: extract 'addremove' from opts carefully

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -468,7 +468,6 @@ def backout(ui, repo, node=None, rev=Non
                 ui.setconfig('ui', 'forcemerge', '')
         commit_opts = opts.copy()
-        commit_opts['addremove'] = False
         if not commit_opts['message'] and not commit_opts['logfile']:
             # we don't translate commit messages
             commit_opts['message'] = "Backed out changeset %s" % short(node)

More information about the Mercurial-devel mailing list