Mercurial > hg-stable
changeset 18848:cc741817a49e
pull: rename local rb to remotebookmarks
This local will become more important in an upcoming patch, so give it a more
descriptive name.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 29 Mar 2013 19:06:23 -0700 |
| parents | 40c679748fa9 |
| children | b4ddc43ddf9d |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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