eol: handle LockUnavailable error (issue2569) If the repository is not locked when clearing the dirstate, then running test-eol.t in a loop fails sooner or later with: ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed --- /home/mg/src/mercurial-crew/tests/test-eol.t +++ /home/mg/src/mercurial-crew/tests/test-eol.t.err @@ -343,6 +343,7 @@ % hg status (eol activated) M win.txt % hg commit + nothing changed % hg status $ testmixed CRLF However, if we cannot lock the repository, then we can also not make a commit and so we can simply ignore a LockUnavailable error.

     1

  $ hg init

     2

     3

  $ mkdir alpha

     4

  $ touch alpha/one

     5

  $ mkdir beta

     6

  $ touch beta/two

     7

     8

  $ hg add alpha/one beta/two

     9

  $ hg ci -m "start"

    10

    11

  $ echo 1 > alpha/one

    12

  $ echo 2 > beta/two

    13

    14

everything

    15

    16

  $ hg diff --nodates

    17

  diff -r 7d5ef1aea329 alpha/one

    18

  --- a/alpha/one

    19

  +++ b/alpha/one

    20

  @@ -0,0 +1,1 @@

    21

  +1

    22

  diff -r 7d5ef1aea329 beta/two

    23

  --- a/beta/two

    24

  +++ b/beta/two

    25

  @@ -0,0 +1,1 @@

    26

  +2

    27

    28

beta only

    29

    30

  $ hg diff --nodates beta

    31

  diff -r 7d5ef1aea329 beta/two

    32

  --- a/beta/two

    33

  +++ b/beta/two

    34

  @@ -0,0 +1,1 @@

    35

  +2

    36

    37

inside beta

    38

    39

  $ cd beta

    40

  $ hg diff --nodates .

    41

  diff -r 7d5ef1aea329 beta/two

    42

  --- a/beta/two

    43

  +++ b/beta/two

    44

  @@ -0,0 +1,1 @@

    45

  +2

    46