Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/simplemerge.py @ 48588:6ad70879d2bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: move default labels to simplemerge extension I want to remove knowledge of paths from the `simplemerge` core module. As part of that, let's move the default labels from the core module to the extension. Differential Revision: https://phab.mercurial-scm.org/D11977
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Jan 2022 23:29:19 -0800
parents b5e1283c0475
children 69e76b2aad3d
comparison
equal deleted inserted replaced
48587:b5e1283c0475 48588:6ad70879d2bd
330 if not opts.get('text'): 330 if not opts.get('text'):
331 raise error.Abort(msg) 331 raise error.Abort(msg)
332 return text 332 return text
333 333
334 334
335 def _picklabels(defaults, overrides): 335 def _picklabels(overrides):
336 if len(overrides) > 3: 336 if len(overrides) > 3:
337 raise error.Abort(_(b"can only specify three labels.")) 337 raise error.Abort(_(b"can only specify three labels."))
338 result = defaults[:] 338 result = [None, None, None]
339 for i, override in enumerate(overrides): 339 for i, override in enumerate(overrides):
340 result[i] = override 340 result[i] = override
341 return result 341 return result
342 342
343 343
499 elif mode == b'local': 499 elif mode == b'local':
500 lines = _resolve(m3, (1,)) 500 lines = _resolve(m3, (1,))
501 elif mode == b'other': 501 elif mode == b'other':
502 lines = _resolve(m3, (2,)) 502 lines = _resolve(m3, (2,))
503 else: 503 else:
504 name_a, name_b, name_base = _picklabels( 504 name_a, name_b, name_base = _picklabels(opts.get('label', []))
505 [localctx.path(), otherctx.path(), None], opts.get('label', [])
506 )
507 if mode == b'mergediff': 505 if mode == b'mergediff':
508 lines, conflicts = render_mergediff(m3, name_a, name_b, name_base) 506 lines, conflicts = render_mergediff(m3, name_a, name_b, name_base)
509 else: 507 else:
510 extrakwargs = { 508 extrakwargs = {
511 'minimize': True, 509 'minimize': True,