tests/test-pull-r.out
author Steve Losh <steve@stevelosh.com>
Mon, 12 Apr 2010 19:33:25 -0400
changeset 10960 ca739acf1a98
parent 10893 468876bc3885
child 11175 39e7f14a8286
permissions -rw-r--r--
commands: add more robust support for 'hg log -b' (issue2078) Fixes issue2078 and adds tests to cover various 'hg log -b' uses. This change adds a localrepo.lookupbranch(key, remote=None) function. This will look up the branch of the revision with the given key. The algorithm works like this: * If a remote repo is given and KEY is the name of a branch in that repo, return KEY. * If no remote repo is given and KEY is the name of a branch in the local repo object, return KEY. * Otherwise look up the revision with the identifier KEY in the local repo and return its branch. This change also makes 'hg log -b' use this new functionality and adds a few tests for it.

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 0 (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