This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9445

sidedata: send the correct revision data for wireproto v2
ClosedPublic

Authored by joerg.sonnenberger on Nov 28 2020, 9:04 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG14ff4929ca8c: sidedata: send the correct revision data for wireproto v2
Summary

When no sidedata is present, rawdata() and revision() are the same. But
as soon as sidedata is present, the way it is currently stored will
change the rawdata and that is not desired here, so switch to the
correct data accessor.

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

Alphare accepted this revision.Dec 7 2020, 5:18 AM
pulkit accepted this revision.Dec 7 2020, 8:45 AM
This revision is now accepted and ready to land.Dec 7 2020, 8:45 AM
marmoute added subscribers: mercurial-devel, marmoute.Dec 7 2020, 3:30 PM

I think this will behave badly if any other processing flag is involved
(something like lfs, which thankfully is not used on changelog
revision). What happens to the associated flags ? where they preserved
by wireprotov2 in the first place ?

joerg.sonnenberger added a comment.Dec 7 2020, 3:51 PM

I don't think they are. The main motivation for pushing this one is to ensure that later changes to result in more sidedata doesn't create spurious failures with wireproto v2. As discussed on IRC around the sprint, it is dead at this point, but I'd still want to avoid introducing extra breakage.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotov2server.py (2 lines)

Diff 24088

mercurial/wireprotov2server.py

if b'bookmarks' in fields and node in nodebookmarks: if b'bookmarks' in fields and node in nodebookmarks:
d[b'bookmarks'] = sorted(nodebookmarks[node]) d[b'bookmarks'] = sorted(nodebookmarks[node])
del nodebookmarks[node] del nodebookmarks[node]
followingmeta = [] followingmeta = []
followingdata = [] followingdata = []
if b'revision' in fields: if b'revision' in fields:
revisiondata = cl.rawdata(node) revisiondata = cl.revision(node)
followingmeta.append((b'revision', len(revisiondata))) followingmeta.append((b'revision', len(revisiondata)))
followingdata.append(revisiondata) followingdata.append(revisiondata)
# TODO make it possible for extensions to wrap a function or register # TODO make it possible for extensions to wrap a function or register
# a handler to service custom fields. # a handler to service custom fields.
if followingmeta: if followingmeta:
d[b'fieldsfollowing'] = followingmeta d[b'fieldsfollowing'] = followingmeta