bookmarks.updatefromremote: rename local rb to remotemarks
This local will become a parameter in an upcoming patch, so give it a more
descriptive name. The name stays similar to the existing localmarks.
--- a/mercurial/bookmarks.py Fri Mar 29 19:06:23 2013 -0700
+++ b/mercurial/bookmarks.py Fri Mar 29 18:28:59 2013 -0700
@@ -223,12 +223,12 @@
def updatefromremote(ui, repo, remote, path):
ui.debug("checking for updated bookmarks\n")
- rb = remote.listkeys('bookmarks')
+ remotemarks = remote.listkeys('bookmarks')
changed = False
localmarks = repo._bookmarks
- for k in sorted(rb):
+ for k in sorted(remotemarks):
if k in localmarks:
- nr, nl = rb[k], localmarks[k]
+ nr, nl = remotemarks[k], localmarks[k]
if nr in repo:
cr = repo[nr]
cl = repo[nl]
@@ -257,9 +257,9 @@
localmarks[n] = cr.node()
changed = True
ui.warn(_("divergent bookmark %s stored as %s\n") % (k, n))
- elif rb[k] in repo:
+ elif remotemarks[k] in repo:
# add remote bookmarks for changes we already have
- localmarks[k] = repo[rb[k]].node()
+ localmarks[k] = repo[remotemarks[k]].node()
changed = True
ui.status(_("adding remote bookmark %s\n") % k)