Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo-recursion.t @ 15321:e174353e8cda stable
subrepos: abort commit by default if a subrepo is dirty (BC)
This changeset flips the default value of ui.commitsubrepos setting
from True to False and adds a --subrepos flag to commit.
The commit, status, and diff commands behave like this with regard to
recusion and the ui.commitsubrepos setting:
| recurses | recurses
| by default | with --subrepos
--------+---------------+----------------
commit: | commitsubrepo | True
status: | False | True
diff: | False | True
By changing the default from True to False, the table becomes
consistent in the two columns:
* without --subrepos on the command line, commit will abort if a
subrepo is dirty and status/diff wont show changes inside subrepos.
* with --subrepos, all three commands will recurse.
A --subrepos flag on the command line overrides the config settin.g
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 21 Oct 2011 00:33:08 +0200 |
| parents | b3e19c355ca7 |
| children | 9910f60a37ee |
line wrap: on
line diff
--- a/tests/test-subrepo-recursion.t Thu Oct 20 17:05:13 2011 -0400 +++ b/tests/test-subrepo-recursion.t Fri Oct 21 00:33:08 2011 +0200 @@ -58,7 +58,14 @@ Commits: - $ hg commit -m 0-0-0 + $ hg commit -m fails + abort: uncommitted changes in subrepo foo + (use --subrepos for recursive commit) + [255] + +The --subrepos flag overwrite the config setting: + + $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos committing subrepository foo committing subrepository foo/bar @@ -177,7 +184,7 @@ Cleanup and final commit: $ rm -r dir - $ hg commit -m 2-3-2 + $ hg commit --subrepos -m 2-3-2 committing subrepository foo committing subrepository foo/bar @@ -394,7 +401,7 @@ y2 y3 +y4 - $ hg commit -m 3-4-2 + $ hg commit --subrepos -m 3-4-2 committing subrepository foo $ hg outgoing -S comparing with $TESTTMP/repo