( )⚙ D4057 narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4057

narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)
ClosedPublic

Authored by pulkit on Aug 2 2018, 3:52 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGf64ebe7d2259: narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)
Summary

This also make narrow files use 'include' and 'exclude' instead of plural forms
which are 'includes' and 'excludes'.

This is BC because existing narrowspecs have to replace excludes, includes words
with exclude and include i.e. their singular versions.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 2 2018, 3:52 PM
martinvonz added a subscriber: martinvonz.Aug 2 2018, 5:03 PM
martinvonz added inline comments.
mercurial/narrowspec.py
143–148

We should at least abort if they're in there. I think we should add that check already in this patch.

martinvonz requested changes to this revision.Aug 2 2018, 5:03 PM
This revision now requires changes to proceed.Aug 2 2018, 5:03 PM
pulkit edited the summary of this revision. (Show Details)Aug 3 2018, 12:55 PM
pulkit retitled this revision from narrowspec: use sparse.parseconfig() to parse narrowspec file (BC) to narrowspec: use sparse.parseconfig() to parse narrowspec file.
pulkit updated this revision to Diff 9829.
pulkit marked an inline comment as done.Aug 3 2018, 12:56 PM
pulkit edited the summary of this revision. (Show Details)Aug 3 2018, 12:59 PM
pulkit retitled this revision from narrowspec: use sparse.parseconfig() to parse narrowspec file to narrowspec: use sparse.parseconfig() to parse narrowspec file (BC).
martinvonz accepted this revision.Aug 3 2018, 1:05 PM
martinvonz added inline comments.
mercurial/narrowspec.py
145

I'll rename this to profiles in flight

This revision is now accepted and ready to land.Aug 3 2018, 1:05 PM
martinvonz added a comment.Aug 3 2018, 7:46 PM

I've rebased this on top of D4093 and resolved the conflicts (simply drop the changes from this patch). I'll push it once tests have finished.

Closed by commit rHGf64ebe7d2259: narrowspec: use sparse.parseconfig() to parse narrowspec file (BC) (authored by pulkit). · Explain WhyAug 3 2018, 8:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9829

mercurial/narrowspec.py

# narrowspec.py - methods for working with a narrow view of a repository # narrowspec.py - methods for working with a narrow view of a repository
# #
# 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
import errno import errno
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
match as matchmod, match as matchmod,
sparse,
util, util,
) )
FILENAME = 'narrowspec' FILENAME = 'narrowspec'
def _parsestoredpatterns(text): def _parsestoredpatterns(text):
"""Parses the narrowspec format that's stored on disk.""" """Parses the narrowspec format that's stored on disk."""
patlist = None patlist = None
kind, pat = matchmod._patsplit(pattern, defaultkind) kind, pat = matchmod._patsplit(pattern, defaultkind)
return '%s:%s' % normalizesplitpattern(kind, pat) return '%s:%s' % normalizesplitpattern(kind, pat)
def parsepatterns(pats): def parsepatterns(pats):
"""Parses a list of patterns into a typed pattern set.""" """Parses a list of patterns into a typed pattern set."""
return set(normalizepattern(p) for p in pats) return set(normalizepattern(p) for p in pats)
def format(includes, excludes): def format(includes, excludes):
output = '[includes]\n' output = '[include]\n'
for i in sorted(includes - excludes): for i in sorted(includes - excludes):
output += i + '\n' output += i + '\n'
output += '[excludes]\n' output += '[exclude]\n'
for e in sorted(excludes): for e in sorted(excludes):
output += e + '\n' output += e + '\n'
return output return output
def match(root, include=None, exclude=None): def match(root, include=None, exclude=None):
if not include: if not include:
# Passing empty include and empty exclude to matchmod.match() # Passing empty include and empty exclude to matchmod.match()
# gives a matcher that matches everything, so explicitly use # gives a matcher that matches everything, so explicitly use
# Treat "narrowspec does not exist" the same as "narrowspec file exists # Treat "narrowspec does not exist" the same as "narrowspec file exists
# and is empty". # and is empty".
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
# Without this the next call to load will use the cached # Without this the next call to load will use the cached
# non-existence of the file, which can cause some odd issues. # non-existence of the file, which can cause some odd issues.
repo.invalidate(clearfilecache=True) repo.invalidate(clearfilecache=True)
return set(), set() return set(), set()
raise raise
return _parsestoredpatterns(spec) # maybe we should care about the profiles returned too
includepats, excludepats, __ = sparse.parseconfig(repo.ui, spec, 'narrow')
if __:
martinvonzUnsubmitted
Not Done

I'll rename this to profiles in flight

martinvonz: I'll rename this to `profiles` in flight
raise error.Abort(_("including other spec files using '%include' is not"
" suported in narrowspec"))
return includepats, excludepats
martinvonzUnsubmitted
Done

We should at least abort if they're in there. I think we should add that check already in this patch.

martinvonz: We should at least abort if they're in there. I think we should add that check already in this…
def save(repo, includepats, excludepats): def save(repo, includepats, excludepats):
spec = format(includepats, excludepats) spec = format(includepats, excludepats)
repo.vfs.write(FILENAME, spec) repo.vfs.write(FILENAME, spec)
def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes): def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes):
r""" Restricts the patterns according to repo settings, r""" Restricts the patterns according to repo settings,
results in a logical AND operation results in a logical AND operation

tests/test-narrow-clone-no-ellipsis.t

