[PATCH] shelve: make no_backup parameter passing python 2.4 compatible
David Soria Parra
dsp at experimentalworks.net
Wed Oct 2 02:50:38 CDT 2013
# HG changeset patch
# User David Soria Parra <dsp at experimentalworks.net>
# Date 1380700221 -7200
# Wed Oct 02 09:50:21 2013 +0200
# Node ID 84f1c5762b869310d9c2dd8ea33ba9aecda5fb8e
# Parent 5855de925923648eed889772bb3704c28da22ec4
shelve: make no_backup parameter passing python 2.4 compatible
Python 2.4 doesn't allow passing named parameter after an list unpack,
but allows to unpack a dict.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -346,7 +346,7 @@
revertfiles = readshelvedfiles(repo, state.name)
wctx = repo.parents()[0]
cmdutil.revert(ui, repo, wctx, [wctx.node(), nullid],
- *revertfiles, no_backup=True)
+ *revertfiles, **{'no_backup': True})
# fix up the weird dirstate states the merge left behind
mf = wctx.manifest()
dirstate = repo.dirstate
@@ -508,7 +508,7 @@
revertfiles = set(parents[1].files()).difference(ms)
cmdutil.revert(ui, repo, parents[1],
(parents[0].node(), nullid),
- *revertfiles, no_backup=True)
+ *revertfiles, **{'no_backup': True})
raise error.InterventionRequired(
_("unresolved conflicts (see 'hg resolve', then "
"'hg unshelve --continue')"))
@@ -517,7 +517,7 @@
parent = tip.parents()[0]
hg.update(repo, parent.node())
cmdutil.revert(ui, repo, tip, repo.dirstate.parents(), *tip.files(),
- no_backup=True)
+ **{'no_backup': True})
prevquiet = ui.quiet
ui.quiet = True
More information about the Mercurial-devel
mailing list