This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6829

doc: fix up confusing doc comment
ClosedPublic

Authored by valentin.gatienbaron on Sep 8 2019, 8:42 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG08fce968d00b: doc: fix up confusing doc comment

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (3 lines)
Mmercurial/exchange.py (4 lines)

Diff 16450

mercurial/bookmarks.py

:advdst: advanced on dst side :advdst: advanced on dst side
:diverge: diverge :diverge: diverge
:differ: changed, but changeset referred on src is unknown on dst :differ: changed, but changeset referred on src is unknown on dst
:invalid: unknown on both side :invalid: unknown on both side
:same: same on both side :same: same on both side
Each elements of lists in result tuple is tuple "(bookmark name, Each elements of lists in result tuple is tuple "(bookmark name,
changeset ID on source side, changeset ID on destination changeset ID on source side, changeset ID on destination
side)". Each changeset IDs are 40 hexadecimal digit string or side)". Each changeset ID is a binary node or None.
None.
Changeset IDs of tuples in "addsrc", "adddst", "differ" or Changeset IDs of tuples in "addsrc", "adddst", "differ" or
"invalid" list may be unknown for repo. "invalid" list may be unknown for repo.
If "targets" is specified, only bookmarks listed in it are If "targets" is specified, only bookmarks listed in it are
examined. examined.
''' '''

mercurial/exchange.py

def hexifycompbookmarks(bookmarks): def hexifycompbookmarks(bookmarks):
return [(b, safehex(scid), safehex(dcid)) return [(b, safehex(scid), safehex(dcid))
for (b, scid, dcid) in bookmarks] for (b, scid, dcid) in bookmarks]
comp = [hexifycompbookmarks(marks) for marks in comp] comp = [hexifycompbookmarks(marks) for marks in comp]
return _processcompared(pushop, ancestors, explicit, remotebookmark, comp) return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)
def _processcompared(pushop, pushed, explicit, remotebms, comp): def _processcompared(pushop, pushed, explicit, remotebms, comp):
"""take decision on bookmark to pull from the remote bookmark """take decision on bookmarks to push to the remote repo
Exist to help extensions who want to alter this behavior. Exists to help extensions alter this behavior.
""" """
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
repo = pushop.repo repo = pushop.repo
for b, scid, dcid in advsrc: for b, scid, dcid in advsrc:
if b in explicit: if b in explicit:
explicit.remove(b) explicit.remove(b)