log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.

     1

#!/bin/sh

     2

     3

hg init repo

     4

cd repo

     5

     6

echo foo > foo

     7

echo bar > bar

     8

hg ci -qAm 'add foo bar'

     9

    10

echo foo2 >> foo

    11

echo bleh > bar

    12

hg ci -m 'change foo bar'

    13

    14

hg up -qC 0

    15

hg mv foo foo1

    16

echo foo1 > foo1

    17

hg cat foo >> foo1

    18

hg ci -m 'mv foo foo1'

    19

    20

hg merge

    21

hg debugstate --nodates

    22

hg st -q

    23

    24

echo '% removing foo1 and bar'

    25

cp foo1 F

    26

cp bar B

    27

hg rm -f foo1 bar

    28

hg debugstate --nodates

    29

hg st -qC

    30

    31

echo '% readding foo1 and bar'

    32

cp F foo1

    33

cp B bar

    34

hg add -v foo1 bar

    35

hg debugstate --nodates

    36

hg st -qC

    37

    38

echo '% reverting foo1 and bar'

    39

hg revert -vr . foo1 bar

    40

hg debugstate --nodates

    41

hg st -qC

    42

hg diff

    43