equal
deleted
inserted
replaced
770 % (b, hex(scid)[:12]) |
770 % (b, hex(scid)[:12]) |
771 ) |
771 ) |
772 return changed |
772 return changed |
773 |
773 |
774 |
774 |
775 def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=()): |
775 def updatefromremote( |
|
776 ui, repo, remotemarks, path, trfunc, explicit=(), mode=None |
|
777 ): |
776 ui.debug(b"checking for updated bookmarks\n") |
778 ui.debug(b"checking for updated bookmarks\n") |
777 if ui.configbool(b'bookmarks', b'mirror'): |
779 if mode == b'mirror': |
778 changed = mirroring_remote(ui, repo, remotemarks) |
780 changed = mirroring_remote(ui, repo, remotemarks) |
779 else: |
781 else: |
780 changed = merging_from_remote(ui, repo, remotemarks, path, explicit) |
782 changed = merging_from_remote(ui, repo, remotemarks, path, explicit) |
781 |
783 |
782 if changed: |
784 if changed: |