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

     4

touch a

     5

hg add a

     6

hg commit -m "Added a" -d "1000000 0"

     7

     8

touch main

     9

hg add main

    10

hg commit -m "Added main" -d "1000000 0"

    11

hg checkout 0

    12

    13

echo Main should be gone

    14

ls

    15

    16

touch side1

    17

hg add side1

    18

hg commit -m "Added side1" -d "1000000 0"

    19

touch side2

    20

hg add side2

    21

hg commit -m "Added side2" -d "1000000 0"

    22

    23

hg log

    24

    25

echo Should have two heads, side2 and main

    26

hg heads

    27

    28

echo Should show "a side1 side2"

    29

ls

    30

    31

hg update --debug -C 1

    32

echo Should only show "a main"

    33

ls

    34