Patchwork [1,of,4] pull: rename local rb to remotebookmarks

login
register
mail settings
Submitter Siddharth Agarwal
Date March 30, 2013, 2:58 a.m.
Message ID <7b28513a88c18e92074f.1364612304@sid0x220>
Download mbox | patch
Permalink /patch/1226/
State Accepted
Commit cc741817a49ea6f48f539c3094e765dfcd1ee205
Headers show

Comments

Siddharth Agarwal - March 30, 2013, 2:58 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1364609183 25200
#      Fri Mar 29 19:06:23 2013 -0700
# Node ID 7b28513a88c18e92074fb935a433c1305224a599
# Parent  09c59145b36d833728e3d5639e149b94fc813981
pull: rename local rb to remotebookmarks

This local will become more important in an upcoming patch, so give it a more
descriptive name.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4499,11 +4499,11 @@  def pull(ui, repo, source="default", **o
     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 @@  def pull(ui, repo, source="default", **o
         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