dotencode dotencode
fncache fncache
narrowhg-experimental narrowhg-experimental
revlogv1 revlogv1
store store
testonly-simplestore (reposimplestore !) testonly-simplestore (reposimplestore !)
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir/src/f10 path:dir/src/f10
[excludes] [exclude]
$ hg update $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src
dir/src/f10 dir/src/f10
$ cat dir/src/f10 $ cat dir/src/f10
10 10
$ cd .. $ cd ..
narrow clone a directory, tests/, except tests/t19 narrow clone a directory, tests/, except tests/t19
$ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19" $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 40 changesets with 19 changes to 19 files added 40 changesets with 19 changes to 19 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowdir $ cd narrowdir
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir/tests path:dir/tests
[excludes] [exclude]
path:dir/tests/t19 path:dir/tests/t19
$ hg update $ hg update
19 files updated, 0 files merged, 0 files removed, 0 files unresolved 19 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/tests dir/tests
dir/tests/t1 dir/tests/t1
dir/tests/t10 dir/tests/t10
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 40 changesets with 20 changes to 20 files added 40 changesets with 20 changes to 20 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowroot $ cd narrowroot
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:. path:.
[excludes] [exclude]
path:dir/tests path:dir/tests
$ hg update $ hg update
20 files updated, 0 files merged, 0 files removed, 0 files unresolved 20 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src
dir/src/f1 dir/src/f1
dir/src/f10 dir/src/f10

tests/test-narrow-clone.t

dotencode dotencode
fncache fncache
narrowhg-experimental narrowhg-experimental
revlogv1 revlogv1
store store
testonly-simplestore (reposimplestore !) testonly-simplestore (reposimplestore !)
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir/src/f10 path:dir/src/f10
[excludes] [exclude]
$ hg tracked $ hg tracked
I path:dir/src/f10 I path:dir/src/f10
$ hg update $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src
dir/src/f10 dir/src/f10
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 21 changesets with 19 changes to 19 files added 21 changesets with 19 changes to 19 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowdir $ cd narrowdir
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir/tests path:dir/tests
[excludes] [exclude]
path:dir/tests/t19 path:dir/tests/t19
$ hg tracked $ hg tracked
I path:dir/tests I path:dir/tests
X path:dir/tests/t19 X path:dir/tests/t19
$ hg update $ hg update
19 files updated, 0 files merged, 0 files removed, 0 files unresolved 19 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 21 changesets with 20 changes to 20 files added 21 changesets with 20 changes to 20 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowroot $ cd narrowroot
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:. path:.
[excludes] [exclude]
path:dir/tests path:dir/tests
$ hg tracked $ hg tracked
I path:. I path:.
X path:dir/tests X path:dir/tests
$ hg update $ hg update
20 files updated, 0 files merged, 0 files removed, 0 files unresolved 20 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir

tests/test-narrow-debugcommands.t

$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat << EOF > .hg/narrowspec $ cat << EOF > .hg/narrowspec
> [includes] > [include]
> path:foo > path:foo
> [excludes] > [exclude]
> EOF > EOF
$ echo treemanifest >> .hg/requires $ echo treemanifest >> .hg/requires
$ echo narrowhg-experimental >> .hg/requires $ echo narrowhg-experimental >> .hg/requires
$ mkdir -p foo/bar $ mkdir -p foo/bar
$ echo b > foo/f $ echo b > foo/f
$ echo c > foo/bar/f $ echo c > foo/bar/f
$ hg commit -Am hi $ hg commit -Am hi
adding foo/bar/f adding foo/bar/f

tests/test-narrow-patterns.t

adding file changes adding file changes
added 6 changesets with 4 changes to 4 files added 6 changesets with 4 changes to 4 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir1 path:dir1
path:dir2 path:dir2
[excludes] [exclude]
path:dir1/dirA path:dir1/dirA
path:dir1/dirB path:dir1/dirB
path:dir2/dirA path:dir2/dirA
path:dir2/dirB path:dir2/dirB
$ hg manifest -r tip $ hg manifest -r tip
dir1/bar dir1/bar
dir1/dirA/bar dir1/dirA/bar
dir1/dirA/foo dir1/dirA/foo
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 9 changesets with 6 changes to 6 files added 9 changesets with 6 changes to 6 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir1 path:dir1
path:dir2 path:dir2
[excludes] [exclude]
path:dir1/dirB path:dir1/dirB
path:dir2/dirA path:dir2/dirA
path:dir2/dirB path:dir2/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/bar dir1/dirA/bar
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 11 changesets with 7 changes to 7 files added 11 changesets with 7 changes to 7 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir1 path:dir1
path:dir2 path:dir2
[excludes] [exclude]
path:dir1/dirA/bar path:dir1/dirA/bar
path:dir1/dirB path:dir1/dirB
path:dir2/dirA path:dir2/dirA
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/foo dir1/dirA/foo
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 13 changesets with 8 changes to 8 files added 13 changesets with 8 changes to 8 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir1 path:dir1
path:dir2 path:dir2
[excludes] [exclude]
path:dir1/dirA path:dir1/dirA
path:dir1/dirA/bar path:dir1/dirA/bar
path:dir1/dirB path:dir1/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/foo dir1/foo
dir2 dir2
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 13 changesets with 9 changes to 9 files added 13 changesets with 9 changes to 9 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [include]
path:dir1 path:dir1
path:dir2 path:dir2
[excludes] [exclude]
path:dir1/dirA/bar path:dir1/dirA/bar
path:dir1/dirB path:dir1/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/foo dir1/dirA/foo
dir1/foo dir1/foo