( )⚙ D11490 bookmarks: add an option to make pull mirror remote bookmarks

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11490

bookmarks: add an option to make pull mirror remote bookmarks
ClosedPublic

Authored by valentin.gatienbaron on Sep 22 2021, 6:23 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG62f325f9b347: bookmarks: add an option to make pull mirror remote bookmarks
Summary

For backups for instance. Merging bookmarks is not a useful behavior
in that case.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

valentin.gatienbaron retitled this revision from bookmarks: add an option to make pull mirror local bookmarks to bookmarks: add an option to make pull mirror remote bookmarks.Sep 22 2021, 6:24 PM
Alphare accepted this revision.Sep 24 2021, 6:14 AM
This revision is now accepted and ready to land.Sep 24 2021, 6:14 AM

Revision Contents
Changeset List

Diff 30398

mercurial/bookmarks.py

if entry: if entry:
raise error.Abort(_(b'bad bookmark stream')) raise error.Abort(_(b'bad bookmark stream'))
if node == repo.nodeconstants.wdirid: if node == repo.nodeconstants.wdirid:
node = None node = None
books.append((bookmark, node)) books.append((bookmark, node))
return books return books
def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=()): def mirroring_remote(ui, repo, remotemarks):
ui.debug(b"checking for updated bookmarks\n") """computes the bookmark changes that set the local bookmarks to
remotemarks"""
changed = []
localmarks = repo._bookmarks
for (b, id) in pycompat.iteritems(remotemarks):
if id != localmarks.get(b, None) and id in repo:
changed.append((b, id, ui.debug, _(b"updating bookmark %s\n") % b))
for b in localmarks:
if b not in remotemarks:
changed.append(
(b, None, ui.debug, _(b"removing bookmark %s\n") % b)
)
return changed
def merging_from_remote(ui, repo, remotemarks, path, explicit=()):
"""computes the bookmark changes that merge remote bookmarks into the
local bookmarks, based on comparebookmarks"""
localmarks = repo._bookmarks localmarks = repo._bookmarks
( (
addsrc, addsrc,
adddst, adddst,
advsrc, advsrc,
advdst, advdst,
diverge, diverge,
differ, differ,
changed.append((b, scid, status, _(b"importing bookmark %s\n") % b)) changed.append((b, scid, status, _(b"importing bookmark %s\n") % b))
for b, scid, dcid in differ: for b, scid, dcid in differ:
if b in explicit: if b in explicit:
explicit.remove(b) explicit.remove(b)
ui.warn( ui.warn(
_(b"remote bookmark %s points to locally missing %s\n") _(b"remote bookmark %s points to locally missing %s\n")
% (b, hex(scid)[:12]) % (b, hex(scid)[:12])
) )
return changed
def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=()):
ui.debug(b"checking for updated bookmarks\n")
if ui.configbool(b'bookmarks', b'mirror'):
changed = mirroring_remote(ui, repo, remotemarks)
else:
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)
localmarks.applychanges(repo, tr, changes) repo._bookmarks.applychanges(repo, tr, changes)
def incoming(ui, repo, peer): def incoming(ui, repo, peer):
"""Show bookmarks incoming from other to repo""" """Show bookmarks incoming from other to repo"""
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(

mercurial/configitems.py

) )
_registerdiffopts(section=b'annotate') _registerdiffopts(section=b'annotate')
# bookmarks.pushing: internal hack for discovery # bookmarks.pushing: internal hack for discovery
coreconfigitem( coreconfigitem(
b'bookmarks', b'bookmarks',
b'pushing', b'pushing',
default=list, default=list,
) )
coreconfigitem(
b'bookmarks',
b'mirror',
default=False,
)
# bundle.mainreporoot: internal hack for bundlerepo # bundle.mainreporoot: internal hack for bundlerepo
coreconfigitem( coreconfigitem(
b'bundle', b'bundle',
b'mainreporoot', b'mainreporoot',
default=b'', default=b'',
) )
coreconfigitem( coreconfigitem(
b'censor', b'censor',

mercurial/helptext/config.txt

authentication entry with. Only used if the prefix doesn't include authentication entry with. Only used if the prefix doesn't include
a scheme. Supported schemes are http and https. They will match a scheme. Supported schemes are http and https. They will match
static-http and static-https respectively, as well. static-http and static-https respectively, as well.
(default: https) (default: https)
If no suitable authentication entry is found, the user is prompted If no suitable authentication entry is found, the user is prompted
for credentials as usual if required by the remote. for credentials as usual if required by the remote.
``bookmarks``
-------------
Controls some aspect of bookmarks.
``mirror``
When pulling, instead of merging local bookmarks and remote bookmarks,
replace local bookmarks by remote bookmarks. This is useful to replicate
a repository, or as an optimization. (default: False)
``cmdserver`` ``cmdserver``
------------- -------------
Controls command server settings. (ADVANCED) Controls command server settings. (ADVANCED)
``message-encodings`` ``message-encodings``
List of encodings for the ``m`` (message) channel. The first encoding List of encodings for the ``m`` (message) channel. The first encoding
supported by the server will be selected and advertised in the hello supported by the server will be selected and advertised in the hello

tests/test-bookmarks-pushpull.t

adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg -R ../a book $ hg -R ../a book
@ 1:0d2164f0ce0d @ 1:0d2164f0ce0d
* X 1:0d2164f0ce0d * X 1:0d2164f0ce0d
Y 0:4e3505fd9583 Y 0:4e3505fd9583
Z 1:0d2164f0ce0d Z 1:0d2164f0ce0d
mirroring bookmarks
$ hg book
@ 1:9b140be10808
@foo 2:0d2164f0ce0d
X 1:9b140be10808
X@foo 2:0d2164f0ce0d
Y 0:4e3505fd9583
Z 2:0d2164f0ce0d
foo -1:000000000000
* foobar 1:9b140be10808
$ cp .hg/bookmarks .hg/bookmarks.bak
$ hg book -d X
$ hg pull ../a --config bookmarks.mirror=true
pulling from ../a
searching for changes
no changes found
$ hg book
@ 2:0d2164f0ce0d
X 2:0d2164f0ce0d
Y 0:4e3505fd9583
Z 2:0d2164f0ce0d
$ mv .hg/bookmarks.bak .hg/bookmarks
explicit pull should overwrite the local version (issue4439) explicit pull should overwrite the local version (issue4439)
$ hg update -r X $ hg update -r X
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark X) (activating bookmark X)
$ hg pull --config paths.foo=../a foo -B . --config "$TESTHOOK" $ hg pull --config paths.foo=../a foo -B . --config "$TESTHOOK"
pulling from $TESTTMP/a pulling from $TESTTMP/a
no changes found no changes found