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

  $ hg init base

     2

     3

  $ cd base

     4

  $ echo 'alpha' > alpha

     5

  $ hg ci -A -m 'add alpha'

     6

  adding alpha

     7

  $ cd ..

     8

     9

  $ hg clone base work

    10

  updating to branch default

    11

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

    12

    13

  $ cd work

    14

  $ echo 'beta' > beta

    15

  $ hg ci -A -m 'add beta'

    16

  adding beta

    17

  $ cd ..

    18

    19

  $ cd base

    20

  $ echo 'gamma' > gamma

    21

  $ hg ci -A -m 'add gamma'

    22

  adding gamma

    23

  $ cd ..

    24

    25

  $ cd work

    26

  $ hg pull -q

    27

  $ hg merge

    28

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

    29

  (branch merge, don't forget to commit)

    30

    31

Update --clean to revision 1 to simulate a failed merge:

    32

    33

  $ rm alpha beta gamma

    34

  $ hg update --clean 1

    35

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    36

    37

  $ cd ..