This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8523

py3: fix exception in pull when several things happen to a bookmark
ClosedPublic

Authored by valentin.gatienbaron on May 14 2020, 11:00 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf189c5280d48: py3: fix exception in pull when several things happen to a bookmark
Summary

Specifically, when changes is:

[(b'@upstream-committed', None, <function ui.status>, b'updating bookmark @upstream-committed\n'),
 (b'@upstream-committed', binary-node, <function ui.warn>, b'divergent bookmark @ stored as @upstream-committed\n')]

sorting the list raises:

TypeError: '<' not supported between instances of 'bytes' and 'NoneType'

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 added a commit: rHGf189c5280d48: py3: fix exception in pull when several things happen to a bookmark.May 14 2020, 4:31 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf189c5280d48: py3: fix exception in pull when several things happen to a bookmark (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (3 lines)

Diff 21384

mercurial/bookmarks.py

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])
) )
if changed: if changed:
tr = trfunc() tr = trfunc()
changes = [] changes = []
for b, node, writer, msg in sorted(changed): key = lambda t: (t[0], t[1] or b'')
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) localmarks.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
''' '''