| spectral | |
| Alphare |
| hg-reviewers |
This new mode allow to disable bookmark exchange with some path (or all path).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bookmarks.py (6 lines) | |||
| M | mercurial/helptext/config.txt (3 lines) | |||
| M | mercurial/utils/urlutil.py (1 line) | |||
| M | rust/Cargo.lock (2 lines) | |||
| M | tests/test-bookmarks-pushpull.t (15 lines) | |||
| M | tests/test-help.t (2 lines) |
| % (b, hex(scid)[:12]) | % (b, hex(scid)[:12]) | ||||
| ) | ) | ||||
| return changed | return changed | ||||
| def updatefromremote( | def updatefromremote( | ||||
| ui, repo, remotemarks, path, trfunc, explicit=(), mode=None | ui, repo, remotemarks, path, trfunc, explicit=(), mode=None | ||||
| ): | ): | ||||
| if mode == b'ignore': | |||||
| # This should move to an higher level to avoid fetching bookmark at all | |||||
| return | |||||
| ui.debug(b"checking for updated bookmarks\n") | ui.debug(b"checking for updated bookmarks\n") | ||||
| if mode == b'mirror': | if mode == b'mirror': | ||||
| changed = mirroring_remote(ui, repo, remotemarks) | changed = mirroring_remote(ui, repo, remotemarks) | ||||
| else: | else: | ||||
| changed = merging_from_remote(ui, repo, remotemarks, path, explicit) | changed = merging_from_remote(ui, repo, remotemarks, path, explicit) | ||||
| if changed: | if changed: | ||||
| tr = trfunc() | tr = trfunc() | ||||
| changes = [] | changes = [] | ||||
| key = lambda t: (t[0], t[1] or b'') | key = lambda t: (t[0], t[1] or b'') | ||||
| for b, node, writer, msg in sorted(changed, key=key): | for b, node, writer, msg in sorted(changed, key=key): | ||||
| changes.append((b, node)) | changes.append((b, node)) | ||||
| writer(msg) | writer(msg) | ||||
| repo._bookmarks.applychanges(repo, tr, changes) | repo._bookmarks.applychanges(repo, tr, changes) | ||||
| def incoming(ui, repo, peer, mode=None): | def incoming(ui, repo, peer, mode=None): | ||||
| """Show bookmarks incoming from other to repo""" | """Show bookmarks incoming from other to repo""" | ||||
| if mode == b'ignore': | |||||
| ui.status(_(b"bookmarks exchange disabled with this path\n")) | |||||
| return 0 | |||||
| ui.status(_(b"searching for changed bookmarks\n")) | ui.status(_(b"searching for changed bookmarks\n")) | ||||
| with peer.commandexecutor() as e: | with peer.commandexecutor() as e: | ||||
| remotemarks = unhexlifybookmarks( | remotemarks = unhexlifybookmarks( | ||||
| e.callcommand( | e.callcommand( | ||||
| b'listkeys', | b'listkeys', | ||||
| { | { | ||||
| b'namespace': b'bookmarks', | b'namespace': b'bookmarks', | ||||
| How bookmark will be dealt during the exchange. It support the following value | How bookmark will be dealt during the exchange. It support the following value | ||||
| - ``default``: the default behavior, local and remote bookmarks are "merged" | - ``default``: the default behavior, local and remote bookmarks are "merged" | ||||
| on push/pull. | on push/pull. | ||||
| - ``mirror``: when pulling, replace local bookmarks by remote bookmarks. This | - ``mirror``: when pulling, replace local bookmarks by remote bookmarks. This | ||||
| is useful to replicate a repository, or as an optimization. | is useful to replicate a repository, or as an optimization. | ||||
| - ``ignore``: ignore bookmarks during exchange. | |||||
| (This currently only affect pulling) | |||||
| The following special named paths exist: | The following special named paths exist: | ||||
| ``default`` | ``default`` | ||||
| The URL or directory to use when no source or remote is specified. | The URL or directory to use when no source or remote is specified. | ||||
| :hg:`clone` will automatically define this path to the location the | :hg:`clone` will automatically define this path to the location the | ||||
| repository was cloned from. | repository was cloned from. | ||||
| @pathsuboption(b'pushrev', b'pushrev') | @pathsuboption(b'pushrev', b'pushrev') | ||||
| def pushrevpathoption(ui, path, value): | def pushrevpathoption(ui, path, value): | ||||
| return value | return value | ||||
| SUPPORTED_BOOKMARKS_MODES = { | SUPPORTED_BOOKMARKS_MODES = { | ||||
| b'default', | b'default', | ||||
| b'mirror', | b'mirror', | ||||
| b'ignore', | |||||
| } | } | ||||
| @pathsuboption(b'bookmarks.mode', b'bookmarks_mode') | @pathsuboption(b'bookmarks.mode', b'bookmarks_mode') | ||||
| def bookmarks_mode_option(ui, path, value): | def bookmarks_mode_option(ui, path, value): | ||||
| if value not in SUPPORTED_BOOKMARKS_MODES: | if value not in SUPPORTED_BOOKMARKS_MODES: | ||||
| path_name = path.name | path_name = path.name | ||||
| if path_name is None: | if path_name is None: | ||||
| # This file is automatically @generated by Cargo. | # This file is automatically @generated by Cargo. | ||||
| # It is not intended for manual editing. | # It is not intended for manual editing. | ||||
| version = 3 | |||||
| [[package]] | [[package]] | ||||
| name = "adler" | name = "adler" | ||||
| version = "0.2.3" | version = "0.2.3" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" | checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" | ||||
| [[package]] | [[package]] | ||||
| name = "aho-corasick" | name = "aho-corasick" | ||||
| comparing with ../a | comparing with ../a | ||||
| searching for changed bookmarks | searching for changed bookmarks | ||||
| @ 0d2164f0ce0d changed | @ 0d2164f0ce0d changed | ||||
| @foo 000000000000 removed | @foo 000000000000 removed | ||||
| X 0d2164f0ce0d added | X 0d2164f0ce0d added | ||||
| X@foo 000000000000 removed | X@foo 000000000000 removed | ||||
| foo 000000000000 removed | foo 000000000000 removed | ||||
| foobar 000000000000 removed | foobar 000000000000 removed | ||||
| $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=ignore' | |||||
| comparing with ../a | |||||
| bookmarks exchange disabled with this path | |||||
| $ hg pull ../a --config 'paths.*:bookmarks.mode=ignore' | |||||
| pulling from ../a | |||||
| searching for changes | |||||
| no changes found | |||||
| $ hg book | |||||
| @ 1:9b140be10808 | |||||
| @foo 2:0d2164f0ce0d | |||||
| X@foo 2:0d2164f0ce0d | |||||
| Y 0:4e3505fd9583 | |||||
| Z 2:0d2164f0ce0d | |||||
| foo -1:000000000000 | |||||
| * foobar 1:9b140be10808 | |||||
| $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' | $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' | ||||
| pulling from ../a | pulling from ../a | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| $ hg book | $ hg book | ||||
| @ 2:0d2164f0ce0d | @ 2:0d2164f0ce0d | ||||
| X 2:0d2164f0ce0d | X 2:0d2164f0ce0d | ||||
| Y 0:4e3505fd9583 | Y 0:4e3505fd9583 | ||||
| "bookmarks.mode" | "bookmarks.mode" | ||||
| How bookmark will be dealt during the exchange. It support the following | How bookmark will be dealt during the exchange. It support the following | ||||
| value | value | ||||
| - "default": the default behavior, local and remote bookmarks are | - "default": the default behavior, local and remote bookmarks are | ||||
| "merged" on push/pull. | "merged" on push/pull. | ||||
| - "mirror": when pulling, replace local bookmarks by remote bookmarks. | - "mirror": when pulling, replace local bookmarks by remote bookmarks. | ||||
| This is useful to replicate a repository, or as an optimization. | This is useful to replicate a repository, or as an optimization. | ||||
| - "ignore": ignore bookmarks during exchange. (This currently only | |||||
| affect pulling) | |||||
| The following special named paths exist: | The following special named paths exist: | ||||
| "default" | "default" | ||||
| The URL or directory to use when no source or remote is specified. | The URL or directory to use when no source or remote is specified. | ||||
| 'hg clone' will automatically define this path to the location the | 'hg clone' will automatically define this path to the location the | ||||
| repository was cloned from. | repository was cloned from. | ||||