This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3905

remotefilelog: adapt for removed filelog.ancestors()
ClosedPublic

Authored by martinvonz on Jul 10 2018, 5:06 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX68be1767fbce: remotefilelog: adapt for removed filelog.ancestors()
Summary

Since upstream commit 1541e1a8e87d (filelog: wrap revlog instead of
inheriting it (API), 2018-04-06), filelog.ancestors() no longer
exists. Luckily it's just a single line, so we can easily inline it.

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

martinvonz created this revision.Jul 10 2018, 5:06 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 10 2018, 5:06 PM
quark accepted this revision.Jul 10 2018, 5:53 PM
This revision is now accepted and ready to land.Jul 10 2018, 5:53 PM
Closed by commit rFBHGX68be1767fbce: remotefilelog: adapt for removed filelog.ancestors() (authored by martinvonz). · Explain WhyJul 10 2018, 6:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9520

remotefilelog/remotefilelogserver.py

# remotefilelogserver.py - server logic for a remotefilelog server # remotefilelogserver.py - server logic for a remotefilelog server
# #
# Copyright 2013 Facebook, Inc. # Copyright 2013 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ancestor
from mercurial import changegroup, match, util, changelog, context from mercurial import changegroup, match, util, changelog, context
from mercurial import store, error from mercurial import store, error
from mercurial import streamclone from mercurial import streamclone
from mercurial.extensions import wrapfunction from mercurial.extensions import wrapfunction
from mercurial.node import bin, hex, nullid, nullrev from mercurial.node import bin, hex, nullid, nullrev
from mercurial.i18n import _ from mercurial.i18n import _
from . import ( from . import (
constants, constants,
files = _receivepackrequest(fin) files = _receivepackrequest(fin)
# Sort the files by name, so we provide deterministic results # Sort the files by name, so we provide deterministic results
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 fl.ancestors(list(fl.rev(n) for n in nodes), for rev in ancestor.lazyancestors(fl.parentrevs,
[fl.rev(n) for n in nodes],
inclusive=True): inclusive=True):
x, x, x, x, linkrev, p1, p2, node = fl.index[rev] x, x, x, x, linkrev, p1, p2, node = fl.index[rev]
copyfrom = '' copyfrom = ''
p1node = fl.node(p1) p1node = fl.node(p1)
p2node = fl.node(p2) p2node = fl.node(p2)
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: