Patrick Mezard <pmezard@gmail.com> [Tue, 15 Feb 2011 22:25:48 +0100] rev 13411
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
Matt Mackall <mpm@selenic.com> [Tue, 15 Feb 2011 16:19:11 -0600] rev 13410
tests: fixes for svn 1.4.2
André Sintzoff <andre.sintzoff@gmail.com> [Tue, 15 Feb 2011 20:02:52 +0100] rev 13409
mq: remove undo after a qimport
Adrian Buehlmann <adrian@cadifra.com> [Tue, 15 Feb 2011 14:41:49 +0100] rev 13408
transaction: use posixfile and unlink from util
instead of open() and os.unlink()
Avoids potential issues with file access on Windows (e.g. AV-scanners).
Kevin Bullock <kbullock@ringworld.org> [Mon, 14 Feb 2011 23:59:21 -0600] rev 13407
bookmarks: update help text since moving into core
Clarifies the help text for the bookmarks command regarding the
requirements for pushing or pulling bookmarks.
jfh <jason@jasonfharris.com> [Tue, 15 Feb 2011 23:23:16 +1300] rev 13406
debugignore: catch the case when ignore.includepat doesn't exist
In testing of my recent addition of a debugignore command, some of my MacHg
users uncovered the exceptional case that if there is no ignore patterns of any
kind then a traceback occurred. Catch and fix this case.