Patchwork D5484: pull: use opts.get('bookmark') instead of opts['bookmark']

login
register
mail settings
Submitter phabricator
Date Jan. 7, 2019, 11:40 a.m.
Message ID <3dbe38655dfa304f33322d09395808bf@localhost.localdomain>
Download mbox | patch
Permalink /patch/37523/
State Not Applicable
Headers show

Comments

phabricator - Jan. 7, 2019, 11:40 a.m.
pulkit updated this revision to Diff 13045.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5484?vs=12986&id=13045

REVISION DETAIL
  https://phab.mercurial-scm.org/D5484

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4427,7 +4427,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
@@ -4448,7 +4448,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)