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

test command parsing and dispatch

     2

     3

  $ hg init a

     4

  $ cd a

     5

     6

Redundant options used to crash (issue436):

     7

  $ hg -v log -v

     8

  $ hg -v log -v x

     9

    10

  $ echo a > a

    11

  $ hg ci -Ama

    12

  adding a

    13

    14

Missing arg:

    15

    16

  $ hg cat

    17

  hg cat: invalid arguments

    18

  hg cat [OPTION]... FILE...

    19

    20

  output the current or given revision of files

    21

    22

  options ([+] can be repeated):

    23

    24

   -o --output FORMAT       print output to file with formatted name

    25

   -r --rev REV             print the given revision

    26

      --decode              apply any matching decode filter

    27

   -I --include PATTERN [+] include names matching the given patterns

    28

   -X --exclude PATTERN [+] exclude names matching the given patterns

    29

    30

  (use "hg cat -h" to show more help)

    31

  [255]

    32

    33

[defaults]

    34

    35

  $ hg cat a

    36

  a

    37

  $ cat >> $HGRCPATH <<EOF

    38

  > [defaults]

    39

  > cat = -r null

    40

  > EOF

    41

  $ hg cat a

    42

  a: no such file in rev 000000000000

    43

  [1]

    44

    45

  $ cd "$TESTTMP"

    46

    47

OSError "No such file or directory" / "The system cannot find the path

    48

specified" should include filename even when it is empty

    49

    50

  $ hg -R a archive ''

    51

  abort: *: '' (glob)

    52

  [255]

    53

    54

#if no-outer-repo

    55

    56

No repo:

    57

    58

  $ hg cat

    59

  abort: no repository found in '$TESTTMP' (.hg not found)!

    60

  [255]

    61

    62

#endif