templatekw: compare target context and its parent exactly (issue4690) Before this patch, template keywords `{file_mods}`, `{file_adds}` and `{file_dels}` use values gotten by `repo.status(ctx.p1().node(), ctx.node())`. But this doesn't work as expected if `ctx` is `memctx` or `workingcommitctx`. Typical case of templating with these contexts is customization of the text shown in the commit message editor by `[committemplate]` configuration. In this case, `ctx.node()` returns None and it causes comparison between `ctx.p1()` and `workingctx`. `workingctx` lists up all changed files in the working directory even at selective committing. BTW, `{files}` uses `ctx.files()` and it works as expected. To compare target context and its parent exactly, this patch passes `ctx.p1()` and `ctx` without `node()`-nize. This avoids unexpected comparison with `workingctx`. This patch uses a little redundant template configurations in `test-commit.t`, but they are needed to avoid regression around problems fixed by a4958cdb2202 and 1e6fb8db666e: accessing on `ctx` may break `ctx._status` field.

     1

http://mercurial.selenic.com/bts/issue1877

     2

     3

  $ hg init a

     4

  $ cd a

     5

  $ echo a > a

     6

  $ hg add a

     7

  $ hg ci -m 'a'

     8

  $ echo b > a

     9

  $ hg ci -m'b'

    10

  $ hg up 0

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

  $ hg book main

    13

  $ hg book

    14

   * main                      0:cb9a9f314b8b

    15

  $ echo c > c

    16

  $ hg add c

    17

  $ hg ci -m'c'

    18

  created new head

    19

  $ hg book

    20

   * main                      2:d36c0562f908

    21

  $ hg heads

    22

  changeset:   2:d36c0562f908

    23

  bookmark:    main

    24

  tag:         tip

    25

  parent:      0:cb9a9f314b8b

    26

  user:        test

    27

  date:        Thu Jan 01 00:00:00 1970 +0000

    28

  summary:     c

    29

    30

  changeset:   1:1e6c11564562

    31

  user:        test

    32

  date:        Thu Jan 01 00:00:00 1970 +0000

    33

  summary:     b

    34

    35

  $ hg up 1e6c11564562

    36

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    37

  (leaving bookmark main)

    38

  $ hg merge main

    39

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    40

  (branch merge, don't forget to commit)

    41

  $ hg book

    42

     main                      2:d36c0562f908

    43

  $ hg ci -m'merge'

    44

  $ hg book

    45

     main                      2:d36c0562f908

    46

    47

  $ cd ..