##// END OF EJS Templates
subrepo: add status support for ignored files in git subrepos...
Mathias De Maré -
r23411:2d86f4e3 default
parent child Browse files
Show More
@@ -1570,6 +1570,15 b' class gitsubrepo(abstractsubrepo):'
1570 removed.append(f)
1570 removed.append(f)
1571
1571
1572 deleted, unknown, ignored, clean = [], [], [], []
1572 deleted, unknown, ignored, clean = [], [], [], []
1573
1574 if not rev2:
1575 command = ['ls-files', '--others', '--exclude-standard']
1576 out = self._gitcommand(command)
1577 for line in out.split('\n'):
1578 if len(line) == 0:
1579 continue
1580 unknown.append(line)
1581
1573 return scmutil.status(modified, added, removed, deleted,
1582 return scmutil.status(modified, added, removed, deleted,
1574 unknown, ignored, clean)
1583 unknown, ignored, clean)
1575
1584
@@ -119,7 +119,10 b' clone root separately, make different lo'
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
@@ -422,6 +425,7 b' Check hg update --clean'
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
@@ -430,6 +434,8 b' Check hg update --clean'
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
General Comments 0
You need to be logged in to leave comments. Login now