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

#require no-msys # MSYS will translate web paths as if they were file paths

     2

     3

This is a rudimentary test of the CGI files as of d74fc8dec2b4.

     4

     5

  $ hg init test

     6

     7

  $ cat >hgweb.cgi <<HGWEB

     8

  > #!/usr/bin/env python

     9

  > #

    10

  > # An example CGI script to use hgweb, edit as necessary

    11

  > 

    12

  > import cgitb

    13

  > cgitb.enable()

    14

  > 

    15

  > from mercurial import demandimport; demandimport.enable()

    16

  > from mercurial.hgweb import hgweb

    17

  > from mercurial.hgweb import wsgicgi

    18

  > 

    19

  > application = hgweb("test", "Empty test repository")

    20

  > wsgicgi.launch(application)

    21

  > HGWEB

    22

    23

  $ chmod 755 hgweb.cgi

    24

    25

  $ cat >hgweb.config <<HGWEBDIRCONF

    26

  > [paths]

    27

  > test = test

    28

  > HGWEBDIRCONF

    29

    30

  $ cat >hgwebdir.cgi <<HGWEBDIR

    31

  > #!/usr/bin/env python

    32

  > #

    33

  > # An example CGI script to export multiple hgweb repos, edit as necessary

    34

  > 

    35

  > import cgitb

    36

  > cgitb.enable()

    37

  > 

    38

  > from mercurial import demandimport; demandimport.enable()

    39

  > from mercurial.hgweb import hgwebdir

    40

  > from mercurial.hgweb import wsgicgi

    41

  > 

    42

  > application = hgwebdir("hgweb.config")

    43

  > wsgicgi.launch(application)

    44

  > HGWEBDIR

    45

    46

  $ chmod 755 hgwebdir.cgi

    47

    48

  $ . "$TESTDIR/cgienv"

    49

  $ python hgweb.cgi > page1

    50

  $ python hgwebdir.cgi > page2

    51

    52

  $ PATH_INFO="/test/"

    53

  $ PATH_TRANSLATED="/var/something/test.cgi"

    54

  $ REQUEST_URI="/test/test/"

    55

  $ SCRIPT_URI="http://hg.omnifarious.org/test/test/"

    56

  $ SCRIPT_URL="/test/test/"

    57

  $ python hgwebdir.cgi > page3

    58

    59

  $ grep -i error page1 page2 page3

    60

  [1]