This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4763

remotefilelogserver: adapt to filelog.{flags,deltaparent} not being proxied
ClosedPublic

Authored by durin42 on Sep 26 2018, 5:23 PM.
Tags
None
Subscribers
None

Details

Reviewers
indygreg
Group Reviewers
Restricted Project
Commits
rFBHGX5545b9a1dcda: remotefilelogserver: adapt to filelog.{flags,deltaparent} not being proxied
Summary

remotefilelog, for good or ill, is currently explicitly tied to
revlogs. Greg and I are working on cleaning that up, but for now we'll
just grab filelog._revlog.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Sep 26 2018, 5:23 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 26 2018, 5:23 PM
indygreg accepted this revision.Sep 26 2018, 5:29 PM
This revision is now accepted and ready to land.Sep 26 2018, 5:29 PM
Closed by commit rFBHGX5545b9a1dcda: remotefilelogserver: adapt to filelog.{flags,deltaparent} not being proxied (authored by durin42). · Explain WhySep 28 2018, 1:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11462

remotefilelog/remotefilelogserver.py

sizemeta := METAKEYSIZE + str(len(rawtext)) sizemeta := METAKEYSIZE + str(len(rawtext))
flagmeta := METAKEYFLAG + str(flag) flagmeta := METAKEYFLAG + str(flag)
note: sizemeta must exist. METAKEYFLAG and METAKEYSIZE must have a note: sizemeta must exist. METAKEYFLAG and METAKEYSIZE must have a
length of 1. length of 1.
""" """
flog = filectx.filelog() flog = filectx.filelog()
frev = filectx.filerev() frev = filectx.filerev()
if util.safehasattr(flog, 'flags'):
revlogflags = flog.flags(frev) revlogflags = flog.flags(frev)
else:
revlogflags = flog._revlog.flags(frev)
if revlogflags == 0: if revlogflags == 0:
# normal files # normal files
text = filectx.data() text = filectx.data()
else: else:
# lfs, read raw revision data # lfs, read raw revision data
text = flog.revision(frev, raw=True) text = flog.revision(frev, raw=True)
repo = filectx._repo repo = filectx._repo
while True: while True:
if cur in seen: if cur in seen:
break break
if util.safehasattr(fl, 'index'): if util.safehasattr(fl, 'index'):
# 4.7 # 4.7
start, length, size, base, linkrev, p1, p2, node = fl.index[cur] start, length, size, base, linkrev, p1, p2, node = fl.index[cur]
else: else:
# 4.8 # 4.8
base = fl.deltaparent(cur) base = fl._revlog.deltaparent(cur)
linkrev = fl.linkrev(cur) linkrev = fl.linkrev(cur)
node = fl.node(cur) node = fl.node(cur)
p1, p2 = fl.parentrevs(cur) p1, p2 = fl.parentrevs(cur)
if linkrev < stophint and cur != startrev: if linkrev < stophint and cur != startrev:
break break
# Return a full text if: # Return a full text if:
# - the caller requested it (via stophint == -1) # - the caller requested it (via stophint == -1)