This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8116

bookmarks: refactor in preparation for next commit
ClosedPublic

Authored by valentin.gatienbaron on Feb 13 2020, 11:32 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0275000564c4: bookmarks: refactor in preparation for next commit

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

pulkit accepted this revision.Feb 21 2020, 4:14 AM
This revision is now accepted and ready to land.Feb 21 2020, 4:14 AM
pulkit added a comment.Feb 21 2020, 4:38 AM

Amended the following in flight to test-check-format.t happy:

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -462,9 +462,11 @@ def update(repo, parents, node):
             marks.applychanges(repo, tr, bmchanges)
     return bool(bmchanges)
 
+
 def isdivergent(b):
     return b'@' in b and not b.endswith(b'@')
 
+
 def listbinbookmarks(repo):
     # We may try to list bookmarks on a repo type that does not
     # support it (e.g., statichttprepository).
valentin.gatienbaron added a comment.Feb 21 2020, 9:13 AM

Sorry, I had tried installing black, but it was not the right version. After looking some more, pip3 install black is what was needed I think.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (6 lines)

Diff 20271

mercurial/bookmarks.py

bmchanges.append((bm, None)) bmchanges.append((bm, None))
if bmchanges: if bmchanges:
with repo.lock(), repo.transaction(b'bookmark') as tr: with repo.lock(), repo.transaction(b'bookmark') as tr:
marks.applychanges(repo, tr, bmchanges) marks.applychanges(repo, tr, bmchanges)
return bool(bmchanges) return bool(bmchanges)
def isdivergent(b):
return b'@' in b and not b.endswith(b'@')
def listbinbookmarks(repo): def listbinbookmarks(repo):
# We may try to list bookmarks on a repo type that does not # We may try to list bookmarks on a repo type that does not
# support it (e.g., statichttprepository). # support it (e.g., statichttprepository).
marks = getattr(repo, '_bookmarks', {}) marks = getattr(repo, '_bookmarks', {})
hasnode = repo.changelog.hasnode hasnode = repo.changelog.hasnode
for k, v in pycompat.iteritems(marks): for k, v in pycompat.iteritems(marks):
# don't expose local divergent bookmarks # don't expose local divergent bookmarks
if hasnode(v) and (b'@' not in k or k.endswith(b'@')): if hasnode(v) and not isdivergent(k):
yield k, v yield k, v
def listbookmarks(repo): def listbookmarks(repo):
d = {} d = {}
for book, node in listbinbookmarks(repo): for book, node in listbinbookmarks(repo):
d[book] = hex(node) d[book] = hex(node)
return d return d