Mercurial > hg
comparison mercurial/filemerge.py @ 38159:dea3903175ee
filemerge: don't pass function name as loadpath's module_name param
author | hindlemail <tom_hindle@sil.org> |
---|---|
date | Thu, 24 May 2018 15:56:47 -0600 |
parents | 242eb5132203 |
children | aac4be30e250 |
comparison
equal
deleted
inserted
replaced
38158:4e790f0966fc | 38159:dea3903175ee |
---|---|
572 (toolpath, scriptfn)) | 572 (toolpath, scriptfn)) |
573 r = 0 | 573 r = 0 |
574 try: | 574 try: |
575 # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil | 575 # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil |
576 from . import extensions | 576 from . import extensions |
577 mod = extensions.loadpath(toolpath, 'hgmerge.%s' % scriptfn) | 577 mod = extensions.loadpath(toolpath, 'hgmerge.%s' % tool) |
578 except Exception: | 578 except Exception: |
579 raise error.Abort(_("loading python merge script failed: %s") % | 579 raise error.Abort(_("loading python merge script failed: %s") % |
580 toolpath) | 580 toolpath) |
581 mergefn = getattr(mod, scriptfn, None) | 581 mergefn = getattr(mod, scriptfn, None) |
582 if mergefn is None: | 582 if mergefn is None: |