merge: mark .hgsubstate as possibly dirty before submerge for consistency Before this patch, failure of updating subrepos may cause inconsistent ".hgsubstate". For example: 1. dirstate entry for ".hgsubstate" of the parent repo is filled with valid size/date (via "hg state" or so) 2. "hg update" is invoked at the parent repo 3. ".hgsubstate" of the parent repo is updated on the filesystem as a part of "g"(et) action in "merge.applyupdates" 4. it is assumed that size/date of ".hgsubstate" on the filesystem aren't changed from ones at (1) this is not so difficult condition, because just changing hash ids (every ids are same in length) in ".hgsubstate" doesn't change the file size of it 5. "subrepo.submerge()" is invoked to update subrepos 6. failure of updating in one of subrepos raises exception (e.g. "untracked file differs") 7. "hg update" is aborted without updating dirstate of the parent repo dirstate entry for ".hgsubstate" still holds size/date at (1) Then, ".hgsubstate" of the parent repo is treated as "CLEAN" unexpectedly, because updating ".hgsubstate" at (3) doesn't change size/date of it on the filesystem: see assumption at (4). This inconsistent ".hgsubstate" status causes unexpected behavior, for example: - "hg revert" forgets to revert ".hgsubstate" - "hg update" misunderstands that (not yet updated) subrepos diverge (then, it shows the prompt to confirm user's decision) To avoid inconsistent ".hgsubstate" status above, this patch marks ".hgsubstate" as possibly dirty before "submerge" invocation. "normallookup"-ed (= dirty) dirstate should be written out, even if processing is aborted by failure. This patch marks ".hgsubstate" as possibly dirty before "submerge", also when it is removed or merged while merging, for safety. This should prevent Mercurial from misunderstanding inconsistent ".hgsubstate" as clean. To satisfy conditions at (1) and (4) above, this patch uses "hg status --config debug.dirstate.delaywrite=2" (to fill valid size/date into dirstate) and "touch" (to fix date of the file).

     1

     2

  $ cat > engine.py << EOF

     3

  > 

     4

  > from mercurial import templater

     5

  > 

     6

  > class mytemplater(object):

     7

  >     def __init__(self, loader, filters, defaults):

     8

  >         self.loader = loader

     9

  > 

    10

  >     def process(self, t, map):

    11

  >         tmpl = self.loader(t)

    12

  >         for k, v in map.iteritems():

    13

  >             if k in ('templ', 'ctx', 'repo', 'revcache', 'cache'):

    14

  >                 continue

    15

  >             if hasattr(v, '__call__'):

    16

  >                 v = v(**map)

    17

  >             v = templater.stringify(v)

    18

  >             tmpl = tmpl.replace('{{%s}}' % k, v)

    19

  >         yield tmpl

    20

  > 

    21

  > templater.engines['my'] = mytemplater

    22

  > EOF

    23

  $ hg init test

    24

  $ echo '[extensions]' > test/.hg/hgrc

    25

  $ echo "engine = `pwd`/engine.py" >> test/.hg/hgrc

    26

  $ cd test

    27

  $ cat > mymap << EOF

    28

  > changeset = my:changeset.txt

    29

  > EOF

    30

  $ cat > changeset.txt << EOF

    31

  > {{rev}} {{node}} {{author}}

    32

  > EOF

    33

  $ hg ci -Ama

    34

  adding changeset.txt

    35

  adding mymap

    36

  $ hg log --style=./mymap

    37

  0 97e5f848f0936960273bbf75be6388cd0350a32b test

    38

    39

  $ cat > changeset.txt << EOF

    40

  > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}

    41

  > EOF

    42

  $ hg ci -Ama

    43

  $ hg log --style=./mymap

    44

  0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000

    45

  -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000

    46

    47

  $ cd ..