D2896: commands: use keyword arguments in update function
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Wed Mar 21 02:14:04 EDT 2018
pulkit updated this revision to Diff 7169.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2896?vs=7120&id=7169
REVISION DETAIL
https://phab.mercurial-scm.org/D2896
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5442,8 +5442,7 @@
('r', 'rev', '', _('revision'), _('REV'))
] + mergetoolopts,
_('[-C|-c|-m] [-d DATE] [[-r] REV]'))
-def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
- merge=None, tool=None):
+def update(ui, repo, node=None, **opts):
"""update working directory (or switch revisions)
Update the repository's working directory to the specified
@@ -5498,6 +5497,11 @@
Returns 0 on success, 1 if there are unresolved files.
"""
+ rev = opts.get(r'rev')
+ date = opts.get(r'date')
+ clean = opts.get(r'clean')
+ check = opts.get(r'check')
+ merge = opts.get(r'merge')
if rev and node:
raise error.Abort(_("please specify just one revision"))
@@ -5542,7 +5546,7 @@
obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
ui.warn("(%s)\n" % obsfatemsg)
- repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
+ repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
return hg.updatetotally(ui, repo, rev, brev, clean=clean,
updatecheck=updatecheck)
To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list