Mercurial > hg
comparison tests/test-subrepo-git.t @ 23411:2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Retrieving the status of a git subrepo did not show ignored
files. Using 'git ls-files', we can retrieve these files
and display the correct status.
author | Mathias De Maré <mathias.demare@gmail.com> |
---|---|
date | Fri, 28 Nov 2014 20:16:15 +0100 |
parents | d4c972b97fee |
children | 01a8dfc79cdc |
comparison
equal
deleted
inserted
replaced
23410:cd9e5e57064d | 23411:2d86f4e38c08 |
---|---|
117 updating to branch default | 117 updating to branch default |
118 cloning subrepo s from $TESTTMP/gitroot | 118 cloning subrepo s from $TESTTMP/gitroot |
119 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 119 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
120 | 120 |
121 $ cd ../tb/s | 121 $ cd ../tb/s |
122 $ hg status --subrepos | |
122 $ echo f > f | 123 $ echo f > f |
124 $ hg status --subrepos | |
125 ? s/f | |
123 $ git add f | 126 $ git add f |
124 $ cd .. | 127 $ cd .. |
125 | 128 |
126 $ hg status --subrepos | 129 $ hg status --subrepos |
127 A s/f | 130 A s/f |
420 $ git add f1 | 423 $ git add f1 |
421 $ cd .. | 424 $ cd .. |
422 $ hg status -S | 425 $ hg status -S |
423 M s/g | 426 M s/g |
424 A s/f1 | 427 A s/f1 |
428 ? s/f2 | |
425 $ ls s | 429 $ ls s |
426 f | 430 f |
427 f1 | 431 f1 |
428 f2 | 432 f2 |
429 g | 433 g |
430 $ hg update --clean | 434 $ hg update --clean |
431 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 435 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
432 $ hg status -S | 436 $ hg status -S |
437 ? s/f1 | |
438 ? s/f2 | |
433 $ ls s | 439 $ ls s |
434 f | 440 f |
435 f1 | 441 f1 |
436 f2 | 442 f2 |
437 g | 443 g |