Show More
@@ -569,6 +569,11 b' class hgsubrepo(abstractsubrepo):' | |||||
569 | root = r.wjoin(path) |
|
569 | root = r.wjoin(path) | |
570 | create = not r.wvfs.exists('%s/.hg' % path) |
|
570 | create = not r.wvfs.exists('%s/.hg' % path) | |
571 | self._repo = hg.repository(r.baseui, root, create=create) |
|
571 | self._repo = hg.repository(r.baseui, root, create=create) | |
|
572 | ||||
|
573 | # Propagate the parent's --hidden option | |||
|
574 | if r is r.unfiltered(): | |||
|
575 | self._repo = self._repo.unfiltered() | |||
|
576 | ||||
572 | self.ui = self._repo.ui |
|
577 | self.ui = self._repo.ui | |
573 | for s, k in [('ui', 'commitsubrepos')]: |
|
578 | for s, k in [('ui', 'commitsubrepos')]: | |
574 | v = r.ui.config(s, k) |
|
579 | v = r.ui.config(s, k) |
@@ -96,4 +96,14 b' check that we can update parent repo wit' | |||||
96 | revision 102a90ea7b4a in subrepo subrepo is hidden |
|
96 | revision 102a90ea7b4a in subrepo subrepo is hidden | |
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 |
|
98 | |||
|
99 | check that --hidden is propagated to the subrepo | |||
|
100 | ||||
|
101 | $ hg -R subrepo up tip | |||
|
102 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
103 | $ hg ci -m 'commit with amended subrepo' | |||
|
104 | $ echo bar > subrepo/a | |||
|
105 | $ hg -R subrepo ci --amend -m "amend a (again)" | |||
|
106 | $ hg --hidden cat subrepo/a | |||
|
107 | foo | |||
|
108 | ||||
99 | $ cd .. |
|
109 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now