Show More
@@ -40,7 +40,7 b' def convert(ui, src, dest=None, revmapfi' | |||||
40 | (given in a format understood by the source). |
|
40 | (given in a format understood by the source). | |
41 |
|
41 | |||
42 | If no destination directory name is specified, it defaults to the |
|
42 | If no destination directory name is specified, it defaults to the | |
43 |
basename of the source with |
|
43 | basename of the source with ``-hg`` appended. If the destination | |
44 | repository doesn't exist, it will be created. |
|
44 | repository doesn't exist, it will be created. | |
45 |
|
45 | |||
46 | By default, all sources except Mercurial will use --branchsort. |
|
46 | By default, all sources except Mercurial will use --branchsort. | |
@@ -67,14 +67,17 b' def convert(ui, src, dest=None, revmapfi' | |||||
67 | <source ID> <destination ID> |
|
67 | <source ID> <destination ID> | |
68 |
|
68 | |||
69 | If the file doesn't exist, it's automatically created. It's |
|
69 | If the file doesn't exist, it's automatically created. It's | |
70 |
updated on each commit copied, so convert |
|
70 | updated on each commit copied, so :hg:`convert` can be interrupted | |
71 | and can be run repeatedly to copy new commits. |
|
71 | and can be run repeatedly to copy new commits. | |
72 |
|
72 | |||
73 |
The |
|
73 | The username mapping file is a simple text file that maps each | |
74 | source commit author to a destination commit author. It is handy |
|
74 | source commit author to a destination commit author. It is handy | |
75 | for source SCMs that use unix logins to identify authors (eg: |
|
75 | for source SCMs that use unix logins to identify authors (eg: | |
76 | CVS). One line per author mapping and the line format is: |
|
76 | CVS). One line per author mapping and the line format is:: | |
77 | srcauthor=whatever string you want |
|
77 | ||
|
78 | source author = destination author | |||
|
79 | ||||
|
80 | Empty lines and lines starting with a ``#`` are ignored. | |||
78 |
|
81 | |||
79 | The filemap is a file that allows filtering and remapping of files |
|
82 | The filemap is a file that allows filtering and remapping of files | |
80 | and directories. Each line can contain one of the following |
|
83 | and directories. Each line can contain one of the following | |
@@ -86,25 +89,29 b' def convert(ui, src, dest=None, revmapfi' | |||||
86 |
|
89 | |||
87 | rename path/to/source path/to/destination |
|
90 | rename path/to/source path/to/destination | |
88 |
|
91 | |||
89 |
Comment lines start with |
|
92 | Comment lines start with ``#``. A specified path matches if it | |
90 | equals the full relative name of a file or one of its parent |
|
93 | equals the full relative name of a file or one of its parent | |
91 |
directories. The |
|
94 | directories. The ``include`` or ``exclude`` directive with the | |
92 | matching path applies, so line order does not matter. |
|
95 | longest matching path applies, so line order does not matter. | |
93 |
|
96 | |||
94 |
The |
|
97 | The ``include`` directive causes a file, or all files under a | |
95 | directory, to be included in the destination repository, and the |
|
98 | directory, to be included in the destination repository, and the | |
96 | exclusion of all other files and directories not explicitly |
|
99 | exclusion of all other files and directories not explicitly | |
97 |
included. The |
|
100 | included. The ``exclude`` directive causes files or directories to | |
98 |
be omitted. The |
|
101 | be omitted. The ``rename`` directive renames a file or directory if | |
99 | it is converted. To rename from a subdirectory into the root of |
|
102 | it is converted. To rename from a subdirectory into the root of | |
100 |
the repository, use |
|
103 | the repository, use ``.`` as the path to rename to. | |
101 |
|
104 | |||
102 | The splicemap is a file that allows insertion of synthetic |
|
105 | The splicemap is a file that allows insertion of synthetic | |
103 | history, letting you specify the parents of a revision. This is |
|
106 | history, letting you specify the parents of a revision. This is | |
104 | useful if you want to e.g. give a Subversion merge two parents, or |
|
107 | useful if you want to e.g. give a Subversion merge two parents, or | |
105 | graft two disconnected series of history together. Each entry |
|
108 | graft two disconnected series of history together. Each entry | |
106 | contains a key, followed by a space, followed by one or two |
|
109 | contains a key, followed by a space, followed by one or two | |
107 | comma-separated values. The key is the revision ID in the source |
|
110 | comma-separated values:: | |
|
111 | ||||
|
112 | key parent1, parent2 | |||
|
113 | ||||
|
114 | The key is the revision ID in the source | |||
108 | revision control system whose parents should be modified (same |
|
115 | revision control system whose parents should be modified (same | |
109 | format as a key in .hg/shamap). The values are the revision IDs |
|
116 | format as a key in .hg/shamap). The values are the revision IDs | |
110 | (in either the source or destination revision control system) that |
|
117 | (in either the source or destination revision control system) that | |
@@ -118,11 +125,15 b' def convert(ui, src, dest=None, revmapfi' | |||||
118 | conjunction with a splicemap, it allows for a powerful combination |
|
125 | conjunction with a splicemap, it allows for a powerful combination | |
119 | to help fix even the most badly mismanaged repositories and turn them |
|
126 | to help fix even the most badly mismanaged repositories and turn them | |
120 | into nicely structured Mercurial repositories. The branchmap contains |
|
127 | into nicely structured Mercurial repositories. The branchmap contains | |
121 | lines of the form "original_branch_name new_branch_name". |
|
128 | lines of the form:: | |
122 | "original_branch_name" is the name of the branch in the source |
|
129 | ||
123 | repository, and "new_branch_name" is the name of the branch is the |
|
130 | original_branch_name new_branch_name | |
124 | destination repository. This can be used to (for instance) move code |
|
131 | ||
125 | in one repository from "default" to a named branch. |
|
132 | where "original_branch_name" is the name of the branch in the | |
|
133 | source repository, and "new_branch_name" is the name of the branch | |||
|
134 | is the destination repository. No whitespace is allowed in the | |||
|
135 | branch names. This can be used to (for instance) move code in one | |||
|
136 | repository from "default" to a named branch. | |||
126 |
|
137 | |||
127 | Mercurial Source |
|
138 | Mercurial Source | |
128 | ---------------- |
|
139 | ---------------- |
@@ -24,7 +24,7 b' convert a foreign SCM repository to a Me' | |||||
24 | understood by the source). |
|
24 | understood by the source). | |
25 |
|
25 | |||
26 | If no destination directory name is specified, it defaults to the basename |
|
26 | If no destination directory name is specified, it defaults to the basename | |
27 |
of the source with |
|
27 | of the source with "-hg" appended. If the destination repository doesn't | |
28 | exist, it will be created. |
|
28 | exist, it will be created. | |
29 |
|
29 | |||
30 | By default, all sources except Mercurial will use --branchsort. Mercurial |
|
30 | By default, all sources except Mercurial will use --branchsort. Mercurial | |
@@ -48,13 +48,17 b' convert a foreign SCM repository to a Me' | |||||
48 | <source ID> <destination ID> |
|
48 | <source ID> <destination ID> | |
49 |
|
49 | |||
50 | If the file doesn't exist, it's automatically created. It's updated on |
|
50 | If the file doesn't exist, it's automatically created. It's updated on | |
51 |
each commit copied, so convert |
|
51 | each commit copied, so "hg convert" can be interrupted and can be run | |
52 | repeatedly to copy new commits. |
|
52 | repeatedly to copy new commits. | |
53 |
|
53 | |||
54 |
The |
|
54 | The username mapping file is a simple text file that maps each source | |
55 | commit author to a destination commit author. It is handy for source SCMs |
|
55 | commit author to a destination commit author. It is handy for source SCMs | |
56 | that use unix logins to identify authors (eg: CVS). One line per author |
|
56 | that use unix logins to identify authors (eg: CVS). One line per author | |
57 |
mapping and the line format is: |
|
57 | mapping and the line format is: | |
|
58 | ||||
|
59 | source author = destination author | |||
|
60 | ||||
|
61 | Empty lines and lines starting with a "#" are ignored. | |||
58 |
|
62 | |||
59 | The filemap is a file that allows filtering and remapping of files and |
|
63 | The filemap is a file that allows filtering and remapping of files and | |
60 | directories. Each line can contain one of the following directives: |
|
64 | directories. Each line can contain one of the following directives: | |
@@ -65,40 +69,48 b' convert a foreign SCM repository to a Me' | |||||
65 |
|
69 | |||
66 | rename path/to/source path/to/destination |
|
70 | rename path/to/source path/to/destination | |
67 |
|
71 | |||
68 |
Comment lines start with |
|
72 | Comment lines start with "#". A specified path matches if it equals the | |
69 | full relative name of a file or one of its parent directories. The |
|
73 | full relative name of a file or one of its parent directories. The | |
70 |
|
|
74 | "include" or "exclude" directive with the longest matching path applies, | |
71 | so line order does not matter. |
|
75 | so line order does not matter. | |
72 |
|
76 | |||
73 |
The |
|
77 | The "include" directive causes a file, or all files under a directory, to | |
74 | be included in the destination repository, and the exclusion of all other |
|
78 | be included in the destination repository, and the exclusion of all other | |
75 |
files and directories not explicitly included. The |
|
79 | files and directories not explicitly included. The "exclude" directive | |
76 |
causes files or directories to be omitted. The |
|
80 | causes files or directories to be omitted. The "rename" directive renames | |
77 | a file or directory if it is converted. To rename from a subdirectory into |
|
81 | a file or directory if it is converted. To rename from a subdirectory into | |
78 |
the root of the repository, use |
|
82 | the root of the repository, use "." as the path to rename to. | |
79 |
|
83 | |||
80 | The splicemap is a file that allows insertion of synthetic history, |
|
84 | The splicemap is a file that allows insertion of synthetic history, | |
81 | letting you specify the parents of a revision. This is useful if you want |
|
85 | letting you specify the parents of a revision. This is useful if you want | |
82 | to e.g. give a Subversion merge two parents, or graft two disconnected |
|
86 | to e.g. give a Subversion merge two parents, or graft two disconnected | |
83 | series of history together. Each entry contains a key, followed by a |
|
87 | series of history together. Each entry contains a key, followed by a | |
84 |
space, followed by one or two comma-separated values |
|
88 | space, followed by one or two comma-separated values: | |
85 | revision ID in the source revision control system whose parents should be |
|
89 | ||
86 | modified (same format as a key in .hg/shamap). The values are the revision |
|
90 | key parent1, parent2 | |
87 | IDs (in either the source or destination revision control system) that |
|
91 | ||
88 | should be used as the new parents for that node. For example, if you have |
|
92 | The key is the revision ID in the source revision control system whose | |
89 | merged "release-1.0" into "trunk", then you should specify the revision on |
|
93 | parents should be modified (same format as a key in .hg/shamap). The | |
90 | "trunk" as the first parent and the one on the "release-1.0" branch as the |
|
94 | values are the revision IDs (in either the source or destination revision | |
91 | second. |
|
95 | control system) that should be used as the new parents for that node. For | |
|
96 | example, if you have merged "release-1.0" into "trunk", then you should | |||
|
97 | specify the revision on "trunk" as the first parent and the one on the | |||
|
98 | "release-1.0" branch as the second. | |||
92 |
|
99 | |||
93 | The branchmap is a file that allows you to rename a branch when it is |
|
100 | The branchmap is a file that allows you to rename a branch when it is | |
94 | being brought in from whatever external repository. When used in |
|
101 | being brought in from whatever external repository. When used in | |
95 | conjunction with a splicemap, it allows for a powerful combination to help |
|
102 | conjunction with a splicemap, it allows for a powerful combination to help | |
96 | fix even the most badly mismanaged repositories and turn them into nicely |
|
103 | fix even the most badly mismanaged repositories and turn them into nicely | |
97 | structured Mercurial repositories. The branchmap contains lines of the |
|
104 | structured Mercurial repositories. The branchmap contains lines of the | |
98 | form "original_branch_name new_branch_name". "original_branch_name" is the |
|
105 | form: | |
99 | name of the branch in the source repository, and "new_branch_name" is the |
|
106 | ||
100 | name of the branch is the destination repository. This can be used to (for |
|
107 | original_branch_name new_branch_name | |
101 | instance) move code in one repository from "default" to a named branch. |
|
108 | ||
|
109 | where "original_branch_name" is the name of the branch in the source | |||
|
110 | repository, and "new_branch_name" is the name of the branch is the | |||
|
111 | destination repository. No whitespace is allowed in the branch names. This | |||
|
112 | can be used to (for instance) move code in one repository from "default" | |||
|
113 | to a named branch. | |||
102 |
|
114 | |||
103 | Mercurial Source |
|
115 | Mercurial Source | |
104 | ---------------- |
|
116 | ---------------- |
General Comments 0
You need to be logged in to leave comments.
Login now