Show More
@@ -261,7 +261,7 b' def addmargins(blocks):' | |||||
261 | i = 1 |
|
261 | i = 1 | |
262 | while i < len(blocks): |
|
262 | while i < len(blocks): | |
263 | if (blocks[i]['type'] == blocks[i - 1]['type'] and |
|
263 | if (blocks[i]['type'] == blocks[i - 1]['type'] and | |
264 |
blocks[i]['type'] in ('bullet', 'option', 'field' |
|
264 | blocks[i]['type'] in ('bullet', 'option', 'field')): | |
265 | i += 1 |
|
265 | i += 1 | |
266 | else: |
|
266 | else: | |
267 | blocks.insert(i, dict(lines=[''], indent=0, type='margin')) |
|
267 | blocks.insert(i, dict(lines=[''], indent=0, type='margin')) |
@@ -103,8 +103,10 b' convert a foreign SCM repository to a Me' | |||||
103 | ignore integrity errors when reading. Use it to fix Mercurial |
|
103 | ignore integrity errors when reading. Use it to fix Mercurial | |
104 | repositories with missing revlogs, by converting from and to |
|
104 | repositories with missing revlogs, by converting from and to | |
105 | Mercurial. |
|
105 | Mercurial. | |
|
106 | ||||
106 | --config convert.hg.saverev=False (boolean) |
|
107 | --config convert.hg.saverev=False (boolean) | |
107 | store original revision ID in changeset (forces target IDs to change) |
|
108 | store original revision ID in changeset (forces target IDs to change) | |
|
109 | ||||
108 | --config convert.hg.startrev=0 (hg revision identifier) |
|
110 | --config convert.hg.startrev=0 (hg revision identifier) | |
109 | convert start revision and its descendants |
|
111 | convert start revision and its descendants | |
110 |
|
112 | |||
@@ -125,25 +127,30 b' convert a foreign SCM repository to a Me' | |||||
125 | --config convert.cvsps.cache=True (boolean) |
|
127 | --config convert.cvsps.cache=True (boolean) | |
126 | Set to False to disable remote log caching, for testing and debugging |
|
128 | Set to False to disable remote log caching, for testing and debugging | |
127 | purposes. |
|
129 | purposes. | |
|
130 | ||||
128 | --config convert.cvsps.fuzz=60 (integer) |
|
131 | --config convert.cvsps.fuzz=60 (integer) | |
129 | Specify the maximum time (in seconds) that is allowed between commits |
|
132 | Specify the maximum time (in seconds) that is allowed between commits | |
130 | with identical user and log message in a single changeset. When very |
|
133 | with identical user and log message in a single changeset. When very | |
131 | large files were checked in as part of a changeset then the default |
|
134 | large files were checked in as part of a changeset then the default | |
132 | may not be long enough. |
|
135 | may not be long enough. | |
|
136 | ||||
133 | --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}' |
|
137 | --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}' | |
134 | Specify a regular expression to which commit log messages are matched. |
|
138 | Specify a regular expression to which commit log messages are matched. | |
135 | If a match occurs, then the conversion process will insert a dummy |
|
139 | If a match occurs, then the conversion process will insert a dummy | |
136 | revision merging the branch on which this log message occurs to the |
|
140 | revision merging the branch on which this log message occurs to the | |
137 | branch indicated in the regex. |
|
141 | branch indicated in the regex. | |
|
142 | ||||
138 | --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' |
|
143 | --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' | |
139 | Specify a regular expression to which commit log messages are matched. |
|
144 | Specify a regular expression to which commit log messages are matched. | |
140 | If a match occurs, then the conversion process will add the most |
|
145 | If a match occurs, then the conversion process will add the most | |
141 | recent revision on the branch indicated in the regex as the second |
|
146 | recent revision on the branch indicated in the regex as the second | |
142 | parent of the changeset. |
|
147 | parent of the changeset. | |
|
148 | ||||
143 | --config hook.cvslog |
|
149 | --config hook.cvslog | |
144 | Specify a Python function to be called at the end of gathering the CVS |
|
150 | Specify a Python function to be called at the end of gathering the CVS | |
145 | log. The function is passed a list with the log entries, and can |
|
151 | log. The function is passed a list with the log entries, and can | |
146 | modify the entries in-place, or add or delete them. |
|
152 | modify the entries in-place, or add or delete them. | |
|
153 | ||||
147 | --config hook.cvschangesets |
|
154 | --config hook.cvschangesets | |
148 | Specify a Python function to be called after the changesets are |
|
155 | Specify a Python function to be called after the changesets are | |
149 | calculated from the the CVS log. The function is passed a list with |
|
156 | calculated from the the CVS log. The function is passed a list with | |
@@ -170,8 +177,10 b' convert a foreign SCM repository to a Me' | |||||
170 |
|
177 | |||
171 | --config convert.svn.branches=branches (directory name) |
|
178 | --config convert.svn.branches=branches (directory name) | |
172 | specify the directory containing branches |
|
179 | specify the directory containing branches | |
|
180 | ||||
173 | --config convert.svn.tags=tags (directory name) |
|
181 | --config convert.svn.tags=tags (directory name) | |
174 | specify the directory containing tags |
|
182 | specify the directory containing tags | |
|
183 | ||||
175 | --config convert.svn.trunk=trunk (directory name) |
|
184 | --config convert.svn.trunk=trunk (directory name) | |
176 | specify the name of the trunk branch |
|
185 | specify the name of the trunk branch | |
177 |
|
186 | |||
@@ -202,8 +211,10 b' convert a foreign SCM repository to a Me' | |||||
202 |
|
211 | |||
203 | --config convert.hg.clonebranches=False (boolean) |
|
212 | --config convert.hg.clonebranches=False (boolean) | |
204 | dispatch source branches in separate clones. |
|
213 | dispatch source branches in separate clones. | |
|
214 | ||||
205 | --config convert.hg.tagsbranch=default (branch name) |
|
215 | --config convert.hg.tagsbranch=default (branch name) | |
206 | tag revisions branch name |
|
216 | tag revisions branch name | |
|
217 | ||||
207 | --config convert.hg.usebranchnames=True (boolean) |
|
218 | --config convert.hg.usebranchnames=True (boolean) | |
208 | preserve branch names |
|
219 | preserve branch names | |
209 |
|
220 |
@@ -25,10 +25,12 b' definitions formatted to fit within 60 c' | |||||
25 | ---------------------------------------------------------------------- |
|
25 | ---------------------------------------------------------------------- | |
26 | A Term |
|
26 | A Term | |
27 | Definition. The indented lines make up the definition. |
|
27 | Definition. The indented lines make up the definition. | |
|
28 | ||||
28 | Another Term |
|
29 | Another Term | |
29 | Another definition. The final line in the definition |
|
30 | Another definition. The final line in the definition | |
30 | determines the indentation, so this will be indented |
|
31 | determines the indentation, so this will be indented | |
31 | with four spaces. |
|
32 | with four spaces. | |
|
33 | ||||
32 | A Nested/Indented Term |
|
34 | A Nested/Indented Term | |
33 | Definition. |
|
35 | Definition. | |
34 | ---------------------------------------------------------------------- |
|
36 | ---------------------------------------------------------------------- | |
@@ -39,6 +41,7 b' A Term' | |||||
39 | Definition. The indented |
|
41 | Definition. The indented | |
40 | lines make up the |
|
42 | lines make up the | |
41 | definition. |
|
43 | definition. | |
|
44 | ||||
42 | Another Term |
|
45 | Another Term | |
43 | Another definition. The |
|
46 | Another definition. The | |
44 | final line in the |
|
47 | final line in the | |
@@ -46,6 +49,7 b' Another Term' | |||||
46 | indentation, so this will |
|
49 | indentation, so this will | |
47 | be indented with four |
|
50 | be indented with four | |
48 | spaces. |
|
51 | spaces. | |
|
52 | ||||
49 | A Nested/Indented Term |
|
53 | A Nested/Indented Term | |
50 | Definition. |
|
54 | Definition. | |
51 | ---------------------------------------------------------------------- |
|
55 | ---------------------------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now