Patchwork dirstate: drop explicitly-specified files that shouldn't match (BC)

login
register
mail settings
Submitter Augie Fackler
Date Feb. 13, 2018, 6:19 p.m.
Message ID <E64E9DF2-0837-4AFB-9A3A-1D5931898C05@durin42.com>
Download mbox | patch
Permalink /patch/27839/
State New
Headers show

Comments

Augie Fackler - Feb. 13, 2018, 6:19 p.m.
> On Feb 10, 2018, at 23:09, Yuya Nishihara <yuya@tcha.org> wrote:
> 
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1516963719 -32400
> #      Fri Jan 26 19:48:39 2018 +0900
> # Node ID ba8846546795996af10fe93db4317b855018d749
> # Parent  91aac8e6604d1aa08b2683c1d4c7d1936f226e48
> dirstate: drop explicitly-specified files that shouldn't match (BC)

New tests have appeared since you wrote this, and appear to cause surprise breakage. I don't have time to look now, but for now I'm going to discard this patch (but I agree we should come back to it.)

cd tests && python run-tests.py -j7 test-narrow-commit.t


ERROR: test-narrow-commit.t (case tree) output changed
!
Failed test-narrow-commit.t (case flat): output changed
Failed test-narrow-commit.t (case tree): output changed
via Mercurial-devel - Feb. 13, 2018, 6:21 p.m.
On Tue, Feb 13, 2018 at 10:19 AM Augie Fackler <raf@durin42.com> wrote:

>
>
> > On Feb 10, 2018, at 23:09, Yuya Nishihara <yuya@tcha.org> wrote:
> >
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1516963719 -32400
> > #      Fri Jan 26 19:48:39 2018 +0900
> > # Node ID ba8846546795996af10fe93db4317b855018d749
> > # Parent  91aac8e6604d1aa08b2683c1d4c7d1936f226e48
> > dirstate: drop explicitly-specified files that shouldn't match (BC)
>
> New tests have appeared since you wrote this, and appear to cause surprise
> breakage. I don't have time to look now, but for now I'm going to discard
> this patch (but I agree we should come back to it.)
>

I'm pretty sure that'll need the same workaround as in sparse.py (not
surprising, really, since we copied a lot from there).


>
> cd tests && python run-tests.py -j7 test-narrow-commit.t
>
> --- /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t
> +++ /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t.flat.err
> @@ -49,12 +49,8 @@
>    matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
>    f  inside/f1  inside/f1
>    $ hg add outside/f1
> -  abort: cannot track 'outside/f1' - it is outside the narrow clone
> -  [255]
>    $ touch outside/f3
>    $ hg add outside/f3
> -  abort: cannot track 'outside/f3' - it is outside the narrow clone
> -  [255]
>    $ rm -r outside
>
>  Can modify dirstate inside
>
> ERROR: test-narrow-commit.t (case flat) output changed
> !
> --- /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t
> +++ /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t.tree.err
> @@ -49,12 +49,8 @@
>    matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
>    f  inside/f1  inside/f1
>    $ hg add outside/f1
> -  abort: cannot track 'outside/f1' - it is outside the narrow clone
> -  [255]
>    $ touch outside/f3
>    $ hg add outside/f3
> -  abort: cannot track 'outside/f3' - it is outside the narrow clone
> -  [255]
>    $ rm -r outside
>
>  Can modify dirstate inside
>
> ERROR: test-narrow-commit.t (case tree) output changed
> !
> Failed test-narrow-commit.t (case flat): output changed
> Failed test-narrow-commit.t (case tree): output changed
>
>

Patch

--- /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t
+++ /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t.flat.err
@@ -49,12 +49,8 @@ 
   matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
   f  inside/f1  inside/f1
   $ hg add outside/f1
-  abort: cannot track 'outside/f1' - it is outside the narrow clone
-  [255]
   $ touch outside/f3
   $ hg add outside/f3
-  abort: cannot track 'outside/f3' - it is outside the narrow clone
-  [255]
   $ rm -r outside

 Can modify dirstate inside

ERROR: test-narrow-commit.t (case flat) output changed
!
--- /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t
+++ /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t.tree.err
@@ -49,12 +49,8 @@ 
   matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
   f  inside/f1  inside/f1
   $ hg add outside/f1
-  abort: cannot track 'outside/f1' - it is outside the narrow clone
-  [255]
   $ touch outside/f3
   $ hg add outside/f3
-  abort: cannot track 'outside/f3' - it is outside the narrow clone
-  [255]
   $ rm -r outside

 Can modify dirstate inside