view tests/test-pull-r.out @ 11488:f786fc4b8764 stable 1.6

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.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 29 Jun 2010 12:12:34 +0200
parents 39e7f14a8286
children
line wrap: on
line source

changeset:   2:effea6de0384
tag:         tip
parent:      0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add bar

changeset:   1:ed1b79f46b9a
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change foo

changeset:   0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull a missing revision
abort: unknown revision 'missing'!
% pull multiple revisions with update
0:bbd179dfa0a7
rolling back to revision -1 (undo pull)
% pull -r 0
changeset:   0:bbd179dfa0a7
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull -r 1
changeset:   1:ed1b79f46b9a
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change foo

changeset:   0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull -r 1 again