author | Simon Heimberg <simohe@besonet.ch> |
Wed, 22 Jan 2014 16:34:36 +0100 | |
branch | stable |
changeset 20321 | 4d60a7fe3e8a |
parent 20008 | e54a078153f7 |
child 20375 | 81cf597dafa9 |
child 20784 | 7f4cf938643d |
permissions | -rw-r--r-- |
12510 | 1 |
$ cat >> $HGRCPATH <<EOF |
2 |
> [extensions] |
|
3 |
> convert= |
|
4 |
> [convert] |
|
5 |
> hg.saverev=False |
|
6 |
> EOF |
|
7 |
$ hg help convert |
|
8 |
hg convert [OPTION]... SOURCE [DEST [REVMAP]] |
|
9 |
||
10 |
convert a foreign SCM repository to a Mercurial one. |
|
11 |
||
12 |
Accepted source formats [identifiers]: |
|
13 |
||
14 |
- Mercurial [hg] |
|
15 |
- CVS [cvs] |
|
16 |
- Darcs [darcs] |
|
17 |
- git [git] |
|
18 |
- Subversion [svn] |
|
19 |
- Monotone [mtn] |
|
20 |
- GNU Arch [gnuarch] |
|
21 |
- Bazaar [bzr] |
|
22 |
- Perforce [p4] |
|
23 |
||
24 |
Accepted destination formats [identifiers]: |
|
25 |
||
26 |
- Mercurial [hg] |
|
27 |
- Subversion [svn] (history on branches is not preserved) |
|
28 |
||
29 |
If no revision is given, all revisions will be converted. Otherwise, |
|
30 |
convert will only import up to the named revision (given in a format |
|
31 |
understood by the source). |
|
32 |
||
33 |
If no destination directory name is specified, it defaults to the basename |
|
34 |
of the source with "-hg" appended. If the destination repository doesn't |
|
35 |
exist, it will be created. |
|
36 |
||
37 |
By default, all sources except Mercurial will use --branchsort. Mercurial |
|
38 |
uses --sourcesort to preserve original revision numbers order. Sort modes |
|
39 |
have the following effects: |
|
40 |
||
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 | 44 |
--datesort sort revisions by date. Converted repositories have good- |
45 |
looking changelogs but are often an order of magnitude |
|
46 |
larger than the same ones generated by --branchsort. |
|
47 |
--sourcesort try to preserve source revisions order, only supported by |
|
48 |
Mercurial sources. |
|
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
18324
diff
changeset
|
49 |
--closesort try to move closed revisions as close as possible to parent |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
18324
diff
changeset
|
50 |
branches, only supported by Mercurial sources. |
12510 | 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 | 54 |
maps each source commit ID to the destination ID for that revision, like |
55 |
so: |
|
56 |
||
57 |
<source ID> <destination ID> |
|
58 |
||
59 |
If the file doesn't exist, it's automatically created. It's updated on |
|
60 |
each commit copied, so "hg convert" can be interrupted and can be run |
|
61 |
repeatedly to copy new commits. |
|
62 |
||
63 |
The authormap is a simple text file that maps each source commit author to |
|
64 |
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
|
65 |
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
|
66 |
the line format is: |
12510 | 67 |
|
68 |
source author = destination author |
|
69 |
||
70 |
Empty lines and lines starting with a "#" are ignored. |
|
71 |
||
72 |
The filemap is a file that allows filtering and remapping of files and |
|
73 |
directories. Each line can contain one of the following directives: |
|
74 |
||
75 |
include path/to/file-or-dir |
|
76 |
||
77 |
exclude path/to/file-or-dir |
|
78 |
||
79 |
rename path/to/source path/to/destination |
|
80 |
||
81 |
Comment lines start with "#". A specified path matches if it equals the |
|
82 |
full relative name of a file or one of its parent directories. The |
|
83 |
"include" or "exclude" directive with the longest matching path applies, |
|
84 |
so line order does not matter. |
|
85 |
||
86 |
The "include" directive causes a file, or all files under a directory, to |
|
87 |
be included in the destination repository, and the exclusion of all other |
|
88 |
files and directories not explicitly included. The "exclude" directive |
|
89 |
causes files or directories to be omitted. The "rename" directive renames |
|
90 |
a file or directory if it is converted. To rename from a subdirectory into |
|
91 |
the root of the repository, use "." as the path to rename to. |
|
92 |
||
93 |
The splicemap is a file that allows insertion of synthetic history, |
|
94 |
letting you specify the parents of a revision. This is useful if you want |
|
95 |
to e.g. give a Subversion merge two parents, or graft two disconnected |
|
96 |
series of history together. Each entry contains a key, followed by a |
|
97 |
space, followed by one or two comma-separated values: |
|
98 |
||
99 |
key parent1, parent2 |
|
100 |
||
101 |
The key is the revision ID in the source revision control system whose |
|
102 |
parents should be modified (same format as a key in .hg/shamap). The |
|
103 |
values are the revision IDs (in either the source or destination revision |
|
104 |
control system) that should be used as the new parents for that node. For |
|
105 |
example, if you have merged "release-1.0" into "trunk", then you should |
|
106 |
specify the revision on "trunk" as the first parent and the one on the |
|
107 |
"release-1.0" branch as the second. |
|
108 |
||
109 |
The branchmap is a file that allows you to rename a branch when it is |
|
110 |
being brought in from whatever external repository. When used in |
|
111 |
conjunction with a splicemap, it allows for a powerful combination to help |
|
112 |
fix even the most badly mismanaged repositories and turn them into nicely |
|
113 |
structured Mercurial repositories. The branchmap contains lines of the |
|
114 |
form: |
|
115 |
||
116 |
original_branch_name new_branch_name |
|
117 |
||
118 |
where "original_branch_name" is the name of the branch in the source |
|
119 |
repository, and "new_branch_name" is the name of the branch is the |
|
120 |
destination repository. No whitespace is allowed in the branch names. This |
|
121 |
can be used to (for instance) move code in one repository from "default" |
|
122 |
to a named branch. |
|
123 |
||
124 |
Mercurial Source |
|
17267
979b107eaea2
doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17251
diff
changeset
|
125 |
################ |
12510 | 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 | 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. |
19891
e271970b9821
convert: introduce hg.revs to replace hg.startrev and --rev with a revset
Mads Kiilerich <madski@unity3d.com>
parents:
19864
diff
changeset
|
138 |
convert.hg.revs |
e271970b9821
convert: introduce hg.revs to replace hg.startrev and --rev with a revset
Mads Kiilerich <madski@unity3d.com>
parents:
19864
diff
changeset
|
139 |
revset specifying the source revisions to convert. |
12510 | 140 |
|
141 |
CVS Source |
|
17267
979b107eaea2
doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17251
diff
changeset
|
142 |
########## |
12510 | 143 |
|
144 |
CVS source will use a sandbox (i.e. a checked-out copy) from CVS to |
|
145 |
indicate the starting point of what will be converted. Direct access to |
|
146 |
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
|
147 |
":local:". The conversion uses the top level directory in the sandbox to |
12510 | 148 |
find the CVS repository, and then uses CVS rlog commands to find files to |
149 |
convert. This means that unless a filemap is given, all files under the |
|
150 |
starting directory will be converted, and that any directory |
|
151 |
reorganization in the CVS sandbox is ignored. |
|
152 |
||
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
153 |
The following options can be used with "--config": |
12510 | 154 |
|
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
155 |
convert.cvsps.cache |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
156 |
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
|
157 |
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
|
158 |
convert.cvsps.fuzz |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
159 |
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
|
160 |
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
|
161 |
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
|
162 |
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
|
163 |
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
|
164 |
convert.cvsps.mergeto |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
165 |
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
|
166 |
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
|
167 |
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
|
168 |
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
|
169 |
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
|
170 |
convert.cvsps.mergefrom |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
171 |
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
|
172 |
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
|
173 |
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
|
174 |
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
|
175 |
"{{mergefrombranch ([-\w]+)}}" |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17837
diff
changeset
|
176 |
convert.localtimezone |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17837
diff
changeset
|
177 |
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
|
178 |
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
|
179 |
(use UTC). |
18321
c51d2bc7a5d7
convert: correct 'hooks' section name in online help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17837
diff
changeset
|
180 |
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
|
181 |
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
|
182 |
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
|
183 |
or delete them. |
18321
c51d2bc7a5d7
convert: correct 'hooks' section name in online help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17837
diff
changeset
|
184 |
hooks.cvschangesets |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
185 |
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
|
186 |
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
|
187 |
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
|
188 |
changesets in-place, or add or delete them. |
12510 | 189 |
|
190 |
An additional "debugcvsps" Mercurial command allows the builtin changeset |
|
191 |
merging code to be run without doing a conversion. Its parameters and |
|
192 |
output are similar to that of cvsps 2.1. Please see the command help for |
|
193 |
more details. |
|
194 |
||
195 |
Subversion Source |
|
17267
979b107eaea2
doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17251
diff
changeset
|
196 |
################# |
12510 | 197 |
|
198 |
Subversion source detects classical trunk/branches/tags layouts. By |
|
199 |
default, the supplied "svn://repo/path/" source URL is converted as a |
|
200 |
single branch. If "svn://repo/path/trunk" exists it replaces the default |
|
201 |
branch. If "svn://repo/path/branches" exists, its subdirectories are |
|
202 |
listed as possible branches. If "svn://repo/path/tags" exists, it is |
|
203 |
looked for tags referencing converted branches. Default "trunk", |
|
204 |
"branches" and "tags" values can be overridden with following options. Set |
|
205 |
them to paths relative to the source URL, or leave them blank to disable |
|
206 |
auto detection. |
|
207 |
||
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
208 |
The following options can be set with "--config": |
12510 | 209 |
|
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
210 |
convert.svn.branches |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
211 |
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
|
212 |
"branches". |
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
213 |
convert.svn.tags |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
214 |
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
|
215 |
"tags". |
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
216 |
convert.svn.trunk |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
217 |
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
|
218 |
"trunk". |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17837
diff
changeset
|
219 |
convert.localtimezone |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17837
diff
changeset
|
220 |
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
|
221 |
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
|
222 |
(use UTC). |
12510 | 223 |
|
224 |
Source history can be retrieved starting at a specific revision, instead |
|
225 |
of being integrally converted. Only single branch conversions are |
|
226 |
supported. |
|
227 |
||
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
228 |
convert.svn.startrev |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
229 |
specify start Subversion revision number. The default is 0. |
12510 | 230 |
|
231 |
Perforce Source |
|
17267
979b107eaea2
doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17251
diff
changeset
|
232 |
############### |
12510 | 233 |
|
234 |
The Perforce (P4) importer can be given a p4 depot path or a client |
|
235 |
specification as source. It will convert all files in the source to a flat |
|
236 |
Mercurial repository, ignoring labels, branches and integrations. Note |
|
237 |
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
|
238 |
directory, because otherwise the target may be named "...-hg". |
12510 | 239 |
|
240 |
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
|
241 |
specifying an initial Perforce revision: |
12510 | 242 |
|
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
243 |
convert.p4.startrev |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
244 |
specify initial Perforce revision (a Perforce changelist |
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
245 |
number). |
12510 | 246 |
|
247 |
Mercurial Destination |
|
17267
979b107eaea2
doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17251
diff
changeset
|
248 |
##################### |
12510 | 249 |
|
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
250 |
The following options are supported: |
12510 | 251 |
|
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
252 |
convert.hg.clonebranches |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
253 |
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
|
254 |
False. |
12922
58f0c60b7f40
convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents:
12787
diff
changeset
|
255 |
convert.hg.tagsbranch |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
256 |
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
|
257 |
convert.hg.usebranchnames |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15443
diff
changeset
|
258 |
preserve branch names. The default is True. |
12510 | 259 |
|
260 |
options: |
|
261 |
||
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
262 |
-s --source-type TYPE source repository type |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
263 |
-d --dest-type TYPE destination repository type |
19864
1ce3f56b879f
convert: fix description of 'convert --rev'
Mads Kiilerich <madski@unity3d.com>
parents:
18819
diff
changeset
|
264 |
-r --rev REV import up to source revision REV |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
265 |
-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
|
266 |
--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
|
267 |
--splicemap FILE splice synthesized history into place |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
268 |
--branchmap FILE change branch names while converting |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
269 |
--branchsort try to sort changesets by branches |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
270 |
--datesort try to sort changesets by date |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
13494
diff
changeset
|
271 |
--sourcesort preserve source changesets order |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
18324
diff
changeset
|
272 |
--closesort try to reorder closed revisions |
12510 | 273 |
|
17837
b623e323c561
help: indicate help omitting if help document is not fully displayed
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17424
diff
changeset
|
274 |
use "hg -v help convert" to show the global options |
12510 | 275 |
$ hg init a |
276 |
$ cd a |
|
277 |
$ echo a > a |
|
278 |
$ hg ci -d'0 0' -Ama |
|
279 |
adding a |
|
280 |
$ hg cp a b |
|
281 |
$ hg ci -d'1 0' -mb |
|
282 |
$ hg rm a |
|
283 |
$ hg ci -d'2 0' -mc |
|
284 |
$ hg mv b a |
|
285 |
$ hg ci -d'3 0' -md |
|
286 |
$ echo a >> a |
|
287 |
$ hg ci -d'4 0' -me |
|
288 |
$ cd .. |
|
289 |
$ hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded' |
|
290 |
assuming destination a-hg |
|
291 |
initializing destination a-hg repository |
|
292 |
scanning source... |
|
293 |
sorting... |
|
294 |
converting... |
|
295 |
4 a |
|
296 |
3 b |
|
297 |
2 c |
|
298 |
1 d |
|
299 |
0 e |
|
300 |
$ hg --cwd a-hg pull ../a |
|
301 |
pulling from ../a |
|
302 |
searching for changes |
|
303 |
no changes found |
|
7905
d596b1f2935a
convert: missing p4 tool is only slightly fatal
Mads Kiilerich <mads@kiilerich.com>
parents:
5805
diff
changeset
|
304 |
|
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
305 |
conversion to existing file should fail |
12510 | 306 |
|
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
307 |
$ touch bogusfile |
12510 | 308 |
$ hg convert a bogusfile |
309 |
initializing destination bogusfile repository |
|
310 |
abort: cannot create new bundle repository |
|
311 |
[255] |
|
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
312 |
|
20008
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
19891
diff
changeset
|
313 |
#if unix-permissions no-root |
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
314 |
|
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
315 |
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
|
316 |
|
12510 | 317 |
$ mkdir bogusdir |
318 |
$ chmod 000 bogusdir |
|
319 |
||
320 |
$ hg convert a bogusdir |
|
18227
720308f741cb
dispatch: show empty filename in OSError aborts
Mads Kiilerich <mads@kiilerich.com>
parents:
17974
diff
changeset
|
321 |
abort: Permission denied: 'bogusdir' |
12510 | 322 |
[255] |
323 |
||
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
324 |
user permissions should succeed |
9962
a7178eccf2dc
convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com>
parents:
8674
diff
changeset
|
325 |
|
12510 | 326 |
$ chmod 700 bogusdir |
327 |
$ hg convert a bogusdir |
|
328 |
initializing destination bogusdir repository |
|
329 |
scanning source... |
|
330 |
sorting... |
|
331 |
converting... |
|
332 |
4 a |
|
333 |
3 b |
|
334 |
2 c |
|
335 |
1 d |
|
336 |
0 e |
|
337 |
||
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
338 |
#endif |
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
339 |
|
12510 | 340 |
test pre and post conversion actions |
341 |
||
342 |
$ echo 'include b' > filemap |
|
343 |
$ hg convert --debug --filemap filemap a partialb | \ |
|
344 |
> grep 'run hg' |
|
345 |
run hg source pre-conversion action |
|
346 |
run hg sink pre-conversion action |
|
347 |
run hg sink post-conversion action |
|
348 |
run hg source post-conversion action |
|
349 |
||
350 |
converting empty dir should fail "nicely |
|
351 |
||
352 |
$ mkdir emptydir |
|
353 |
||
354 |
override $PATH to ensure p4 not visible; use $PYTHON in case we're |
|
355 |
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
|
356 |
|
12510 | 357 |
$ PATH="$BINDIR" $PYTHON "$BINDIR"/hg convert emptydir |
358 |
assuming destination emptydir-hg |
|
359 |
initializing destination emptydir-hg repository |
|
360 |
emptydir does not look like a CVS checkout |
|
361 |
emptydir does not look like a Git repository |
|
362 |
emptydir does not look like a Subversion repository |
|
363 |
emptydir is not a local Mercurial repository |
|
364 |
emptydir does not look like a darcs repository |
|
365 |
emptydir does not look like a monotone repository |
|
366 |
emptydir does not look like a GNU Arch repository |
|
367 |
emptydir does not look like a Bazaar repository |
|
368 |
cannot find required "p4" tool |
|
369 |
abort: emptydir: missing or unsupported repository |
|
370 |
[255] |
|
371 |
||
372 |
convert with imaginary source type |
|
373 |
||
374 |
$ hg convert --source-type foo a a-foo |
|
375 |
initializing destination a-foo repository |
|
376 |
abort: foo: invalid source repository type |
|
377 |
[255] |
|
378 |
||
379 |
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
|
380 |
|
12510 | 381 |
$ hg convert --dest-type foo a a-foo |
382 |
abort: foo: invalid destination repository type |
|
383 |
[255] |
|
384 |
||
385 |
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
|
386 |
|
12510 | 387 |
$ hg convert a b |
388 |
initializing destination b repository |
|
389 |
scanning source... |
|
390 |
sorting... |
|
391 |
converting... |
|
392 |
4 a |
|
393 |
3 b |
|
394 |
2 c |
|
395 |
1 d |
|
396 |
0 e |
|
397 |
||
398 |
contents of fncache file: |
|
399 |
||
13389
3efc99ac2ac4
tests: sort fncache
Adrian Buehlmann <adrian@cadifra.com>
parents:
13011
diff
changeset
|
400 |
$ cat b/.hg/store/fncache | sort |
12510 | 401 |
data/a.i |
402 |
data/b.i |
|
403 |
||
404 |
test bogus URL |
|
405 |
||
406 |
$ hg convert -q bzr+ssh://foobar@selenic.com/baz baz |
|
407 |
abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository |
|
408 |
[255] |
|
17002
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
409 |
|
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
410 |
test revset converted() lookup |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
411 |
|
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17267
diff
changeset
|
412 |
$ 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
|
413 |
initializing destination c repository |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
414 |
scanning source... |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
415 |
sorting... |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
416 |
converting... |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
417 |
4 a |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
418 |
3 b |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
419 |
2 c |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
420 |
1 d |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
421 |
0 e |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
422 |
$ echo f > c/f |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
423 |
$ 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
|
424 |
adding f |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
425 |
created new head |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
426 |
$ 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
|
427 |
changeset: 1:98c3dd46a874 |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
428 |
user: test |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
429 |
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
|
430 |
summary: b |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
431 |
|
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
432 |
$ 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
|
433 |
changeset: 0:31ed57b2037c |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
434 |
user: test |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
435 |
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
|
436 |
summary: a |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
437 |
|
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
438 |
changeset: 1:98c3dd46a874 |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
439 |
user: test |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
440 |
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
|
441 |
summary: b |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
442 |
|
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
443 |
changeset: 2:3b9ca06ef716 |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
444 |
user: test |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
445 |
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
|
446 |
summary: c |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
447 |
|
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
448 |
changeset: 3:4e0debd37cf2 |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
449 |
user: test |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
450 |
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
|
451 |
summary: d |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
452 |
|
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
453 |
changeset: 4:9de3bc9349c5 |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
454 |
user: test |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
455 |
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
|
456 |
summary: e |
0eb522625eb2
revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents:
16986
diff
changeset
|
457 |