Mercurial > hg-stable

changeset 11852:b2f91119bf8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-annotate
author Martin Geisler <mg@lazybytes.net>
date Sat, 14 Aug 2010 02:18:17 +0200
parents db955418a6af
children afe19a1bf9d3
files tests/test-annotate tests/test-annotate.out tests/test-annotate.t
diffstat 3 files changed, 230 insertions(+), 220 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-annotate	Sat Aug 14 02:17:59 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-HGMERGE=true; export HGMERGE
-
-echo % init
-hg init
-
-echo % commit
-echo 'a' > a
-hg ci -A -m test -u nobody -d '1 0'
-
-echo % annotate -c
-hg annotate -c a
-
-echo % annotate -cl
-hg annotate -cl a
-
-echo % annotate -d
-hg annotate -d a
-
-echo % annotate -n
-hg annotate -n a
-
-echo % annotate -nl
-hg annotate -nl a
-
-echo % annotate -u
-hg annotate -u a
-
-echo % annotate -cdnu
-hg annotate -cdnu a
-
-echo % annotate -cdnul
-hg annotate -cdnul a
-
-cat <<EOF >>a
-a
-a
-EOF
-hg ci -ma1 -d '1 0'
-hg cp a b
-hg ci -mb -d '1 0'
-cat <<EOF >> b
-b4
-b5
-b6
-EOF
-hg ci -mb2 -d '2 0'
-
-echo % annotate -n b
-hg annotate -n b
-echo % annotate --no-follow b
-hg annotate --no-follow b
-echo % annotate -nl b
-hg annotate -nl b
-echo % annotate -nf b
-hg annotate -nf b
-echo % annotate -nlf b
-hg annotate -nlf b
-
-hg up -C 2
-cat <<EOF >> b
-b4
-c
-b5
-EOF
-hg ci -mb2.1 -d '2 0'
-hg merge
-hg ci -mmergeb -d '3 0'
-echo % annotate after merge
-hg annotate -nf b
-echo % annotate after merge with -l
-hg annotate -nlf b
-
-hg up -C 1
-hg cp a b
-cat <<EOF > b
-a
-z
-a
-EOF
-hg ci -mc -d '3 0'
-hg merge
-cat <<EOF >> b
-b4
-c
-b5
-EOF
-echo d >> b
-hg ci -mmerge2 -d '4 0'
-echo % annotate after rename merge
-hg annotate -nf b
-echo % annotate after rename merge with -l
-hg annotate -nlf b
-
-echo % linkrev vs rev
-hg annotate -r tip -n a
-echo % linkrev vs rev with -l
-hg annotate -r tip -nl a
-
-# test issue 589
-# annotate was crashing when trying to --follow something
-# like A -> B -> A
-echo % generate ABA rename configuration
-echo foo > foo
-hg add foo
-hg ci -m addfoo
-hg rename foo bar
-hg ci -m renamefoo
-hg rename bar foo
-hg ci -m renamebar
-
-echo % annotate after ABA with follow
-hg annotate --follow foo
-
--- a/tests/test-annotate.out	Sat Aug 14 02:17:59 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-% init
-% commit
-adding a
-% annotate -c
-8435f90966e4: a
-% annotate -cl
-8435f90966e4:1: a
-% annotate -d
-Thu Jan 01 00:00:01 1970 +0000: a
-% annotate -n
-0: a
-% annotate -nl
-0:1: a
-% annotate -u
-nobody: a
-% annotate -cdnu
-nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
-% annotate -cdnul
-nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
-% annotate -n b
-0: a
-1: a
-1: a
-3: b4
-3: b5
-3: b6
-% annotate --no-follow b
-2: a
-2: a
-2: a
-3: b4
-3: b5
-3: b6
-% annotate -nl b
-0:1: a
-1:2: a
-1:3: a
-3:4: b4
-3:5: b5
-3:6: b6
-% annotate -nf b
-0 a: a
-1 a: a
-1 a: a
-3 b: b4
-3 b: b5
-3 b: b6
-% annotate -nlf b
-0 a:1: a
-1 a:2: a
-1 a:3: a
-3 b:4: b4
-3 b:5: b5
-3 b:6: b6
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-created new head
-merging b
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-% annotate after merge
-0 a: a
-1 a: a
-1 a: a
-3 b: b4
-4 b: c
-3 b: b5
-% annotate after merge with -l
-0 a:1: a
-1 a:2: a
-1 a:3: a
-3 b:4: b4
-4 b:5: c
-3 b:5: b5
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-created new head
-merging b
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-% annotate after rename merge
-0 a: a
-6 b: z
-1 a: a
-3 b: b4
-4 b: c
-3 b: b5
-7 b: d
-% annotate after rename merge with -l
-0 a:1: a
-6 b:2: z
-1 a:3: a
-3 b:4: b4
-4 b:5: c
-3 b:5: b5
-7 b:7: d
-% linkrev vs rev
-0: a
-1: a
-1: a
-% linkrev vs rev with -l
-0:1: a
-1:2: a
-1:3: a
-% generate ABA rename configuration
-% annotate after ABA with follow
-foo: foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-annotate.t	Sat Aug 14 02:18:17 2010 +0200
@@ -0,0 +1,230 @@
+  $ HGMERGE=true; export HGMERGE
+
+init
+
+  $ hg init
+
+commit
+
+  $ echo 'a' > a
+  $ hg ci -A -m test -u nobody -d '1 0'
+  adding a
+
+annotate -c
+
+  $ hg annotate -c a
+  8435f90966e4: a
+
+annotate -cl
+
+  $ hg annotate -cl a
+  8435f90966e4:1: a
+
+annotate -d
+
+  $ hg annotate -d a
+  Thu Jan 01 00:00:01 1970 +0000: a
+
+annotate -n
+
+  $ hg annotate -n a
+  0: a
+
+annotate -nl
+
+  $ hg annotate -nl a
+  0:1: a
+
+annotate -u
+
+  $ hg annotate -u a
+  nobody: a
+
+annotate -cdnu
+
+  $ hg annotate -cdnu a
+  nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
+
+annotate -cdnul
+
+  $ hg annotate -cdnul a
+  nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
+
+  $ cat <<EOF >>a
+  > a
+  > a
+  > EOF
+  $ hg ci -ma1 -d '1 0'
+  $ hg cp a b
+  $ hg ci -mb -d '1 0'
+  $ cat <<EOF >> b
+  > b4
+  > b5
+  > b6
+  > EOF
+  $ hg ci -mb2 -d '2 0'
+
+annotate -n b
+
+  $ hg annotate -n b
+  0: a
+  1: a
+  1: a
+  3: b4
+  3: b5
+  3: b6
+
+annotate --no-follow b
+
+  $ hg annotate --no-follow b
+  2: a
+  2: a
+  2: a
+  3: b4
+  3: b5
+  3: b6
+
+annotate -nl b
+
+  $ hg annotate -nl b
+  0:1: a
+  1:2: a
+  1:3: a
+  3:4: b4
+  3:5: b5
+  3:6: b6
+
+annotate -nf b
+
+  $ hg annotate -nf b
+  0 a: a
+  1 a: a
+  1 a: a
+  3 b: b4
+  3 b: b5
+  3 b: b6
+
+annotate -nlf b
+
+  $ hg annotate -nlf b
+  0 a:1: a
+  1 a:2: a
+  1 a:3: a
+  3 b:4: b4
+  3 b:5: b5
+  3 b:6: b6
+
+  $ hg up -C 2
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cat <<EOF >> b
+  > b4
+  > c
+  > b5
+  > EOF
+  $ hg ci -mb2.1 -d '2 0'
+  created new head
+  $ hg merge
+  merging b
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -mmergeb -d '3 0'
+
+annotate after merge
+
+  $ hg annotate -nf b
+  0 a: a
+  1 a: a
+  1 a: a
+  3 b: b4
+  4 b: c
+  3 b: b5
+
+annotate after merge with -l
+
+  $ hg annotate -nlf b
+  0 a:1: a
+  1 a:2: a
+  1 a:3: a
+  3 b:4: b4
+  4 b:5: c
+  3 b:5: b5
+
+  $ hg up -C 1
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg cp a b
+  $ cat <<EOF > b
+  > a
+  > z
+  > a
+  > EOF
+  $ hg ci -mc -d '3 0'
+  created new head
+  $ hg merge
+  merging b
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ cat <<EOF >> b
+  > b4
+  > c
+  > b5
+  > EOF
+  $ echo d >> b
+  $ hg ci -mmerge2 -d '4 0'
+
+annotate after rename merge
+
+  $ hg annotate -nf b
+  0 a: a
+  6 b: z
+  1 a: a
+  3 b: b4
+  4 b: c
+  3 b: b5
+  7 b: d
+
+annotate after rename merge with -l
+
+  $ hg annotate -nlf b
+  0 a:1: a
+  6 b:2: z
+  1 a:3: a
+  3 b:4: b4
+  4 b:5: c
+  3 b:5: b5
+  7 b:7: d
+
+linkrev vs rev
+
+  $ hg annotate -r tip -n a
+  0: a
+  1: a
+  1: a
+
+linkrev vs rev with -l
+
+  $ hg annotate -r tip -nl a
+  0:1: a
+  1:2: a
+  1:3: a
+
+test issue 589
+
+annotate was crashing when trying to --follow something
+
+like A -> B -> A
+
+generate ABA rename configuration
+
+  $ echo foo > foo
+  $ hg add foo
+  $ hg ci -m addfoo
+  $ hg rename foo bar
+  $ hg ci -m renamefoo
+  $ hg rename bar foo
+  $ hg ci -m renamebar
+
+annotate after ABA with follow
+
+  $ hg annotate --follow foo
+  foo: foo
+