Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 13411:d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
The default behaviour is to commit subrepositories with uncommitted changes. In
my experience this is usually undesirable:
- Changes to dependencies are often debugging leftovers
- Real changes should generally be applied on the source project directly,
tested then committed. This is not always possible, subversion subrepos may
include only a small part of the source project, without the tests.
Setting ui.commitsubrepos=no will now abort commits containing such modified
subrepositories like:
$ hg --config ui.commitsubrepos=no ci -m msg
abort: uncommitted changes in subrepo sub
I ruled out the hook solution because it does not easily take --include/exclude
options in account. Also, my main concern is whether this flag could cause
problems with extensions. If there are legitimate reasons for callers to
override this behaviour (I could not find any), they might either override at ui
level, or we could add an argument to localrepo.commit() later.
v2:
- Renamed ui.commitsubs to ui.commitsubrepos
- Mention the configuration entry in hg help subrepos
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 15 Feb 2011 22:25:48 +0100 |
parents | 14f3795a5ed7 |
children | 58c497d0e44d |
comparison
equal
deleted
inserted
replaced
13410:1f2b2c33d386 | 13411:d4de90a612f7 |
---|---|
930 if (not match('.hgsub') and | 930 if (not match('.hgsub') and |
931 '.hgsub' in (wctx.modified() + wctx.added())): | 931 '.hgsub' in (wctx.modified() + wctx.added())): |
932 raise util.Abort(_("can't commit subrepos without .hgsub")) | 932 raise util.Abort(_("can't commit subrepos without .hgsub")) |
933 if '.hgsubstate' not in changes[0]: | 933 if '.hgsubstate' not in changes[0]: |
934 changes[0].insert(0, '.hgsubstate') | 934 changes[0].insert(0, '.hgsubstate') |
935 | |
936 if subs and not self.ui.configbool('ui', 'commitsubrepos', True): | |
937 changedsubs = [s for s in subs if wctx.sub(s).dirty(True)] | |
938 if changedsubs: | |
939 raise util.Abort(_("uncommitted changes in subrepo %s") | |
940 % changedsubs[0]) | |
935 | 941 |
936 # make sure all explicit patterns are matched | 942 # make sure all explicit patterns are matched |
937 if not force and match.files(): | 943 if not force and match.files(): |
938 matched = set(changes[0] + changes[1] + changes[2]) | 944 matched = set(changes[0] + changes[1] + changes[2]) |
939 | 945 |