Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 45942:89a2afe31e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
formating: upgrade to black 20.8b1 This required a couple of small tweaks to un-confuse black, but now it works. Big formatting changes come from: * Dramatically improved collection-splitting logic upstream * Black having a strong (correct IMO) opinion that """ is better than ''' Differential Revision: https://phab.mercurial-scm.org/D9430
author Augie Fackler <raf@durin42.com>
date Fri, 27 Nov 2020 17:03:29 -0500
parents 5effb1992c17
children bdc2bf68f19e
comparison
equal deleted inserted replaced
45941:346af7687c6f 45942:89a2afe31e82
1230 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels 1230 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
1231 ) 1231 )
1232 1232
1233 1233
1234 def loadinternalmerge(ui, extname, registrarobj): 1234 def loadinternalmerge(ui, extname, registrarobj):
1235 """Load internal merge tool from specified registrarobj 1235 """Load internal merge tool from specified registrarobj"""
1236 """
1237 for name, func in pycompat.iteritems(registrarobj._table): 1236 for name, func in pycompat.iteritems(registrarobj._table):
1238 fullname = b':' + name 1237 fullname = b':' + name
1239 internals[fullname] = func 1238 internals[fullname] = func
1240 internals[b'internal:' + name] = func 1239 internals[b'internal:' + name] = func
1241 internalsdoc[fullname] = func 1240 internalsdoc[fullname] = func