Mercurial > hg-stable
changeset 41330:4ea21df312ec stable 4.9.1
record: prevent commits that don't pick up dirty subrepo changes (issue6102)
This path covers interactive mode for commit, amend, and shelve, as well as the
deprecated record extension. Since shelf creation uses commit without -S in the
non-interactive case, aborting here should be OK. (I didn't check what happens
to non interactive shelve creation if `ui.commitsubrepos=True` is set.)
subrepoutil.precommit() will abort on a dirty subrepo if the config option isn't
set, but the hint recommends using --subrepos to commit. Since only the commit
command currently supports that option, the error has to be raised here to omit
the hint.
Doing the check before asking about all of the hunks in the MQ test seems like
an improvement on its own. There's probably an additional check on this path
that can be removed.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 16 Mar 2019 14:40:21 -0400 |
| parents | 406519302520 |
| children | 55834ace6f2d |
| files | mercurial/cmdutil.py tests/test-amend-subrepo.t tests/test-mq-subrepo.t |
| diffstat | 3 files changed, 37 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sun Mar 17 12:43:45 2019 +0900 +++ b/mercurial/cmdutil.py Sat Mar 16 14:40:21 2019 -0400 @@ -7,6 +7,7 @@ from __future__ import absolute_import +import copy as copymod import errno import os import re @@ -270,6 +271,28 @@ raise error.Abort(_('cannot partially commit a merge ' '(use "hg commit" instead)')) + status = repo.status(match=match) + + overrides = {(b'ui', b'commitsubrepos'): True} + + with repo.ui.configoverride(overrides, b'record'): + # subrepoutil.precommit() modifies the status + tmpstatus = scmutil.status(copymod.copy(status[0]), + copymod.copy(status[1]), + copymod.copy(status[2]), + copymod.copy(status[3]), + copymod.copy(status[4]), + copymod.copy(status[5]), + copymod.copy(status[6])) + + # Force allows -X subrepo to skip the subrepo. + subs, commitsubs, newstate = subrepoutil.precommit( + repo.ui, wctx, tmpstatus, match, force=True) + for s in subs: + if s in commitsubs: + dirtyreason = wctx.sub(s).dirtyreason(True) + raise error.Abort(dirtyreason) + def fail(f, msg): raise error.Abort('%s: %s' % (f, msg)) @@ -279,7 +302,6 @@ match.explicitdir = vdirs.append match.bad = fail - status = repo.status(match=match) if not force: repo.checkcommitpatterns(wctx, vdirs, match, status, fail) diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
--- a/tests/test-amend-subrepo.t Sun Mar 17 12:43:45 2019 +0900 +++ b/tests/test-amend-subrepo.t Sat Mar 16 14:40:21 2019 -0400 @@ -121,9 +121,22 @@ $ echo a >> a $ hg ci -m3 + $ echo 't = t' > .hgsub + +--interactive won't silently ignore dirty subrepos + + $ echo modified > t/b + $ hg amend --interactive --config ui.interactive=True + abort: uncommitted changes in subrepository "t" + [255] + $ hg amend --interactive --config ui.interactive=True --config ui.commitsubrepos=True + abort: uncommitted changes in subrepository "t" + [255] + + $ hg -R t revert -q --all --no-backup + amend with one subrepo dropped - $ echo 't = t' > .hgsub $ hg amend saved backup bundle to * (glob) (obsstore-off !) $ hg status --change .
--- a/tests/test-mq-subrepo.t Sun Mar 17 12:43:45 2019 +0900 +++ b/tests/test-mq-subrepo.t Sat Mar 16 14:40:21 2019 -0400 @@ -295,16 +295,6 @@ A .hgsub A sub/a % qrecord --config ui.interactive=1 -m0 0.diff - diff --git a/.hgsub b/.hgsub - new file mode 100644 - examine changes to '.hgsub'? [Ynesfdaq?] y - - @@ -0,0 +1,1 @@ - +sub = sub - record this change to '.hgsub'? [Ynesfdaq?] y - - warning: subrepo spec file '.hgsub' not found - warning: subrepo spec file '.hgsub' not found abort: uncommitted changes in subrepository "sub" [255] % update substate when adding .hgsub w/clean updated subrepo @@ -333,15 +323,6 @@ M .hgsub A sub2/a % qrecord --config ui.interactive=1 -m1 1.diff - diff --git a/.hgsub b/.hgsub - 1 hunks, 1 lines changed - examine changes to '.hgsub'? [Ynesfdaq?] y - - @@ -1,1 +1,2 @@ - sub = sub - +sub2 = sub2 - record this change to '.hgsub'? [Ynesfdaq?] y - abort: uncommitted changes in subrepository "sub2" [255] % update substate when modifying .hgsub w/clean updated subrepo