Mercurial > hg
annotate tests/test-convert-tagsbranch-topology.t @ 15974:cd4504d26695 stable
merge with i18n
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Mon, 23 Jan 2012 16:11:37 -0200 |
parents | 6b7077df4aa5 |
children | cfd892b7569f |
rev | line source |
---|---|
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
2 $ "$TESTDIR/hghave" git || exit 80 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
4 $ echo "convert=" >> $HGRCPATH |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
5 $ echo 'hgext.graphlog =' >> $HGRCPATH |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
6 $ echo '[convert]' >> $HGRCPATH |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
7 $ echo 'hg.usebranchnames = True' >> $HGRCPATH |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
8 $ echo 'hg.tagsbranch = tags-update' >> $HGRCPATH |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
9 $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
10 $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
11 $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
12 $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
13 $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
14 $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
15 $ count=10 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
16 $ action() |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
17 > { |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
18 > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
19 > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
20 > git "$@" >/dev/null 2>/dev/null || echo "git command error" |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
21 > count=`expr $count + 1` |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
22 > } |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
23 $ glog() |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
24 > { |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
25 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
26 > } |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
27 $ convertrepo() |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
28 > { |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
29 > hg convert --datesort git-repo hg-repo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
30 > } |
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
32 Build a GIT repo with at least 1 tag |
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
33 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
34 $ mkdir git-repo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
35 $ cd git-repo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
36 $ git init >/dev/null 2>&1 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
37 $ echo a > a |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
38 $ git add a |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
39 $ action commit -m "rev1" |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
40 $ action tag -m "tag1" tag1 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
41 $ cd .. |
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
42 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
43 Do a first conversion |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
44 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
45 $ convertrepo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
46 initializing destination hg-repo repository |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
47 scanning source... |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
48 sorting... |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
49 converting... |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
50 0 rev1 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
51 updating tags |
13756
6b7077df4aa5
convert: add bookmarks reading support to git backend
Edouard Gomez <ed.gomez@free.fr>
parents:
12534
diff
changeset
|
52 updating bookmarks |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
53 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
54 Simulate upstream updates after first conversion |
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
55 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
56 $ cd git-repo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
57 $ echo b > a |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
58 $ git add a |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
59 $ action commit -m "rev2" |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
60 $ action tag -m "tag2" tag2 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
61 $ cd .. |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
62 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
63 Perform an incremental conversion |
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
64 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
65 $ convertrepo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
66 scanning source... |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
67 sorting... |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
68 converting... |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
69 0 rev2 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
70 updating tags |
13756
6b7077df4aa5
convert: add bookmarks reading support to git backend
Edouard Gomez <ed.gomez@free.fr>
parents:
12534
diff
changeset
|
71 updating bookmarks |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
72 |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
73 Print the log |
9431
d1b135f2f415
convert: fix history topology when using hg.tagsbranch
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
74 |
12534
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
75 $ cd hg-repo |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
76 $ glog |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
77 o 3 "update tags" files: .hgtags |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
78 | |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
79 | o 2 "rev2" files: a |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
80 | | |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
81 o | 1 "update tags" files: .hgtags |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
82 / |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
83 o 0 "rev1" files: a |
3ee3d7634e94
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com>
parents:
9431
diff
changeset
|
84 |