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

% init

     2

adding a

     3

% fold in the middle of the queue

     4

popping p3

     5

popping p2

     6

now at: p1

     7

--- a/a

     8

+++ b/a

     9

@@ -1,1 +1,2 @@

    10

 a

    11

+a

    12

p1

    13

p3

    14

--- a/a

    15

+++ b/a

    16

@@ -1,1 +1,3 @@

    17

 a

    18

+a

    19

+b

    20

% fold with local changes

    21

abort: local changes found, refresh first

    22

--- a/a

    23

+++ b/a

    24

@@ -1,1 +1,3 @@

    25

 a

    26

+a

    27

+b

    28

reverting a

    29

% fold git patch into a regular patch, expect git patch

    30

popping git

    31

now at: regular

    32

# HG changeset patch

    33

# Parent 

    34

    35

diff --git a/a b/a

    36

--- a/a

    37

+++ b/a

    38

@@ -1,3 +1,4 @@

    39

 a

    40

 a

    41

 b

    42

+a

    43

diff --git a/a b/aa

    44

copy from a

    45

copy to aa

    46

--- a/a

    47

+++ b/aa

    48

@@ -1,3 +1,4 @@

    49

 a

    50

 a

    51

 b

    52

+a

    53

popping regular

    54

now at: p1

    55

% fold regular patch into a git patch, expect git patch

    56

popping regular

    57

now at: git

    58

# HG changeset patch

    59

# Parent 

    60

    61

diff --git a/a b/aa

    62

copy from a

    63

copy to aa

    64

--- a/a

    65

+++ b/aa

    66

@@ -1,3 +1,4 @@

    67

 a

    68

 a

    69

 b

    70

+b