This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5968

obsutil: don't assume leftctx and rightctx repo as same
ClosedPublic

Authored by pulkit on Feb 15 2019, 9:48 AM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG9de6c4f61608: obsutil: don't assume leftctx and rightctx repo as same
Summary

Backed out changeset 520514af2d93.

hgsubversion can pass leftctx and rightctx which are instances of two different
repositories. This was making tests fail on hgsubversion with 4.9.

The two different instances are:

(Pdb) p rightctx.repo()
<filteredrepo:served <hgsubversion.svnrepo.svnlocalrepo object at 0x7fe29d296d10>>
(Pdb) p leftctx.repo()
<filteredrepo:visible <hgsubversion.svnrepo.svnlocalrepo object at 0x7fe29d494590>>

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

pulkit created this revision.Feb 15 2019, 9:48 AM
lothiraldan accepted this revision.Feb 15 2019, 11:18 AM
lothiraldan added a subscriber: lothiraldan.

LGTM, nice catch! Could you add a comment to clarify it?

pulkit updated this revision to Diff 14103.Feb 15 2019, 2:20 PM
Closed by commit rHG9de6c4f61608: obsutil: don't assume leftctx and rightctx repo as same (authored by pulkit). · Explain WhyFeb 15 2019, 10:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsutil.py (13 lines)

Diff 14123

mercurial/obsutil.py

return _prepare_hunk(lines) return _prepare_hunk(lines)
def _cmpdiff(leftctx, rightctx): def _cmpdiff(leftctx, rightctx):
"""return True if both ctx introduce the "same diff" """return True if both ctx introduce the "same diff"
This is a first and basic implementation, with many shortcoming. This is a first and basic implementation, with many shortcoming.
""" """
# lefctx.repo() and rightctx.repo() are the same here diffopts = diffutil.diffallopts(leftctx.repo().ui, {'git': True})
repo = leftctx.repo()
diffopts = diffutil.diffallopts(repo.ui, {'git': True})
# Leftctx or right ctx might be filtered, so we need to use the contexts # Leftctx or right ctx might be filtered, so we need to use the contexts
# with an unfiltered repository to safely compute the diff # with an unfiltered repository to safely compute the diff
leftunfi = repo.unfiltered()[leftctx.rev()]
# leftctx and rightctx can be from different repository views in case of
# hgsubversion, do don't try to access them from same repository
# rightctx.repo() and leftctx.repo() are not always the same
leftunfi = leftctx._repo.unfiltered()[leftctx.rev()]
leftdiff = leftunfi.diff(opts=diffopts) leftdiff = leftunfi.diff(opts=diffopts)
rightunfi = repo.unfiltered()[rightctx.rev()] rightunfi = rightctx._repo.unfiltered()[rightctx.rev()]
rightdiff = rightunfi.diff(opts=diffopts) rightdiff = rightunfi.diff(opts=diffopts)
left, right = (0, 0) left, right = (0, 0)
while None not in (left, right): while None not in (left, right):
left = _getdifflines(leftdiff) left = _getdifflines(leftdiff)
right = _getdifflines(rightdiff) right = _getdifflines(rightdiff)
if left != right: if left != right: