Mercurial > hg
annotate tests/test-convert-cvs-synthetic.t @ 19933:621a26eb3a99
demandimport: allow extensions to import own modules by absolute name
Before this patch, python modules of each extensions can't import
another one in own extension by absolute name, because root modules of
each extensions are loaded with "hgext_" prefix.
For example, "import extroot.bar" in "extroot/foo.py" of "extroot"
extension fails, even though "import bar" in it succeeds.
Installing extensions into site-packages of python library path can
avoid this problem, but this solution is not reasonable in some cases:
using binary package of Mercurial on Windows, for example.
This patch retries to import with "hgext_" prefix after ImportError,
if the module in the extension may try to import another one in own
extension.
This patch doesn't change some "_import()"/"_origimport()" invocations
below, because ordinary extensions shouldn't cause such invocations.
- invocation of "_import()" when root module imports sub-module by
absolute path without "fromlist"
for example, "import a.b" in "a.__init__.py".
extensions are loaded with "hgext_" prefix, and this causes
execution of another (= fixed by this patch) code path.
- invocation of "_origimport()" when "level != -1" with "fromlist"
for example, importing after "from __future__ import
absolute_import" (level == 0), or "from . import b" or "from .a
import b" (0 < level),
for portability between python versions and environments,
extensions shouldn't cause "level != -1".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 05 Oct 2013 01:02:22 +0900 |
parents | ed923a2d5ae9 |
children | aa9385f983fa |
rev | line source |
---|---|
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
1 This feature requires use of builtin cvsps! |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
3 $ "$TESTDIR/hghave" cvs || exit 80 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
4 $ echo "[extensions]" >> $HGRCPATH |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
5 $ echo "convert = " >> $HGRCPATH |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
6 $ echo "graphlog = " >> $HGRCPATH |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
7 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
8 create cvs repository with one project |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
9 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
10 $ mkdir cvsrepo |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
11 $ cd cvsrepo |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
12 $ CVSROOT=`pwd` |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
13 $ export CVSROOT |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
14 $ CVS_OPTIONS=-f |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
15 $ export CVS_OPTIONS |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
16 $ cd .. |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
17 $ cvscall() |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
18 > { |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
19 > cvs -f "$@" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
20 > } |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
21 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
22 output of 'cvs ci' varies unpredictably, so just discard it |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
23 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
24 $ cvsci() |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
25 > { |
14602
c4f271293134
tests: avoid instability in test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
12640
diff
changeset
|
26 > sleep 1 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
27 > cvs -f ci "$@" >/dev/null |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
28 > } |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
29 $ cvscall -d "$CVSROOT" init |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
30 $ mkdir cvsrepo/proj |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
31 $ cvscall -q co proj |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
32 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
33 create file1 on the trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
34 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
35 $ cd proj |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
36 $ touch file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
37 $ cvscall -Q add file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
38 $ cvsci -m"add file1 on trunk" file1 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
39 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
40 create two branches |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
41 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
42 $ cvscall -q tag -b v1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
43 T file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
44 $ cvscall -q tag -b v1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
45 T file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
46 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
47 create file2 on branch v1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
48 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
49 $ cvscall -Q up -rv1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
50 $ touch file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
51 $ cvscall -Q add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
52 $ cvsci -m"add file2" file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
53 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
54 create file3, file4 on branch v1_1 |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7862
diff
changeset
|
55 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
56 $ cvscall -Q up -rv1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
57 $ touch file3 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
58 $ touch file4 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
59 $ cvscall -Q add file3 file4 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
60 $ cvsci -m"add file3, file4 on branch v1_1" file3 file4 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
61 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
62 merge file2 from v1_0 to v1_1 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
63 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
64 $ cvscall -Q up -jv1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
65 $ cvsci -m"MERGE from v1_0: add file2" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
66 cvs commit: Examining . |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7862
diff
changeset
|
67 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
68 Step things up a notch: now we make the history really hairy, with |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
69 changes bouncing back and forth between trunk and v1_2 and merges |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
70 going both ways. (I.e., try to model the real world.) |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
71 create branch v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
72 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
73 $ cvscall -Q up -A |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
74 $ cvscall -q tag -b v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
75 T file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
76 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
77 create file5 on branch v1_2 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
78 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
79 $ cvscall -Q up -rv1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
80 $ touch file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
81 $ cvs -Q add file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
82 $ cvsci -m"add file5 on v1_2" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
83 cvs commit: Examining . |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
84 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
85 create file6 on trunk post-v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
86 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
87 $ cvscall -Q up -A |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
88 $ touch file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
89 $ cvscall -Q add file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
90 $ cvsci -m"add file6 on trunk post-v1_2" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
91 cvs commit: Examining . |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
92 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
93 merge file5 from v1_2 to trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
94 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
95 $ cvscall -Q up -A |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
96 $ cvscall -Q up -jv1_2 file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
97 $ cvsci -m"MERGE from v1_2: add file5" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
98 cvs commit: Examining . |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
99 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
100 merge file6 from trunk to v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
101 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
102 $ cvscall -Q up -rv1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
103 $ cvscall up -jHEAD file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
104 U file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
105 $ cvsci -m"MERGE from HEAD: add file6" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
106 cvs commit: Examining . |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
107 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
108 cvs rlog output |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
109 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
110 $ cvscall -q rlog proj | egrep '^(RCS file|revision)' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
111 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
112 revision 1.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
113 RCS file: $TESTTMP/cvsrepo/proj/Attic/file2,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
114 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
115 revision 1.1.4.2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
116 revision 1.1.4.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
117 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
118 RCS file: $TESTTMP/cvsrepo/proj/Attic/file3,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
119 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
120 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
121 RCS file: $TESTTMP/cvsrepo/proj/Attic/file4,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
122 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
123 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
124 RCS file: $TESTTMP/cvsrepo/proj/file5,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
125 revision 1.2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
126 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
127 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
128 RCS file: $TESTTMP/cvsrepo/proj/file6,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
129 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
130 revision 1.1.2.2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
131 revision 1.1.2.1 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
132 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
133 convert to hg (#1) |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
134 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
135 $ cd .. |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
136 $ hg convert --datesort proj proj.hg |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
137 initializing destination proj.hg repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
138 connecting to $TESTTMP/cvsrepo |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
139 scanning source... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
140 collecting CVS rlog |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
141 15 log entries |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
142 creating changesets |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
143 9 changeset entries |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
144 sorting... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
145 converting... |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
146 8 add file1 on trunk |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
147 7 add file2 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
148 6 MERGE from v1_0: add file2 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
149 5 file file3 was initially added on branch v1_1. |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
150 4 add file3, file4 on branch v1_1 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
151 3 add file5 on v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
152 2 add file6 on trunk post-v1_2 |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
153 1 MERGE from HEAD: add file6 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
154 0 MERGE from v1_2: add file5 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
155 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
156 hg glog output (#1) |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
157 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
158 $ hg -R proj.hg glog --template "{rev} {desc}\n" |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
159 o 8 MERGE from v1_2: add file5 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
160 | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
161 | o 7 MERGE from HEAD: add file6 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
162 | | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
163 o | 6 add file6 on trunk post-v1_2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
164 | | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
165 | o 5 add file5 on v1_2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
166 | | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
167 | | o 4 add file3, file4 on branch v1_1 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
168 | | | |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
169 o | | 3 file file3 was initially added on branch v1_1. |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
170 |/ / |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
171 | o 2 MERGE from v1_0: add file2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
172 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
173 | o 1 add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
174 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
175 o 0 add file1 on trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
176 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
177 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
178 convert to hg (#2: with merge detection) |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7862
diff
changeset
|
179 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
180 $ hg convert \ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
181 > --config convert.cvsps.mergefrom='"^MERGE from (\S+):"' \ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
182 > --datesort \ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
183 > proj proj.hg2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
184 initializing destination proj.hg2 repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
185 connecting to $TESTTMP/cvsrepo |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
186 scanning source... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
187 collecting CVS rlog |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
188 15 log entries |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
189 creating changesets |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
190 9 changeset entries |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
191 sorting... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
192 converting... |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
193 8 add file1 on trunk |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
194 7 add file2 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
195 6 MERGE from v1_0: add file2 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
196 5 file file3 was initially added on branch v1_1. |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
197 4 add file3, file4 on branch v1_1 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
198 3 add file5 on v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
199 2 add file6 on trunk post-v1_2 |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
200 1 MERGE from HEAD: add file6 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
201 0 MERGE from v1_2: add file5 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
202 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
203 hg glog output (#2) |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
204 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
205 $ hg -R proj.hg2 glog --template "{rev} {desc}\n" |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
206 o 8 MERGE from v1_2: add file5 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
207 | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
208 | o 7 MERGE from HEAD: add file6 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
209 | | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
210 o | 6 add file6 on trunk post-v1_2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
211 | | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
212 | o 5 add file5 on v1_2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
213 | | |
18262
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
214 | | o 4 add file3, file4 on branch v1_1 |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
215 | | | |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
216 o | | 3 file file3 was initially added on branch v1_1. |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
217 |/ / |
ed923a2d5ae9
tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents:
14602
diff
changeset
|
218 | o 2 MERGE from v1_0: add file2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
219 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
220 | o 1 add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
221 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
222 o 0 add file1 on trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
223 |