equal
deleted
inserted
replaced
1025 # shouldn't delete. |
1025 # shouldn't delete. |
1026 if d and uselocalpath: |
1026 if d and uselocalpath: |
1027 util.unlink(d) |
1027 util.unlink(d) |
1028 |
1028 |
1029 |
1029 |
1030 def _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
1030 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
1031 """perform a 3-way merge in the working directory |
1031 """perform a 3-way merge in the working directory |
1032 |
1032 |
1033 premerge = whether this is a premerge |
1033 premerge = whether this is a premerge |
1034 mynode = parent node before merge |
1034 mynode = parent node before merge |
1035 orig = original local filename before merge |
1035 orig = original local filename before merge |
1275 |
1275 |
1276 def _workingpath(repo, ctx): |
1276 def _workingpath(repo, ctx): |
1277 return repo.wjoin(ctx.path()) |
1277 return repo.wjoin(ctx.path()) |
1278 |
1278 |
1279 |
1279 |
1280 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
|
1281 return _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels) |
|
1282 |
|
1283 |
|
1284 def loadinternalmerge(ui, extname, registrarobj): |
1280 def loadinternalmerge(ui, extname, registrarobj): |
1285 """Load internal merge tool from specified registrarobj""" |
1281 """Load internal merge tool from specified registrarobj""" |
1286 for name, func in pycompat.iteritems(registrarobj._table): |
1282 for name, func in pycompat.iteritems(registrarobj._table): |
1287 fullname = b':' + name |
1283 fullname = b':' + name |
1288 internals[fullname] = func |
1284 internals[fullname] = func |