Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 35163:ee64e677c3cf
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 30 Nov 2017 15:48:42 -0500 |
parents | 8b1c887d52e7 281214150561 |
children | 66ecde8a704d |
comparison
equal
deleted
inserted
replaced
35162:bdd2e18b54c5 | 35163:ee64e677c3cf |
---|---|
206 ) | 206 ) |
207 coreconfigitem('committemplate', '.*', | 207 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 ) |
214 coreconfigitem('defaults', '.*', | 307 coreconfigitem('defaults', '.*', |
215 default=None, | 308 default=None, |