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

#!/usr/bin/env python

     2

     3

import os, time, errno, signal

     4

     5

# Kill off any leftover daemon processes

     6

try:

     7

    fp = open(os.environ['DAEMON_PIDS'])

     8

    for line in fp:

     9

        try:

    10

            pid = int(line)

    11

        except ValueError:

    12

            continue

    13

        try:

    14

            os.kill(pid, 0)

    15

            os.kill(pid, signal.SIGTERM)

    16

            for i in range(10):

    17

                time.sleep(0.05)

    18

                os.kill(pid, 0)

    19

            os.kill(pid, signal.SIGKILL)

    20

        except OSError, err:

    21

            if err.errno != errno.ESRCH:

    22

                raise

    23

    fp.close()

    24

except IOError:

    25

    pass