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

     1

  $ hg init

     2

  $ echo a > a

     3

  $ hg ci -Am0

     4

  adding a

     5

     6

  $ hg -q clone . foo

     7

     8

  $ touch .hg/store/journal

     9

    10

  $ echo foo > a

    11

  $ hg ci -Am0

    12

  abort: abandoned transaction found - run hg recover!

    13

  [255]

    14

    15

  $ hg recover

    16

  rolling back interrupted transaction

    17

  checking changesets

    18

  checking manifests

    19

  crosschecking files in changesets and manifests

    20

  checking files

    21

  1 files, 1 changesets, 1 total revisions

    22

    23

Check that zero-size journals are correctly aborted:

    24

    25

  $ hg bundle -qa repo.hg

    26

  $ chmod -w foo/.hg/store/00changelog.i

    27

    28

  $ hg -R foo unbundle repo.hg

    29

  adding changesets

    30

  abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)

    31

  [255]

    32

    33

  $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi

    34