Mercurial > hg
comparison mercurial/bookmarks.py @ 44372:8407031f195f
bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Before this change, such bookmarks are write-only: a client can push
them but not pull/read them. And because these bookmark can't be read,
even pushes are limited (for instance trying to delete such a bookmark
fails with a vanilla client because the client thinks the bookmark is
neither on the local nor the remote).
This change makes the server refuses such bookmarks, and for earlier
errors, makes the client refuse to send them.
I think the change of behavior is acceptable because I think this is a
bug in push/pull, and I don't think we change the behavior of `hg
unbundle`, because it doesn't seem that `hg bundle` ever store
bookmarks (and even if it did, it would seem weird anyway to try to
send divergent bookmarks).
Differential Revision: https://phab.mercurial-scm.org/D8117
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Thu, 13 Feb 2020 22:51:17 -0500 |
parents | 0275000564c4 |
children | f189c5280d48 |
comparison
equal
deleted
inserted
replaced
44371:0275000564c4 | 44372:8407031f195f |
---|---|
485 d[book] = hex(node) | 485 d[book] = hex(node) |
486 return d | 486 return d |
487 | 487 |
488 | 488 |
489 def pushbookmark(repo, key, old, new): | 489 def pushbookmark(repo, key, old, new): |
490 if isdivergent(key): | |
491 return False | |
490 if bookmarksinstore(repo): | 492 if bookmarksinstore(repo): |
491 wlock = util.nullcontextmanager() | 493 wlock = util.nullcontextmanager() |
492 else: | 494 else: |
493 wlock = repo.wlock() | 495 wlock = repo.wlock() |
494 with wlock, repo.lock(), repo.transaction(b'bookmarks') as tr: | 496 with wlock, repo.lock(), repo.transaction(b'bookmarks') as tr: |