This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4761

remotefilelogserver: cope with new interface on filelog and removal of index
ClosedPublic

Authored by durin42 on Sep 26 2018, 4:37 PM.
Tags
None
Subscribers
indygreg

Details

Reviewers
indygreg
Group Reviewers
Restricted Project
Commits
rFBHGX194129c3b5c1: remotefilelogserver: cope with new interface on filelog and removal of index
Summary

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, 4:37 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 26 2018, 4:37 PM
indygreg accepted this revision.Sep 26 2018, 4:49 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
remotefilelog/remotefilelogserver.py
587

I nuke deltaparent() in D4751.

This revision is now accepted and ready to land.Sep 26 2018, 4:49 PM
Closed by commit rFBHGX194129c3b5c1: remotefilelogserver: cope with new interface on filelog and removal of index (authored by durin42). · Explain WhySep 28 2018, 1:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mremotefilelog/remotefilelogserver.py (23 lines)

Diff 11460

remotefilelog/remotefilelogserver.py

for filename, nodes in sorted(files.iteritems()): for filename, nodes in sorted(files.iteritems()):
fl = repo.file(filename) fl = repo.file(filename)
# Compute history # Compute history
history = [] history = []
for rev in ancestor.lazyancestors(fl.parentrevs, for rev in ancestor.lazyancestors(fl.parentrevs,
[fl.rev(n) for n in nodes], [fl.rev(n) for n in nodes],
inclusive=True): inclusive=True):
if util.safehasattr(fl, 'index'):
# 4.7
x, x, x, x, linkrev, p1, p2, node = fl.index[rev] x, x, x, x, linkrev, p1, p2, node = fl.index[rev]
copyfrom = ''
p1node = fl.node(p1) p1node = fl.node(p1)
p2node = fl.node(p2) p2node = fl.node(p2)
else:
# 4.8
linkrev = fl.linkrev(rev)
node = fl.node(rev)
p1node, p2node = fl.parents(node)
copyfrom = ''
linknode = repo.changelog.node(linkrev) linknode = repo.changelog.node(linkrev)
if p1node == nullid: if p1node == nullid:
copydata = fl.renamed(node) copydata = fl.renamed(node)
if copydata: if copydata:
copyfrom, copynode = copydata copyfrom, copynode = copydata
p1node = copynode p1node = copynode
history.append((node, p1node, p2node, linknode, copyfrom)) history.append((node, p1node, p2node, linknode, copyfrom))
seen = set() seen = set()
for node in nodes: for node in nodes:
startrev = fl.rev(node) startrev = fl.rev(node)
cur = startrev cur = startrev
while True: while True:
if cur in seen: if cur in seen:
break break
if util.safehasattr(fl, 'index'):
# 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:
# 4.8
base = fl.deltaparent(cur)
indygregUnsubmitted
Not Done

I nuke deltaparent() in D4751.

indygreg: I nuke deltaparent() in D4751.
linkrev = fl.linkrev(cur)
node = fl.node(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)
# - the revlog chain has ended (via base==null or base==node) # - the revlog chain has ended (via base==null or base==node)
# - p1 is null. In some situations this can mean it's a copy, so # - p1 is null. In some situations this can mean it's a copy, so
# we need to use fl.read() to remove the copymetadata. # we need to use fl.read() to remove the copymetadata.