Submitter | Matt Harbison |
---|---|
Date | Dec. 18, 2012, 2:47 a.m. |
Message ID | <kaolfd$mci$1@ger.gmane.org> |
Download | mbox | patch |
Permalink | /patch/181/ |
State | Superseded |
Commit | 9e3910db4e787787c315808f37ceecf695cb18c9 |
Headers | show |
Comments
On Tue, Dec 18, 2012 at 3:47 AM, Matt Harbison <matt_harbison at yahoo.com> wrote: > On Mon, 17 Dec 2012 07:41:20 +0100, Angel Ezquerra wrote: > >> On Mon, Dec 17, 2012 at 1:35 AM, Mads Kiilerich <mads at kiilerich.com> >> wrote: >>> Angel Ezquerra wrote, On 12/17/2012 12:27 AM: >>> >>>> On Mon, Dec 17, 2012 at 12:24 AM, Angel Ezquerra >>>> <angel.ezquerra at gmail.com> wrote: >>>>> >>>>> # HG changeset patch >>>>> # User Angel Ezquerra <angel.ezquerra at gmail.com> >>>>> # Date 1355438273 -3600 >>>>> # Node ID 964686dbc23ea2e66c5f86ebffe96425096dd89c >>>>> # Parent 34a1a639d8358e43f4bcba7b0cff19f4e4e6958d >>>>> subrepo: append subrepo path to subrepo error messages > > [..] > >>> test-subrepo-git.t and test-subrepo-svn.t also needs updating (but >>> might be a bit tricky to run on windows). >> >> Yeah, I don't think those work. I don't even have git, much less svn >> installed. >> I could split this patch in three, resubmit it with the hg only changes, >> which I can test right of the bat, and maybe resend the git and svn >> changes if I get them to work somehow (perhaps on a Linux VM)? > > If it helps, I can run both of those tests for the next round. I got this > when running tests with this patch (a couple others got flagged too). > Feel free to fold it in: > > diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t > --- a/tests/test-subrepo-git.t > +++ b/tests/test-subrepo-git.t > @@ -331,10 +331,10 @@ > $ hg sum | grep commit > commit: 1 subrepos > $ hg push -q > - abort: subrepo s is missing > + abort: subrepo s is missing (on subrepo s) > [255] > $ hg commit --subrepos -qm missing > - abort: subrepo s is missing > + abort: subrepo s is missing (on subrepo s) > [255] > $ hg update -C > cloning subrepo s from $TESTTMP/gitroot > diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t > --- a/tests/test-subrepo-recursion.t > +++ b/tests/test-subrepo-recursion.t > @@ -386,7 +386,7 @@ > $ echo f > foo/f > $ hg archive --subrepos -r tip archive > cloning subrepo foo from $TESTTMP/empty/foo > - abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob) > + abort: destination '$TESTTMP/almost-empty/foo' is not empty (on subrepo foo) (glob) > [255] > > Clone and test outgoing: > diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t > --- a/tests/test-subrepo-svn.t > +++ b/tests/test-subrepo-svn.t > @@ -119,7 +119,7 @@ > $ rm s/alpha > $ hg commit --subrepos -m 'abort on missing file' > committing subrepository s > - abort: cannot commit missing svn entries > + abort: cannot commit missing svn entries (on subrepo s) > [255] > $ svn revert s/alpha > /dev/null > > @@ -180,7 +180,7 @@ > $ echo zzz > s/externals/other > $ hg ci --subrepos -m 'amend externals from hg' > committing subrepository s > - abort: cannot commit svn externals > + abort: cannot commit svn externals (on subrepo s) > [255] > $ hg diff --subrepos -r 1:2 | grep -v diff > --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 > @@ -202,7 +202,7 @@ > property 'svn:mime-type' set on 's/externals/other' (glob) > $ hg ci --subrepos -m 'amend externals from hg' > committing subrepository s > - abort: cannot commit svn externals > + abort: cannot commit svn externals (on subrepo s) > [255] > $ svn revert -q s/externals/other > > diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t > --- a/tests/test-subrepo.t > +++ b/tests/test-subrepo.t > @@ -645,7 +645,7 @@ > added 2 changesets with 3 changes to 2 files > (run 'hg update' to get a working copy) > $ hg -R issue1852b update > - abort: default path for subrepository not found (on subrepo sub\repo) > + abort: default path for subrepository not found (on subrepo sub/repo) (glob) > [255] > > Pull -u now doesn't help Thank you Matt, that's really helpful. I will fix these in a new version of the patch that I'll send shortly. It would be great if you could run these and other subrepo tests which I cannot run on windows (for example the test-subrepo-relative-path.t test does not work well on Windows). Cheers, Angel
Patch
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t --- a/tests/test-subrepo-git.t +++ b/tests/test-subrepo-git.t @@ -331,10 +331,10 @@ $ hg sum | grep commit commit: 1 subrepos $ hg push -q - abort: subrepo s is missing + abort: subrepo s is missing (on subrepo s) [255] $ hg commit --subrepos -qm missing - abort: subrepo s is missing + abort: subrepo s is missing (on subrepo s) [255] $ hg update -C cloning subrepo s from $TESTTMP/gitroot diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t --- a/tests/test-subrepo-recursion.t +++ b/tests/test-subrepo-recursion.t @@ -386,7 +386,7 @@ $ echo f > foo/f $ hg archive --subrepos -r tip archive cloning subrepo foo from $TESTTMP/empty/foo - abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob) + abort: destination '$TESTTMP/almost-empty/foo' is not empty (on subrepo foo) (glob) [255] Clone and test outgoing: diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t --- a/tests/test-subrepo-svn.t +++ b/tests/test-subrepo-svn.t @@ -119,7 +119,7 @@ $ rm s/alpha $ hg commit --subrepos -m 'abort on missing file' committing subrepository s - abort: cannot commit missing svn entries + abort: cannot commit missing svn entries (on subrepo s) [255] $ svn revert s/alpha > /dev/null @@ -180,7 +180,7 @@ $ echo zzz > s/externals/other $ hg ci --subrepos -m 'amend externals from hg' committing subrepository s - abort: cannot commit svn externals + abort: cannot commit svn externals (on subrepo s) [255] $ hg diff --subrepos -r 1:2 | grep -v diff --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 @@ -202,7 +202,7 @@ property 'svn:mime-type' set on 's/externals/other' (glob) $ hg ci --subrepos -m 'amend externals from hg' committing subrepository s - abort: cannot commit svn externals + abort: cannot commit svn externals (on subrepo s) [255] $ svn revert -q s/externals/other diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -645,7 +645,7 @@ added 2 changesets with 3 changes to 2 files (run 'hg update' to get a working copy) $ hg -R issue1852b update - abort: default path for subrepository not found (on subrepo sub\repo) + abort: default path for subrepository not found (on subrepo sub/repo) (glob) [255] Pull -u now doesn't help