commands: make commit acquire locks before processing (issue4368) Before this patch, "hg commit" (process A) executes steps below: 1. get current branch heads via 'repo.branchheads()' - cache 'repo.changelog' 2. invoke 'repo.commit()' 3. acquire wlock - invalidate 'repo.dirstate' 4. access 'repo.dirstate' - re-read '.hg/dirstate' - check validity of parent revisions with 'repo.changelog' 5. invoke 'repo.commitctx()' 6. acquire store lock (slock) - invalidate 'repo.changelog' 7. do committing 8. release slock 9. release wlock 10. check new branch head (via 'cmdutil.commitstatus()') If acquisition of wlock at (3) above waits for another "hg commit" (process B) or so running parallelly to release wlock, process A causes creating orphan revision, because: - '.hg/dirstate' refers the revision, which is newly added by process B, as its parent - but already cached 'repo.changelog' doesn't contain such revision - therefore, validating parents of '.hg/dirstate' at (4) above replaces such revision with 'nullid' Then, process A creates "orphan" revision, of which parent is "null" revision. In addition to it, "created new head" may be shown at the end of process A unintentionally, if store is updated parallelly, because both getting branch heads (1) and checking new branch head (10) are executed outside slock scope. To avoid this issue, this patch makes "hg commit" acquire wlock and slock before processing. This patch resolves the issue between "hg commit" processes, but not one between "hg commit" and other commands. Subsequent patches resolve the latter. Even after this patch, there are still corner case problems below: - filecache may overlook changes of '.hg/dirstate', and it causes similar issue (see below for detail) https://bz.mercurial-scm.org/show_bug.cgi?id=4368#c10 - 3rd party extension may cause similar issue, if it directly uses 'repo.commit()' without acquisition of wlock and slock This can be fixed by acquisition of slock at the beginning of 'repo.commit()', but it seems suitable for "default" branch In fact, acquisition of slock itself is already introduced at "default" branch by 4414d500604f, but acquisition is not at the beginning of 'repo.commit()'. This patch also changes some tests: - test-fncache.t needs this tricky wrapping, to release (= forced failure of) wlock certainly - order of "hg commit" output is changed by widening scope of locks, because some hooks are fired after releasing wlock

     1

import os

     2

from mercurial import hg, ui

     3

from mercurial.hgweb.hgwebdir_mod import hgwebdir

     4

     5

os.mkdir('webdir')

     6

os.chdir('webdir')

     7

     8

webdir = os.path.realpath('.')

     9

    10

u = ui.ui()

    11

hg.repository(u, 'a', create=1)

    12

hg.repository(u, 'b', create=1)

    13

os.chdir('b')

    14

hg.repository(u, 'd', create=1)

    15

os.chdir('..')

    16

hg.repository(u, 'c', create=1)

    17

os.chdir('..')

    18

    19

paths = {'t/a/': '%s/a' % webdir,

    20

         'b': '%s/b' % webdir,

    21

         'coll': '%s/*' % webdir,

    22

         'rcoll': '%s/**' % webdir}

    23

    24

config = os.path.join(webdir, 'hgwebdir.conf')

    25

configfile = open(config, 'w')

    26

configfile.write('[paths]\n')

    27

for k, v in paths.items():

    28

    configfile.write('%s = %s\n' % (k, v))

    29

configfile.close()

    30

    31

confwd = hgwebdir(config)

    32

dictwd = hgwebdir(paths)

    33

    34

assert len(confwd.repos) == len(dictwd.repos), 'different numbers'

    35

assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos)

    36

    37

found = dict(confwd.repos)

    38

for key, path in dictwd.repos:

    39

    assert key in found, 'repository %s was not found' % key

    40

    assert found[key] == path, 'different paths for repo %s' % key