Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/simplemerge.py @ 33033:c31d45623304

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert kwargs' keys' to str using pycompat.strkwargs() On Python 3, we must have keys of keyword arguments as str.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 22 Jun 2017 03:16:16 +0530
parents 35284f933518
children de573184686e
comparison
equal deleted inserted replaced
33032:4e6dc34b5d7a 33033:c31d45623304
22 22
23 from .i18n import _ 23 from .i18n import _
24 from . import ( 24 from . import (
25 error, 25 error,
26 mdiff, 26 mdiff,
27 pycompat,
27 util, 28 util,
28 vfs as vfsmod, 29 vfs as vfsmod,
29 ) 30 )
30 31
31 class CantReprocessAndShowBase(Exception): 32 class CantReprocessAndShowBase(Exception):
453 extrakwargs['end_marker'] = None 454 extrakwargs['end_marker'] = None
454 elif name_base is not None: 455 elif name_base is not None:
455 extrakwargs['base_marker'] = '|||||||' 456 extrakwargs['base_marker'] = '|||||||'
456 extrakwargs['name_base'] = name_base 457 extrakwargs['name_base'] = name_base
457 extrakwargs['minimize'] = False 458 extrakwargs['minimize'] = False
458 for line in m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs): 459 for line in m3.merge_lines(name_a=name_a, name_b=name_b,
460 **pycompat.strkwargs(extrakwargs)):
459 out.write(line) 461 out.write(line)
460 462
461 if not opts.get('print'): 463 if not opts.get('print'):
462 out.close() 464 out.close()
463 465