# HG changeset patch
# User Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
# Date 1581649617 18000
# Node ID 0275000564c453a85e89eddfab1a357e6aeae327
# Parent  edaae3616ba30cb6c1de1365f6933367729dc905
bookmarks: refactor in preparation for next commit

Differential Revision: https://phab.mercurial-scm.org/D8116

diff -r edaae3616ba3 -r 0275000564c4 mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Sat Feb 15 14:51:33 2020 -0500
+++ b/mercurial/bookmarks.py	Thu Feb 13 22:06:57 2020 -0500
@@ -463,6 +463,10 @@
     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).
@@ -471,7 +475,7 @@
     hasnode = repo.changelog.hasnode
     for k, v in pycompat.iteritems(marks):
         # 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