This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6930

copies: expand the logic of usechangesetcentricalgo
ClosedPublic

Authored by marmoute on Oct 1 2019, 8:32 AM.

Details

Reviewers
martinvonz
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf3bcae1e9e23: copies: expand the logic of usechangesetcentricalgo
Summary

Using intermediate variable is clearer and will make is simple to expand the
logic.

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

marmoute created this revision.Oct 1 2019, 8:32 AM
pulkit accepted this revision.Oct 1 2019, 10:34 AM
This revision is now accepted and ready to land.Oct 1 2019, 10:34 AM
marmoute added a commit: rHGf3bcae1e9e23: copies: expand the logic of usechangesetcentricalgo.Oct 1 2019, 1:07 PM
Closed by commit rHGf3bcae1e9e23: copies: expand the logic of usechangesetcentricalgo (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (5 lines)

Diff 16750

mercurial/copies.py

files _forwardcopies is about to process. files _forwardcopies is about to process.
""" """
ma = a.manifest() ma = a.manifest()
mb = b.manifest() mb = b.manifest()
return mb.filesnotin(ma, match=match) return mb.filesnotin(ma, match=match)
def usechangesetcentricalgo(repo): def usechangesetcentricalgo(repo):
"""Checks if we should use changeset-centric copy algorithms""" """Checks if we should use changeset-centric copy algorithms"""
return (repo.ui.config('experimental', 'copies.read-from') in readfrom = repo.ui.config('experimental', 'copies.read-from')
('changeset-only', 'compatibility')) changesetsource = ('changeset-only', 'compatibility')
return readfrom in changesetsource
def _committedforwardcopies(a, b, base, match): def _committedforwardcopies(a, b, base, match):
"""Like _forwardcopies(), but b.rev() cannot be None (working copy)""" """Like _forwardcopies(), but b.rev() cannot be None (working copy)"""
# files might have to be traced back to the fctx parent of the last # files might have to be traced back to the fctx parent of the last
# one-side-only changeset, but not further back than that # one-side-only changeset, but not further back than that
repo = a._repo repo = a._repo
if usechangesetcentricalgo(repo): if usechangesetcentricalgo(repo):