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

import os

     2

from hgext import color

     3

from mercurial import dispatch, ui

     4

     5

# ensure errors aren't buffered

     6

testui = color.colorui()

     7

testui.pushbuffer()

     8

testui.write(('buffered\n'))

     9

testui.warn(('warning\n'))

    10

testui.write_err('error\n')

    11

print repr(testui.popbuffer())

    12

    13

# test dispatch.dispatch with the same ui object

    14

hgrc = open(os.environ["HGRCPATH"], 'w')

    15

hgrc.write('[extensions]\n')

    16

hgrc.write('color=\n')

    17

hgrc.close()

    18

    19

ui_ = ui.ui()

    20

ui_.setconfig('ui', 'formatted', 'True')

    21

    22

# we're not interested in the output, so write that to devnull

    23

ui_.fout = open(os.devnull, 'w')

    24

    25

# call some arbitrary command just so we go through

    26

# color's wrapped _runcommand twice.

    27

def runcmd():

    28

    dispatch.dispatch(dispatch.request(['version', '-q'], ui_))

    29

    30

runcmd()

    31

print "colored? " + str(issubclass(ui_.__class__, color.colorui))

    32

runcmd()

    33

print "colored? " + str(issubclass(ui_.__class__, color.colorui))