# HG changeset patch # User Siddharth Agarwal # Date 1364609183 25200 # Node ID cc741817a49ea6f48f539c3094e765dfcd1ee205 # Parent 40c679748fa9736d773859696adae9501078af33 pull: rename local rb to remotebookmarks This local will become more important in an upcoming patch, so give it a more descriptive name. diff -r 40c679748fa9 -r cc741817a49e mercurial/commands.py --- a/mercurial/commands.py Fri Mar 29 16:07:57 2013 -0700 +++ b/mercurial/commands.py Fri Mar 29 19:06:23 2013 -0700 @@ -4499,11 +4499,11 @@ if opts.get('bookmark'): if not revs: revs = [] - rb = other.listkeys('bookmarks') + remotebookmarks = other.listkeys('bookmarks') for b in opts['bookmark']: - if b not in rb: + if b not in remotebookmarks: raise util.Abort(_('remote bookmark %s not found!') % b) - revs.append(rb[b]) + revs.append(remotebookmarks[b]) if revs: try: @@ -4530,7 +4530,7 @@ for b in opts['bookmark']: # explicit pull overrides local bookmark if any ui.status(_("importing bookmark %s\n") % b) - marks[b] = repo[rb[b]].node() + marks[b] = repo[remotebookmarks[b]].node() marks.write() return ret