D5484: pull: use opts.get('bookmark') instead of opts['bookmark']
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Dec 27 07:54:26 EST 2018
pulkit updated this revision to Diff 12986.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5484?vs=12981&id=12986
REVISION DETAIL
https://phab.mercurial-scm.org/D5484
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
@@ -4417,7 +4417,7 @@
pullopargs = {}
nodes = None
- if opts['bookmark'] or revs:
+ if opts.get('bookmark') or revs:
# The list of bookmark used here is the same used to actually update
# the bookmark names, to avoid the race from issue 4689 and we do
# all lookup and bookmark queries in one go so they see the same
@@ -4438,7 +4438,7 @@
remotebookmarks = fremotebookmarks.result()
remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
pullopargs['remotebookmarks'] = remotebookmarks
- for b in opts['bookmark']:
+ for b in opts.get('bookmark'):
b = repo._bookmarks.expandname(b)
if b not in remotebookmarks:
raise error.Abort(_('remote bookmark %s not found!') % b)
To: pulkit, #hg-reviewers
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list