##// END OF EJS Templates
bookmarks.updatefromremote: rename local rb to remotemarks...
Siddharth Agarwal -
r18849:b4ddc43d default
parent child Browse files
Show More
@@ -223,12 +223,12 b' def pushbookmark(repo, key, old, new):'
223
223
224 def updatefromremote(ui, repo, remote, path):
224 def updatefromremote(ui, repo, remote, path):
225 ui.debug("checking for updated bookmarks\n")
225 ui.debug("checking for updated bookmarks\n")
226 rb = remote.listkeys('bookmarks')
226 remotemarks = remote.listkeys('bookmarks')
227 changed = False
227 changed = False
228 localmarks = repo._bookmarks
228 localmarks = repo._bookmarks
229 for k in sorted(rb):
229 for k in sorted(remotemarks):
230 if k in localmarks:
230 if k in localmarks:
231 nr, nl = rb[k], localmarks[k]
231 nr, nl = remotemarks[k], localmarks[k]
232 if nr in repo:
232 if nr in repo:
233 cr = repo[nr]
233 cr = repo[nr]
234 cl = repo[nl]
234 cl = repo[nl]
@@ -257,9 +257,9 b' def updatefromremote(ui, repo, remote, p'
257 localmarks[n] = cr.node()
257 localmarks[n] = cr.node()
258 changed = True
258 changed = True
259 ui.warn(_("divergent bookmark %s stored as %s\n") % (k, n))
259 ui.warn(_("divergent bookmark %s stored as %s\n") % (k, n))
260 elif rb[k] in repo:
260 elif remotemarks[k] in repo:
261 # add remote bookmarks for changes we already have
261 # add remote bookmarks for changes we already have
262 localmarks[k] = repo[rb[k]].node()
262 localmarks[k] = repo[remotemarks[k]].node()
263 changed = True
263 changed = True
264 ui.status(_("adding remote bookmark %s\n") % k)
264 ui.status(_("adding remote bookmark %s\n") % k)
265
265
General Comments 0
You need to be logged in to leave comments. Login now