annotate tests/test-convert.t @ 16967:30cfa286947c

test-merge-tools: adapt for Windows
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 15 Jun 2012 17:32:33 +0200
parents a3dcc59054ca
children 79902f7e27df
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15443
a1914d214579 tests: use 'hghave unix-permissions' for tests that really use chmod
Mads Kiilerich <mads@kiilerich.com>
parents: 15300
diff changeset
1 $ "$TESTDIR/hghave" unix-permissions || exit 80
5441
71e7c86adcb7 convert: refactor sink initialisation, to remove hardcoding of hg
Bryan O'Sullivan <bos@serpentine.com>
parents: 5028
diff changeset
2
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
3 $ cat >> $HGRCPATH <<EOF
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
4 > [extensions]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
5 > convert=
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
6 > [convert]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
7 > hg.saverev=False
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
8 > EOF
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
9 $ hg help convert
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
10 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
11
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
12 convert a foreign SCM repository to a Mercurial one.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
13
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
14 Accepted source formats [identifiers]:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
15
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
16 - Mercurial [hg]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
17 - CVS [cvs]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
18 - Darcs [darcs]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
19 - git [git]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
20 - Subversion [svn]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
21 - Monotone [mtn]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
22 - GNU Arch [gnuarch]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
23 - Bazaar [bzr]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
24 - Perforce [p4]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
25
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
26 Accepted destination formats [identifiers]:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
27
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
28 - Mercurial [hg]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
29 - Subversion [svn] (history on branches is not preserved)
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
30
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
31 If no revision is given, all revisions will be converted. Otherwise,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
32 convert will only import up to the named revision (given in a format
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
33 understood by the source).
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
34
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
35 If no destination directory name is specified, it defaults to the basename
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
36 of the source with "-hg" appended. If the destination repository doesn't
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
37 exist, it will be created.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
38
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
39 By default, all sources except Mercurial will use --branchsort. Mercurial
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
40 uses --sourcesort to preserve original revision numbers order. Sort modes
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
41 have the following effects:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
42
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
43 --branchsort convert from parent to child revision when possible, which
13011
4936a04b6792 minirst: improved support for option lists.
Erik Zielke <ez@aragost.com>
parents: 12924
diff changeset
44 means branches are usually converted one after the other.
4936a04b6792 minirst: improved support for option lists.
Erik Zielke <ez@aragost.com>
parents: 12924
diff changeset
45 It generates more compact repositories.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
46 --datesort sort revisions by date. Converted repositories have good-
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
47 looking changelogs but are often an order of magnitude
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
48 larger than the same ones generated by --branchsort.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
49 --sourcesort try to preserve source revisions order, only supported by
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
50 Mercurial sources.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
51
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
52 If "REVMAP" isn't given, it will be put in a default location
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
53 ("<dest>/.hg/shamap" by default). The "REVMAP" is a simple text file that
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
54 maps each source commit ID to the destination ID for that revision, like
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
55 so:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
56
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
57 <source ID> <destination ID>
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
58
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
59 If the file doesn't exist, it's automatically created. It's updated on
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
60 each commit copied, so "hg convert" can be interrupted and can be run
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
61 repeatedly to copy new commits.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
62
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
63 The authormap is a simple text file that maps each source commit author to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
64 a destination commit author. It is handy for source SCMs that use unix
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
65 logins to identify authors (eg: CVS). One line per author mapping and the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
66 line format is:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
67
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
68 source author = destination author
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
69
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
70 Empty lines and lines starting with a "#" are ignored.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
71
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
72 The filemap is a file that allows filtering and remapping of files and
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
73 directories. Each line can contain one of the following directives:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
74
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
75 include path/to/file-or-dir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
76
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
77 exclude path/to/file-or-dir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
78
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
79 rename path/to/source path/to/destination
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
80
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
81 Comment lines start with "#". A specified path matches if it equals the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
82 full relative name of a file or one of its parent directories. The
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
83 "include" or "exclude" directive with the longest matching path applies,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
84 so line order does not matter.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
85
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
86 The "include" directive causes a file, or all files under a directory, to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
87 be included in the destination repository, and the exclusion of all other
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
88 files and directories not explicitly included. The "exclude" directive
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
89 causes files or directories to be omitted. The "rename" directive renames
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
90 a file or directory if it is converted. To rename from a subdirectory into
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
91 the root of the repository, use "." as the path to rename to.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
92
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
93 The splicemap is a file that allows insertion of synthetic history,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
94 letting you specify the parents of a revision. This is useful if you want
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
95 to e.g. give a Subversion merge two parents, or graft two disconnected
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
96 series of history together. Each entry contains a key, followed by a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
97 space, followed by one or two comma-separated values:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
98
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
99 key parent1, parent2
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
100
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
101 The key is the revision ID in the source revision control system whose
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
102 parents should be modified (same format as a key in .hg/shamap). The
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
103 values are the revision IDs (in either the source or destination revision
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
104 control system) that should be used as the new parents for that node. For
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
105 example, if you have merged "release-1.0" into "trunk", then you should
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
106 specify the revision on "trunk" as the first parent and the one on the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
107 "release-1.0" branch as the second.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
108
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
109 The branchmap is a file that allows you to rename a branch when it is
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
110 being brought in from whatever external repository. When used in
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
111 conjunction with a splicemap, it allows for a powerful combination to help
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
112 fix even the most badly mismanaged repositories and turn them into nicely
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
113 structured Mercurial repositories. The branchmap contains lines of the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
114 form:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
115
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
116 original_branch_name new_branch_name
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
117
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
118 where "original_branch_name" is the name of the branch in the source
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
119 repository, and "new_branch_name" is the name of the branch is the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
120 destination repository. No whitespace is allowed in the branch names. This
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
121 can be used to (for instance) move code in one repository from "default"
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
122 to a named branch.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
123
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
124 Mercurial Source
12787
e8a8993b625e tests: fix up changed output
Matt Mackall <mpm@selenic.com>
parents: 12510
diff changeset
125 ''''''''''''''''
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
126
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
127 The Mercurial source recognizes the following configuration options, which
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
128 you can set on the command line with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
129
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
130 convert.hg.ignoreerrors
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
131 ignore integrity errors when reading. Use it to fix
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
132 Mercurial repositories with missing revlogs, by converting
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
133 from and to Mercurial. Default is False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
134 convert.hg.saverev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
135 store original revision ID in changeset (forces target IDs
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
136 to change). It takes a boolean argument and defaults to
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
137 False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
138 convert.hg.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
139 convert start revision and its descendants. It takes a hg
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
140 revision identifier and defaults to 0.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
141
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
142 CVS Source
12787
e8a8993b625e tests: fix up changed output
Matt Mackall <mpm@selenic.com>
parents: 12510
diff changeset
143 ''''''''''
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
144
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
145 CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
146 indicate the starting point of what will be converted. Direct access to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
147 the repository files is not needed, unless of course the repository is
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
148 ":local:". The conversion uses the top level directory in the sandbox to
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
149 find the CVS repository, and then uses CVS rlog commands to find files to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
150 convert. This means that unless a filemap is given, all files under the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
151 starting directory will be converted, and that any directory
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
152 reorganization in the CVS sandbox is ignored.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
153
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
154 The following options can be used with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
155
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
156 convert.cvsps.cache
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
157 Set to False to disable remote log caching, for testing and
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
158 debugging purposes. Default is True.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
159 convert.cvsps.fuzz
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
160 Specify the maximum time (in seconds) that is allowed
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
161 between commits with identical user and log message in a
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
162 single changeset. When very large files were checked in as
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
163 part of a changeset then the default may not be long enough.
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
164 The default is 60.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
165 convert.cvsps.mergeto
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
166 Specify a regular expression to which commit log messages
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
167 are matched. If a match occurs, then the conversion process
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
168 will insert a dummy revision merging the branch on which
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
169 this log message occurs to the branch indicated in the
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
170 regex. Default is "{{mergetobranch ([-\w]+)}}"
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
171 convert.cvsps.mergefrom
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
172 Specify a regular expression to which commit log messages
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
173 are matched. If a match occurs, then the conversion process
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
174 will add the most recent revision on the branch indicated in
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
175 the regex as the second parent of the changeset. Default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
176 "{{mergefrombranch ([-\w]+)}}"
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
177 hook.cvslog Specify a Python function to be called at the end of
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
178 gathering the CVS log. The function is passed a list with
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
179 the log entries, and can modify the entries in-place, or add
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
180 or delete them.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
181 hook.cvschangesets
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
182 Specify a Python function to be called after the changesets
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
183 are calculated from the the CVS log. The function is passed
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
184 a list with the changeset entries, and can modify the
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
185 changesets in-place, or add or delete them.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
186
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
187 An additional "debugcvsps" Mercurial command allows the builtin changeset
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
188 merging code to be run without doing a conversion. Its parameters and
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
189 output are similar to that of cvsps 2.1. Please see the command help for
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
190 more details.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
191
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
192 Subversion Source
12787
e8a8993b625e tests: fix up changed output
Matt Mackall <mpm@selenic.com>
parents: 12510
diff changeset
193 '''''''''''''''''
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
194
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
195 Subversion source detects classical trunk/branches/tags layouts. By
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
196 default, the supplied "svn://repo/path/" source URL is converted as a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
197 single branch. If "svn://repo/path/trunk" exists it replaces the default
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
198 branch. If "svn://repo/path/branches" exists, its subdirectories are
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
199 listed as possible branches. If "svn://repo/path/tags" exists, it is
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
200 looked for tags referencing converted branches. Default "trunk",
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
201 "branches" and "tags" values can be overridden with following options. Set
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
202 them to paths relative to the source URL, or leave them blank to disable
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
203 auto detection.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
204
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
205 The following options can be set with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
206
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
207 convert.svn.branches
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
208 specify the directory containing branches. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
209 "branches".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
210 convert.svn.tags
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
211 specify the directory containing tags. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
212 "tags".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
213 convert.svn.trunk
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
214 specify the name of the trunk branch. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
215 "trunk".
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
216
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
217 Source history can be retrieved starting at a specific revision, instead
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
218 of being integrally converted. Only single branch conversions are
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
219 supported.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
220
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
221 convert.svn.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
222 specify start Subversion revision number. The default is 0.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
223
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
224 Perforce Source
12787
e8a8993b625e tests: fix up changed output
Matt Mackall <mpm@selenic.com>
parents: 12510
diff changeset
225 '''''''''''''''
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
226
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
227 The Perforce (P4) importer can be given a p4 depot path or a client
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
228 specification as source. It will convert all files in the source to a flat
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
229 Mercurial repository, ignoring labels, branches and integrations. Note
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
230 that when a depot path is given you then usually should specify a target
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
231 directory, because otherwise the target may be named "...-hg".
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
232
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
233 It is possible to limit the amount of source history to be converted by
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
234 specifying an initial Perforce revision:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
235
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
236 convert.p4.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
237 specify initial Perforce revision (a Perforce changelist
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
238 number).
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
239
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
240 Mercurial Destination
12787
e8a8993b625e tests: fix up changed output
Matt Mackall <mpm@selenic.com>
parents: 12510
diff changeset
241 '''''''''''''''''''''
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
242
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
243 The following options are supported:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
244
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
245 convert.hg.clonebranches
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
246 dispatch source branches in separate clones. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
247 False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
248 convert.hg.tagsbranch
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
249 branch name for tag revisions, defaults to "default".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
250 convert.hg.usebranchnames
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
251 preserve branch names. The default is True.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
252
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
253 options:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
254
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
255 -s --source-type TYPE source repository type
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
256 -d --dest-type TYPE destination repository type
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
257 -r --rev REV import up to target revision REV
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
258 -A --authormap FILE remap usernames using this file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
259 --filemap FILE remap file names using contents of file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
260 --splicemap FILE splice synthesized history into place
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
261 --branchmap FILE change branch names while converting
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
262 --branchsort try to sort changesets by branches
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
263 --datesort try to sort changesets by date
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
264 --sourcesort preserve source changesets order
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
265
15202
0150741caace help: unify the two -v notes for command help
Matt Mackall <mpm@selenic.com>
parents: 15145
diff changeset
266 use "hg -v help convert" to show more info
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
267 $ hg init a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
268 $ cd a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
269 $ echo a > a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
270 $ hg ci -d'0 0' -Ama
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
271 adding a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
272 $ hg cp a b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
273 $ hg ci -d'1 0' -mb
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
274 $ hg rm a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
275 $ hg ci -d'2 0' -mc
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
276 $ hg mv b a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
277 $ hg ci -d'3 0' -md
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
278 $ echo a >> a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
279 $ hg ci -d'4 0' -me
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
280 $ cd ..
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
281 $ hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded'
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
282 assuming destination a-hg
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
283 initializing destination a-hg repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
284 scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
285 sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
286 converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
287 4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
288 3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
289 2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
290 1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
291 0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
292 $ hg --cwd a-hg pull ../a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
293 pulling from ../a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
294 searching for changes
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
295 no changes found
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
296 $ touch bogusfile
7905
d596b1f2935a convert: missing p4 tool is only slightly fatal
Mads Kiilerich <mads@kiilerich.com>
parents: 5805
diff changeset
297
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
298 should fail
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
299
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
300 $ hg convert a bogusfile
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
301 initializing destination bogusfile repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
302 abort: cannot create new bundle repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
303 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
304 $ mkdir bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
305 $ chmod 000 bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
306
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
307 should fail
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
308
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
309 $ hg convert a bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
310 abort: Permission denied: bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
311 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
312
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
313 should succeed
9962
a7178eccf2dc convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com>
parents: 8674
diff changeset
314
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
315 $ chmod 700 bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
316 $ hg convert a bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
317 initializing destination bogusdir repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
318 scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
319 sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
320 converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
321 4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
322 3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
323 2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
324 1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
325 0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
326
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
327 test pre and post conversion actions
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
328
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
329 $ echo 'include b' > filemap
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
330 $ hg convert --debug --filemap filemap a partialb | \
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
331 > grep 'run hg'
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
332 run hg source pre-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
333 run hg sink pre-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
334 run hg sink post-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
335 run hg source post-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
336
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
337 converting empty dir should fail "nicely
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
338
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
339 $ mkdir emptydir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
340
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
341 override $PATH to ensure p4 not visible; use $PYTHON in case we're
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
342 running from a devel copy, not a temp installation
9962
a7178eccf2dc convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com>
parents: 8674
diff changeset
343
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
344 $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg convert emptydir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
345 assuming destination emptydir-hg
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
346 initializing destination emptydir-hg repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
347 emptydir does not look like a CVS checkout
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
348 emptydir does not look like a Git repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
349 emptydir does not look like a Subversion repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
350 emptydir is not a local Mercurial repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
351 emptydir does not look like a darcs repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
352 emptydir does not look like a monotone repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
353 emptydir does not look like a GNU Arch repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
354 emptydir does not look like a Bazaar repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
355 cannot find required "p4" tool
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
356 abort: emptydir: missing or unsupported repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
357 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
358
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
359 convert with imaginary source type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
360
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
361 $ hg convert --source-type foo a a-foo
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
362 initializing destination a-foo repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
363 abort: foo: invalid source repository type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
364 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
365
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
366 convert with imaginary sink type
10577
d5bd1beff794 store: only add new entries to the fncache file
Adrian Buehlmann <adrian@cadifra.com>
parents: 9962
diff changeset
367
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
368 $ hg convert --dest-type foo a a-foo
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
369 abort: foo: invalid destination repository type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
370 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
371
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
372 testing: convert must not produce duplicate entries in fncache
10885
9e4d120e3c32 convert/subversion: fix default URL checker prototype
Patrick Mezard <pmezard@gmail.com>
parents: 10775
diff changeset
373
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
374 $ hg convert a b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
375 initializing destination b repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
376 scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
377 sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
378 converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
379 4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
380 3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
381 2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
382 1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
383 0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
384
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
385 contents of fncache file:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
386
13389
3efc99ac2ac4 tests: sort fncache
Adrian Buehlmann <adrian@cadifra.com>
parents: 13011
diff changeset
387 $ cat b/.hg/store/fncache | sort
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
388 data/a.i
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
389 data/b.i
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
390
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
391 test bogus URL
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
392
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
393 $ hg convert -q bzr+ssh://foobar@selenic.com/baz baz
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
394 abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
395 [255]