annotate tests/test-convert.t @ 18342:de99de39ba28

mq: fix qpop of working directory parent patch when not at qtip mq assumed that it had to update from qtip to qparent, and instead of updating from where it was it failed with: abort: working directory revision is not qtip
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 2eae2f9e85ef
children 05acdf8e1f23
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
1 $ cat >> $HGRCPATH <<EOF
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
2 > [extensions]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
3 > convert=
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
4 > [convert]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
5 > hg.saverev=False
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
6 > EOF
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
7 $ hg help convert
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
8 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
9
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
10 convert a foreign SCM repository to a Mercurial one.
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 Accepted source formats [identifiers]:
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 - Mercurial [hg]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
15 - CVS [cvs]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
16 - Darcs [darcs]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
17 - git [git]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
18 - Subversion [svn]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
19 - Monotone [mtn]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
20 - GNU Arch [gnuarch]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
21 - Bazaar [bzr]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
22 - Perforce [p4]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
23
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
24 Accepted destination formats [identifiers]:
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 - Mercurial [hg]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
27 - Subversion [svn] (history on branches is not preserved)
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
28
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
29 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
30 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
31 understood by the source).
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
32
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
33 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
34 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
35 exist, it will be created.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
36
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
37 By default, all sources except Mercurial will use --branchsort. Mercurial
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
38 uses --sourcesort to preserve original revision numbers order. Sort modes
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
39 have the following effects:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
40
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
41 --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
42 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
43 It generates more compact repositories.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
44 --datesort sort revisions by date. Converted repositories have good-
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
45 looking changelogs but are often an order of magnitude
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
46 larger than the same ones generated by --branchsort.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
47 --sourcesort try to preserve source revisions order, only supported by
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
48 Mercurial sources.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
49
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
50 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
51 ("<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
52 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
53 so:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
54
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
55 <source ID> <destination ID>
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 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
58 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
59 repeatedly to copy new commits.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
60
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
61 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
62 a destination commit author. It is handy for source SCMs that use unix
17424
e7cfe3587ea4 fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
63 logins to identify authors (e.g.: CVS). One line per author mapping and
e7cfe3587ea4 fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
64 the line format is:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
65
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
66 source author = destination author
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 Empty lines and lines starting with a "#" are ignored.
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 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
71 directories. Each line can contain one of the following directives:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
72
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
73 include path/to/file-or-dir
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 exclude 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 rename path/to/source path/to/destination
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 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
80 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
81 "include" or "exclude" directive with the longest matching path applies,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
82 so line order does not matter.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
83
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
84 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
85 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
86 files and directories not explicitly included. The "exclude" directive
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
87 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
88 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
89 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
90
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
91 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
92 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
93 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
94 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
95 space, followed by one or two comma-separated values:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
96
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
97 key parent1, parent2
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 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
100 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
101 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
102 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
103 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
104 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
105 "release-1.0" branch as the second.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
106
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
107 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
108 being brought in from whatever external repository. When used in
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
109 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
110 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
111 structured Mercurial repositories. The branchmap contains lines of the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
112 form:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
113
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
114 original_branch_name new_branch_name
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 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
117 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
118 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
119 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
120 to a named branch.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
121
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
122 Mercurial Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
123 ################
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
124
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
125 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
126 you can set on the command line with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
127
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
128 convert.hg.ignoreerrors
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
129 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
130 Mercurial repositories with missing revlogs, by converting
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
131 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
132 convert.hg.saverev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
133 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
134 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
135 False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
136 convert.hg.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
137 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
138 revision identifier and defaults to 0.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
139
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
140 CVS Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
141 ##########
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
142
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
143 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
144 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
145 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
146 ":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
147 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
148 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
149 starting directory will be converted, and that any directory
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
150 reorganization in the CVS sandbox is ignored.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
151
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
152 The following options can be used with "--config":
12510
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 convert.cvsps.cache
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
155 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
156 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
157 convert.cvsps.fuzz
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
158 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
159 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
160 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
161 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
162 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
163 convert.cvsps.mergeto
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
164 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
165 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
166 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
167 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
168 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
169 convert.cvsps.mergefrom
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
170 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
171 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
172 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
173 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
174 "{{mergefrombranch ([-\w]+)}}"
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
175 convert.localtimezone
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
176 use local time (as determined by the TZ environment
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
177 variable) for changeset date/times. The default is False
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
178 (use UTC).
18321
c51d2bc7a5d7 convert: correct 'hooks' section name in online help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17837
diff changeset
179 hooks.cvslog Specify a Python function to be called at the end of
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
180 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
181 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
182 or delete them.
18321
c51d2bc7a5d7 convert: correct 'hooks' section name in online help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17837
diff changeset
183 hooks.cvschangesets
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
184 Specify a Python function to be called after the changesets
17251
98166640b356 help: fix some instances of 'the the'
Mads Kiilerich <mads@kiilerich.com>
parents: 17002
diff changeset
185 are calculated from the CVS log. The function is passed a
98166640b356 help: fix some instances of 'the the'
Mads Kiilerich <mads@kiilerich.com>
parents: 17002
diff changeset
186 list with the changeset entries, and can modify the
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
187 changesets in-place, or add or delete them.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
188
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
189 An additional "debugcvsps" Mercurial command allows the builtin changeset
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
190 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
191 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
192 more details.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
193
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
194 Subversion Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
195 #################
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
196
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
197 Subversion source detects classical trunk/branches/tags layouts. By
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
198 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
199 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
200 branch. If "svn://repo/path/branches" exists, its subdirectories are
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
201 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
202 looked for tags referencing converted branches. Default "trunk",
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
203 "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
204 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
205 auto detection.
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 The following options can be set with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
208
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
209 convert.svn.branches
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
210 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
211 "branches".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
212 convert.svn.tags
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
213 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
214 "tags".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
215 convert.svn.trunk
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
216 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
217 "trunk".
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
218 convert.localtimezone
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
219 use local time (as determined by the TZ environment
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
220 variable) for changeset date/times. The default is False
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
221 (use UTC).
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
222
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
223 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
224 of being integrally converted. Only single branch conversions are
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
225 supported.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
226
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
227 convert.svn.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
228 specify start Subversion revision number. The default is 0.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
229
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
230 Perforce Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
231 ###############
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 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
234 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
235 Mercurial repository, ignoring labels, branches and integrations. Note
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
236 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
237 directory, because otherwise the target may be named "...-hg".
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
238
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
239 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
240 specifying an initial Perforce revision:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
241
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
242 convert.p4.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
243 specify initial Perforce revision (a Perforce changelist
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
244 number).
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
245
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
246 Mercurial Destination
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
247 #####################
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
248
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
249 The following options are supported:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
250
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
251 convert.hg.clonebranches
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
252 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
253 False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
254 convert.hg.tagsbranch
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
255 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
256 convert.hg.usebranchnames
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
257 preserve branch names. The default is True.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
258
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
259 options:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
260
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
261 -s --source-type TYPE source repository type
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
262 -d --dest-type TYPE destination repository type
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
263 -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
264 -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
265 --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
266 --splicemap FILE splice synthesized history into place
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
267 --branchmap FILE change branch names while converting
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
268 --branchsort try to sort changesets by branches
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
269 --datesort try to sort changesets by date
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
270 --sourcesort preserve source changesets order
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
271
17837
b623e323c561 help: indicate help omitting if help document is not fully displayed
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17424
diff changeset
272 use "hg -v help convert" to show the global options
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
273 $ hg init a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
274 $ cd a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
275 $ echo a > a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
276 $ hg ci -d'0 0' -Ama
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
277 adding a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
278 $ hg cp a b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
279 $ hg ci -d'1 0' -mb
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
280 $ hg rm a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
281 $ hg ci -d'2 0' -mc
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
282 $ hg mv b a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
283 $ hg ci -d'3 0' -md
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
284 $ echo a >> a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
285 $ hg ci -d'4 0' -me
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
286 $ cd ..
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
287 $ 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
288 assuming destination a-hg
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
289 initializing destination a-hg repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
290 scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
291 sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
292 converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
293 4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
294 3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
295 2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
296 1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
297 0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
298 $ hg --cwd a-hg pull ../a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
299 pulling from ../a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
300 searching for changes
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
301 no changes found
7905
d596b1f2935a convert: missing p4 tool is only slightly fatal
Mads Kiilerich <mads@kiilerich.com>
parents: 5805
diff changeset
302
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
303 conversion to existing file should fail
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
304
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
305 $ touch bogusfile
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
306 $ hg convert a bogusfile
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
307 initializing destination bogusfile repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
308 abort: cannot create new bundle repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
309 [255]
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
310
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
311 #if unix-permissions
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
312
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
313 conversion to dir without permissions should fail
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
314
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
315 $ mkdir bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
316 $ chmod 000 bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
317
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
318 $ hg convert a bogusdir
18227
720308f741cb dispatch: show empty filename in OSError aborts
Mads Kiilerich <mads@kiilerich.com>
parents: 17974
diff changeset
319 abort: Permission denied: 'bogusdir'
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
320 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
321
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
322 user permissions should succeed
9962
a7178eccf2dc convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com>
parents: 8674
diff changeset
323
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
324 $ chmod 700 bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
325 $ hg convert a bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
326 initializing destination bogusdir repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
327 scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
328 sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
329 converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
330 4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
331 3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
332 2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
333 1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
334 0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
335
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
336 #endif
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
337
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
338 test pre and post conversion actions
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
339
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
340 $ echo 'include b' > filemap
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
341 $ hg convert --debug --filemap filemap a partialb | \
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
342 > grep 'run hg'
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
343 run hg source pre-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
344 run hg sink pre-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
345 run hg sink post-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
346 run hg source post-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
347
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
348 converting empty dir should fail "nicely
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
349
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
350 $ mkdir emptydir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
351
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
352 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
353 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
354
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
355 $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg convert emptydir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
356 assuming destination emptydir-hg
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
357 initializing destination emptydir-hg repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
358 emptydir does not look like a CVS checkout
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
359 emptydir does not look like a Git repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
360 emptydir does not look like a Subversion repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
361 emptydir is not a local Mercurial repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
362 emptydir does not look like a darcs repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
363 emptydir does not look like a monotone repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
364 emptydir does not look like a GNU Arch repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
365 emptydir does not look like a Bazaar repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
366 cannot find required "p4" tool
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
367 abort: emptydir: missing or unsupported repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
368 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
369
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
370 convert with imaginary source type
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 $ hg convert --source-type foo a a-foo
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
373 initializing destination a-foo repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
374 abort: foo: invalid source repository type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
375 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
376
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
377 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
378
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
379 $ hg convert --dest-type foo a a-foo
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
380 abort: foo: invalid destination repository type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
381 [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
382
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
383 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
384
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
385 $ hg convert a b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
386 initializing destination b repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
387 scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
388 sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
389 converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
390 4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
391 3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
392 2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
393 1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
394 0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
395
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
396 contents of fncache file:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
397
13389
3efc99ac2ac4 tests: sort fncache
Adrian Buehlmann <adrian@cadifra.com>
parents: 13011
diff changeset
398 $ cat b/.hg/store/fncache | sort
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
399 data/a.i
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
400 data/b.i
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
401
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
402 test bogus URL
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
403
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
404 $ hg convert -q bzr+ssh://foobar@selenic.com/baz baz
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
405 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
406 [255]
17002
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
407
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
408 test revset converted() lookup
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
409
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17267
diff changeset
410 $ hg --config convert.hg.saverev=True convert a c
17002
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
411 initializing destination c repository
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
412 scanning source...
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
413 sorting...
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
414 converting...
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
415 4 a
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
416 3 b
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
417 2 c
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
418 1 d
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
419 0 e
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
420 $ echo f > c/f
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
421 $ hg -R c ci -d'0 0' -Amf
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
422 adding f
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
423 created new head
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
424 $ hg -R c log -r "converted(09d945a62ce6)"
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
425 changeset: 1:98c3dd46a874
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
426 user: test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
427 date: Thu Jan 01 00:00:01 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
428 summary: b
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
429
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
430 $ hg -R c log -r "converted()"
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
431 changeset: 0:31ed57b2037c
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
432 user: test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
433 date: Thu Jan 01 00:00:00 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
434 summary: a
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
435
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
436 changeset: 1:98c3dd46a874
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
437 user: test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
438 date: Thu Jan 01 00:00:01 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
439 summary: b
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
440
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
441 changeset: 2:3b9ca06ef716
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
442 user: test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
443 date: Thu Jan 01 00:00:02 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
444 summary: c
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
445
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
446 changeset: 3:4e0debd37cf2
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
447 user: test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
448 date: Thu Jan 01 00:00:03 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
449 summary: d
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
450
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
451 changeset: 4:9de3bc9349c5
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
452 user: test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
453 date: Thu Jan 01 00:00:04 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
454 summary: e
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
455