equal
deleted
inserted
replaced
683 def mirroring_remote(ui, repo, remotemarks): |
683 def mirroring_remote(ui, repo, remotemarks): |
684 """computes the bookmark changes that set the local bookmarks to |
684 """computes the bookmark changes that set the local bookmarks to |
685 remotemarks""" |
685 remotemarks""" |
686 changed = [] |
686 changed = [] |
687 localmarks = repo._bookmarks |
687 localmarks = repo._bookmarks |
688 for (b, id) in remotemarks.items(): |
688 for b, id in remotemarks.items(): |
689 if id != localmarks.get(b, None) and id in repo: |
689 if id != localmarks.get(b, None) and id in repo: |
690 changed.append((b, id, ui.debug, _(b"updating bookmark %s\n") % b)) |
690 changed.append((b, id, ui.debug, _(b"updating bookmark %s\n") % b)) |
691 for b in localmarks: |
691 for b in localmarks: |
692 if b not in remotemarks: |
692 if b not in remotemarks: |
693 changed.append( |
693 changed.append( |