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

#require docutils

     2

     3

Test document extraction

     4

     5

  $ HGENCODING=UTF-8

     6

  $ export HGENCODING

     7

  $ { echo C; ls "$TESTDIR/../i18n"/*.po | sort; } | while read PO; do

     8

  >     LOCALE=`basename "$PO" .po`

     9

  >     echo

    10

  >     echo "% extracting documentation from $LOCALE"

    11

  >     echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt

    12

  >     echo "" >> gendoc-$LOCALE.txt

    13

  >     LANGUAGE=$LOCALE python "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null || exit

    14

  > 

    15

  >     if [ $LOCALE != C ]; then

    16

  >         cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo '** NOTHING TRANSLATED **'

    17

  >     fi

    18

  > 

    19

  >     # We call runrst without adding "--halt warning" to make it report

    20

  >     # all errors instead of stopping on the first one.

    21

  >     echo "checking for parse errors"

    22

  >     python "$TESTDIR/../doc/runrst" html gendoc-$LOCALE.txt /dev/null

    23

  > done

    24

    25

  % extracting documentation from C

    26

  checking for parse errors

    27

    28

  % extracting documentation from da

    29

  checking for parse errors

    30

    31

  % extracting documentation from de

    32

  checking for parse errors

    33

    34

  % extracting documentation from el

    35

  checking for parse errors

    36

    37

  % extracting documentation from fr

    38

  checking for parse errors

    39

    40

  % extracting documentation from it

    41

  checking for parse errors

    42

    43

  % extracting documentation from ja

    44

  checking for parse errors

    45

    46

  % extracting documentation from pt_BR

    47

  checking for parse errors

    48

    49

  % extracting documentation from ro

    50

  checking for parse errors

    51

    52

  % extracting documentation from ru

    53

  checking for parse errors

    54

    55

  % extracting documentation from sv

    56

  checking for parse errors

    57

    58

  % extracting documentation from zh_CN

    59

  checking for parse errors

    60

    61

  % extracting documentation from zh_TW

    62

  checking for parse errors