Mercurial > hg
changeset 24613:f8bc3de9b343
test-subrepo-recursion: fix output on non-hardlink systems
There's a slight bug present where a topic doesn't get closed when it should.
This isn't a regression, so I've made a note in the test file.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 03 Apr 2015 18:19:24 -0400 |
| parents | 30fc7cf43063 |
| children | 241d98d84aed |
| files | tests/test-subrepo-recursion.t |
| diffstat | 1 files changed, 31 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-subrepo-recursion.t Fri Apr 03 23:12:21 2015 -0400 +++ b/tests/test-subrepo-recursion.t Fri Apr 03 18:19:24 2015 -0400 @@ -343,6 +343,7 @@ Test archiving a revision that references a subrepo that is not yet cloned: +#if hardlink $ hg clone -U . ../empty \r (no-eol) (esc) linking [ <=> ] 1\r (no-eol) (esc) @@ -354,7 +355,14 @@ linking [ <=> ] 7\r (no-eol) (esc) linking [ <=> ] 8\r (no-eol) (esc) \r (no-eol) (esc) +#else + $ hg clone -U . ../empty + \r (no-eol) (esc) + linking [ <=> ] 1 (no-eol) +#endif + $ cd ../empty +#if hardlink $ hg archive --subrepos -r tip ../archive.tar.gz \r (no-eol) (esc) archiving [ ] 0/3\r (no-eol) (esc) @@ -402,6 +410,29 @@ \r (no-eol) (esc) cloning subrepo foo from $TESTTMP/repo/foo cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) +#else +Note there's a slight output glitch on non-hardlink systems: the last +"linking" progress topic never gets closed, leading to slight output corruption on that platform. + $ hg archive --subrepos -r tip ../archive.tar.gz + \r (no-eol) (esc) + archiving [ ] 0/3\r (no-eol) (esc) + archiving [ ] 0/3\r (no-eol) (esc) + archiving [=============> ] 1/3\r (no-eol) (esc) + archiving [=============> ] 1/3\r (no-eol) (esc) + archiving [===========================> ] 2/3\r (no-eol) (esc) + archiving [===========================> ] 2/3\r (no-eol) (esc) + archiving [==========================================>] 3/3\r (no-eol) (esc) + archiving [==========================================>] 3/3\r (no-eol) (esc) + \r (no-eol) (esc) + \r (no-eol) (esc) + linking [ <=> ] 1\r (no-eol) (esc) + \r (no-eol) (esc) + \r (no-eol) (esc) + \r (no-eol) (esc) + \r (no-eol) (esc) + linking [ <=> ] 1cloning subrepo foo from $TESTTMP/repo/foo + cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) +#endif The newly cloned subrepos contain no working copy: