This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2490

narrow: consider both local and remote matchers in narrowchangegroup
ClosedPublic

Authored by martinvonz on Feb 28 2018, 3:56 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2d82a24d0c78: narrow: consider both local and remote matchers in narrowchangegroup
rHGae95b0c81051: narrow: consider both local and remote matchers in narrowchangegroup
Summary

The existing code that picked one or the other seemed very
suspicious. This patch makes us intersect the local matcher with the
matcher from the remote, which seems better. It fixes one test case
and makes another one that used to crash no longer crash, but instead
silently succeed with a push that's lossy, so that remains to be
fixed.

The real reason for doing this now is that I'm going to move
narrowrepo.narrowmatch() onto localrepo and then it will always be
defined, which would otherwise break this code.

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

martinvonz created this revision.Feb 28 2018, 3:56 PM
indygreg accepted this revision.Feb 28 2018, 9:06 PM
This revision is now accepted and ready to land.Feb 28 2018, 9:06 PM
Closed by commit rHGae95b0c81051: narrow: consider both local and remote matchers in narrowchangegroup (authored by martinvonz). · Explain WhyFeb 28 2018, 9:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6223

hgext/narrow/narrowchangegroup.py

# narrowchangegroup.py - narrow clone changegroup creation and consumption # narrowchangegroup.py - narrow clone changegroup creation and consumption
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, 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.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
changegroup, changegroup,
error, error,
extensions, extensions,
manifest, manifest,
match as matchmod,
mdiff, mdiff,
node, node,
revlog, revlog,
util, util,
) )
def setup(): def setup():
def _cgmatcher(cgpacker):
localmatcher = getattr(cgpacker._repo, 'narrowmatch', lambda: None)()
remotematcher = getattr(cgpacker, '_narrow_matcher', lambda: None)()
if localmatcher and remotematcher:
return matchmod.intersectmatchers(localmatcher, remotematcher)
else:
return localmatcher or remotematcher
def prune(orig, self, revlog, missing, commonrevs): def prune(orig, self, revlog, missing, commonrevs):
if isinstance(revlog, manifest.manifestrevlog): if isinstance(revlog, manifest.manifestrevlog):
matcher = getattr(self._repo, 'narrowmatch', matcher = _cgmatcher(self)
getattr(self, '_narrow_matcher', None)) if (matcher and
if (matcher is not None and not matcher.visitdir(revlog._dir[:-1] or '.')):
not matcher().visitdir(revlog._dir[:-1] or '.')):
return [] return []
return orig(self, revlog, missing, commonrevs) return orig(self, revlog, missing, commonrevs)
extensions.wrapfunction(changegroup.cg1packer, 'prune', prune) extensions.wrapfunction(changegroup.cg1packer, 'prune', prune)
def generatefiles(orig, self, changedfiles, linknodes, commonrevs, def generatefiles(orig, self, changedfiles, linknodes, commonrevs,
source): source):
matcher = getattr(self._repo, 'narrowmatch', matcher = _cgmatcher(self)
getattr(self, '_narrow_matcher', None)) if matcher:
if matcher is not None: changedfiles = filter(matcher, changedfiles)
narrowmatch = matcher()
changedfiles = [f for f in changedfiles if narrowmatch(f)]
if getattr(self, 'is_shallow', False): if getattr(self, 'is_shallow', False):
# See comment in generate() for why this sadness is a thing. # See comment in generate() for why this sadness is a thing.
mfdicts = self._mfdicts mfdicts = self._mfdicts
del self._mfdicts del self._mfdicts
# In a shallow clone, the linknodes callback needs to also include # In a shallow clone, the linknodes callback needs to also include
# those file nodes that are in the manifests we sent but weren't # those file nodes that are in the manifests we sent but weren't
# introduced by those manifests. # introduced by those manifests.
commonctxs = [self._repo[c] for c in commonrevs] commonctxs = [self._repo[c] for c in commonrevs]

tests/test-narrow-exchange.t

| |
o 1 8cd66ca966b4 inside/f o 1 8cd66ca966b4 inside/f
| |
o 0 c8057d6f53ab inside/f inside2/f outside/f o 0 c8057d6f53ab inside/f inside2/f outside/f
$ hg pull ssh://user@dummy/narrow2 $ hg pull ssh://user@dummy/narrow2
pulling from ssh://user@dummy/narrow2 pulling from ssh://user@dummy/narrow2
searching for changes searching for changes
remote: abort: unable to resolve parent while packing 'data/inside2/f.i' 3 for changeset 5 (?)
adding changesets adding changesets
remote: abort: unexpected error: unable to resolve parent while packing 'data/inside2/f.i' 3 for changeset 5 adding manifests
transaction abort! adding file changes
rollback completed added 1 changesets with 0 changes to 0 files
abort: pull failed on remote new changesets d78a96df731d
[255] (run 'hg update' to get a working copy)
Check that the resulting history is valid in the full repo Check that the resulting history is valid in the full repo
$ cd ../narrow2 $ cd ../narrow2
$ hg push ssh://user@dummy/master $ hg push ssh://user@dummy/master
pushing to ssh://user@dummy/master pushing to ssh://user@dummy/master
searching for changes searching for changes
remote: adding changesets remote: adding changesets
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets * (glob) new changesets * (glob)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
TODO: this should tell the user that their narrow clone does not have the TODO: this should tell the user that their narrow clone does not have the
necessary content to be able to push to the target necessary content to be able to push to the target
$ hg push ssh://user@dummy/narrow2 $ hg push ssh://user@dummy/narrow2
pushing to ssh://user@dummy/narrow2 pushing to ssh://user@dummy/narrow2
searching for changes searching for changes
remote has heads on branch 'default' that are not known locally: d78a96df731d remote: adding changesets
abort: push creates new remote head 5970befb64ba! remote: adding manifests
(pull and merge or see 'hg help push' for details about pushing new heads) remote: adding file changes
[255] remote: added 1 changesets with 0 changes to 0 files