Show More
@@ -28,103 +28,6 b' command = registrar.command(cmdtable)' | |||||
28 | # leave the attribute unspecified. |
|
28 | # leave the attribute unspecified. | |
29 | testedwith = 'ships-with-hg-core' |
|
29 | testedwith = 'ships-with-hg-core' | |
30 |
|
30 | |||
31 | configtable = {} |
|
|||
32 | configitem = registrar.configitem(configtable) |
|
|||
33 |
|
||||
34 | configitem('convert', 'cvsps.cache', |
|
|||
35 | default=True, |
|
|||
36 | ) |
|
|||
37 | configitem('convert', 'cvsps.fuzz', |
|
|||
38 | default=60, |
|
|||
39 | ) |
|
|||
40 | configitem('convert', 'cvsps.logencoding', |
|
|||
41 | default=None, |
|
|||
42 | ) |
|
|||
43 | configitem('convert', 'cvsps.mergefrom', |
|
|||
44 | default=None, |
|
|||
45 | ) |
|
|||
46 | configitem('convert', 'cvsps.mergeto', |
|
|||
47 | default=None, |
|
|||
48 | ) |
|
|||
49 | configitem('convert', 'git.committeractions', |
|
|||
50 | default=lambda: ['messagedifferent'], |
|
|||
51 | ) |
|
|||
52 | configitem('convert', 'git.extrakeys', |
|
|||
53 | default=list, |
|
|||
54 | ) |
|
|||
55 | configitem('convert', 'git.findcopiesharder', |
|
|||
56 | default=False, |
|
|||
57 | ) |
|
|||
58 | configitem('convert', 'git.remoteprefix', |
|
|||
59 | default='remote', |
|
|||
60 | ) |
|
|||
61 | configitem('convert', 'git.renamelimit', |
|
|||
62 | default=400, |
|
|||
63 | ) |
|
|||
64 | configitem('convert', 'git.saverev', |
|
|||
65 | default=True, |
|
|||
66 | ) |
|
|||
67 | configitem('convert', 'git.similarity', |
|
|||
68 | default=50, |
|
|||
69 | ) |
|
|||
70 | configitem('convert', 'git.skipsubmodules', |
|
|||
71 | default=False, |
|
|||
72 | ) |
|
|||
73 | configitem('convert', 'hg.clonebranches', |
|
|||
74 | default=False, |
|
|||
75 | ) |
|
|||
76 | configitem('convert', 'hg.ignoreerrors', |
|
|||
77 | default=False, |
|
|||
78 | ) |
|
|||
79 | configitem('convert', 'hg.revs', |
|
|||
80 | default=None, |
|
|||
81 | ) |
|
|||
82 | configitem('convert', 'hg.saverev', |
|
|||
83 | default=False, |
|
|||
84 | ) |
|
|||
85 | configitem('convert', 'hg.sourcename', |
|
|||
86 | default=None, |
|
|||
87 | ) |
|
|||
88 | configitem('convert', 'hg.startrev', |
|
|||
89 | default=None, |
|
|||
90 | ) |
|
|||
91 | configitem('convert', 'hg.tagsbranch', |
|
|||
92 | default='default', |
|
|||
93 | ) |
|
|||
94 | configitem('convert', 'hg.usebranchnames', |
|
|||
95 | default=True, |
|
|||
96 | ) |
|
|||
97 | configitem('convert', 'ignoreancestorcheck', |
|
|||
98 | default=False, |
|
|||
99 | ) |
|
|||
100 | configitem('convert', 'localtimezone', |
|
|||
101 | default=False, |
|
|||
102 | ) |
|
|||
103 | configitem('convert', 'p4.encoding', |
|
|||
104 | default=lambda: convcmd.orig_encoding, |
|
|||
105 | ) |
|
|||
106 | configitem('convert', 'p4.startrev', |
|
|||
107 | default=0, |
|
|||
108 | ) |
|
|||
109 | configitem('convert', 'skiptags', |
|
|||
110 | default=False, |
|
|||
111 | ) |
|
|||
112 | configitem('convert', 'svn.debugsvnlog', |
|
|||
113 | default=True, |
|
|||
114 | ) |
|
|||
115 | configitem('convert', 'svn.trunk', |
|
|||
116 | default=None, |
|
|||
117 | ) |
|
|||
118 | configitem('convert', 'svn.tags', |
|
|||
119 | default=None, |
|
|||
120 | ) |
|
|||
121 | configitem('convert', 'svn.branches', |
|
|||
122 | default=None, |
|
|||
123 | ) |
|
|||
124 | configitem('convert', 'svn.startrev', |
|
|||
125 | default=0, |
|
|||
126 | ) |
|
|||
127 |
|
||||
128 | # Commands definition was moved elsewhere to ease demandload job. |
|
31 | # Commands definition was moved elsewhere to ease demandload job. | |
129 |
|
32 | |||
130 | @command('convert', |
|
33 | @command('convert', |
@@ -44,6 +44,9 b' def decodefilename(filename):' | |||||
44 |
|
44 | |||
45 | class p4_source(common.converter_source): |
|
45 | class p4_source(common.converter_source): | |
46 | def __init__(self, ui, path, revs=None): |
|
46 | def __init__(self, ui, path, revs=None): | |
|
47 | # avoid import cycle | |||
|
48 | from . import convcmd | |||
|
49 | ||||
47 | super(p4_source, self).__init__(ui, path, revs=revs) |
|
50 | super(p4_source, self).__init__(ui, path, revs=revs) | |
48 |
|
51 | |||
49 | if "/" in path and not path.startswith('//'): |
|
52 | if "/" in path and not path.startswith('//'): | |
@@ -53,7 +56,8 b' class p4_source(common.converter_source)' | |||||
53 | common.checktool('p4', abort=False) |
|
56 | common.checktool('p4', abort=False) | |
54 |
|
57 | |||
55 | self.revmap = {} |
|
58 | self.revmap = {} | |
56 |
self.encoding = self.ui.config('convert', 'p4.encoding' |
|
59 | self.encoding = self.ui.config('convert', 'p4.encoding', | |
|
60 | convcmd.orig_encoding) | |||
57 | self.re_type = re.compile( |
|
61 | self.re_type = re.compile( | |
58 | "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" |
|
62 | "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" | |
59 | "(\+\w+)?$") |
|
63 | "(\+\w+)?$") |
@@ -208,6 +208,99 b" coreconfigitem('committemplate', '.*'," | |||||
208 | default=None, |
|
208 | default=None, | |
209 | generic=True, |
|
209 | generic=True, | |
210 | ) |
|
210 | ) | |
|
211 | coreconfigitem('convert', 'cvsps.cache', | |||
|
212 | default=True, | |||
|
213 | ) | |||
|
214 | coreconfigitem('convert', 'cvsps.fuzz', | |||
|
215 | default=60, | |||
|
216 | ) | |||
|
217 | coreconfigitem('convert', 'cvsps.logencoding', | |||
|
218 | default=None, | |||
|
219 | ) | |||
|
220 | coreconfigitem('convert', 'cvsps.mergefrom', | |||
|
221 | default=None, | |||
|
222 | ) | |||
|
223 | coreconfigitem('convert', 'cvsps.mergeto', | |||
|
224 | default=None, | |||
|
225 | ) | |||
|
226 | coreconfigitem('convert', 'git.committeractions', | |||
|
227 | default=lambda: ['messagedifferent'], | |||
|
228 | ) | |||
|
229 | coreconfigitem('convert', 'git.extrakeys', | |||
|
230 | default=list, | |||
|
231 | ) | |||
|
232 | coreconfigitem('convert', 'git.findcopiesharder', | |||
|
233 | default=False, | |||
|
234 | ) | |||
|
235 | coreconfigitem('convert', 'git.remoteprefix', | |||
|
236 | default='remote', | |||
|
237 | ) | |||
|
238 | coreconfigitem('convert', 'git.renamelimit', | |||
|
239 | default=400, | |||
|
240 | ) | |||
|
241 | coreconfigitem('convert', 'git.saverev', | |||
|
242 | default=True, | |||
|
243 | ) | |||
|
244 | coreconfigitem('convert', 'git.similarity', | |||
|
245 | default=50, | |||
|
246 | ) | |||
|
247 | coreconfigitem('convert', 'git.skipsubmodules', | |||
|
248 | default=False, | |||
|
249 | ) | |||
|
250 | coreconfigitem('convert', 'hg.clonebranches', | |||
|
251 | default=False, | |||
|
252 | ) | |||
|
253 | coreconfigitem('convert', 'hg.ignoreerrors', | |||
|
254 | default=False, | |||
|
255 | ) | |||
|
256 | coreconfigitem('convert', 'hg.revs', | |||
|
257 | default=None, | |||
|
258 | ) | |||
|
259 | coreconfigitem('convert', 'hg.saverev', | |||
|
260 | default=False, | |||
|
261 | ) | |||
|
262 | coreconfigitem('convert', 'hg.sourcename', | |||
|
263 | default=None, | |||
|
264 | ) | |||
|
265 | coreconfigitem('convert', 'hg.startrev', | |||
|
266 | default=None, | |||
|
267 | ) | |||
|
268 | coreconfigitem('convert', 'hg.tagsbranch', | |||
|
269 | default='default', | |||
|
270 | ) | |||
|
271 | coreconfigitem('convert', 'hg.usebranchnames', | |||
|
272 | default=True, | |||
|
273 | ) | |||
|
274 | coreconfigitem('convert', 'ignoreancestorcheck', | |||
|
275 | default=False, | |||
|
276 | ) | |||
|
277 | coreconfigitem('convert', 'localtimezone', | |||
|
278 | default=False, | |||
|
279 | ) | |||
|
280 | coreconfigitem('convert', 'p4.encoding', | |||
|
281 | default=dynamicdefault, | |||
|
282 | ) | |||
|
283 | coreconfigitem('convert', 'p4.startrev', | |||
|
284 | default=0, | |||
|
285 | ) | |||
|
286 | coreconfigitem('convert', 'skiptags', | |||
|
287 | default=False, | |||
|
288 | ) | |||
|
289 | coreconfigitem('convert', 'svn.debugsvnlog', | |||
|
290 | default=True, | |||
|
291 | ) | |||
|
292 | coreconfigitem('convert', 'svn.trunk', | |||
|
293 | default=None, | |||
|
294 | ) | |||
|
295 | coreconfigitem('convert', 'svn.tags', | |||
|
296 | default=None, | |||
|
297 | ) | |||
|
298 | coreconfigitem('convert', 'svn.branches', | |||
|
299 | default=None, | |||
|
300 | ) | |||
|
301 | coreconfigitem('convert', 'svn.startrev', | |||
|
302 | default=0, | |||
|
303 | ) | |||
211 | coreconfigitem('debug', 'dirstate.delaywrite', |
|
304 | coreconfigitem('debug', 'dirstate.delaywrite', | |
212 | default=0, |
|
305 | default=0, | |
213 | ) |
|
306 | ) |
@@ -233,9 +233,10 b' add another largefile to the new largefi' | |||||
233 | $ cd .. |
|
233 | $ cd .. | |
234 |
|
234 | |||
235 | round-trip: converting back to a normal (non-largefiles) repo with |
|
235 | round-trip: converting back to a normal (non-largefiles) repo with | |
236 | "lfconvert --to-normal" should give the same as ../bigfile-repo |
|
236 | "lfconvert --to-normal" should give the same as ../bigfile-repo. The | |
|
237 | convert extension is disabled to show config items can be loaded without it. | |||
237 | $ cd largefiles-repo |
|
238 | $ cd largefiles-repo | |
238 | $ hg lfconvert --to-normal . ../normal-repo |
|
239 | $ hg --config extensions.convert=! lfconvert --to-normal . ../normal-repo | |
239 | initializing destination ../normal-repo |
|
240 | initializing destination ../normal-repo | |
240 | 0 additional largefiles cached |
|
241 | 0 additional largefiles cached | |
241 | scanning source... |
|
242 | scanning source... |
General Comments 0
You need to be logged in to leave comments.
Login now