513 actions[standin] = ('r', None, 'replaced by non-standin') |
513 actions[standin] = ('r', None, 'replaced by non-standin') |
514 |
514 |
515 return actions, diverge, renamedelete |
515 return actions, diverge, renamedelete |
516 |
516 |
517 @eh.wrapfunction(merge, 'recordupdates') |
517 @eh.wrapfunction(merge, 'recordupdates') |
518 def mergerecordupdates(orig, repo, actions, branchmerge): |
518 def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): |
519 if 'lfmr' in actions: |
519 if 'lfmr' in actions: |
520 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
520 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
521 for lfile, args, msg in actions['lfmr']: |
521 for lfile, args, msg in actions['lfmr']: |
522 # this should be executed before 'orig', to execute 'remove' |
522 # this should be executed before 'orig', to execute 'remove' |
523 # before all other actions |
523 # before all other actions |
524 repo.dirstate.remove(lfile) |
524 repo.dirstate.remove(lfile) |
525 # make sure lfile doesn't get synclfdirstate'd as normal |
525 # make sure lfile doesn't get synclfdirstate'd as normal |
526 lfdirstate.add(lfile) |
526 lfdirstate.add(lfile) |
527 lfdirstate.write() |
527 lfdirstate.write() |
528 |
528 |
529 return orig(repo, actions, branchmerge) |
529 return orig(repo, actions, branchmerge, getfiledata) |
530 |
530 |
531 # Override filemerge to prompt the user about how they wish to merge |
531 # Override filemerge to prompt the user about how they wish to merge |
532 # largefiles. This will handle identical edits without prompting the user. |
532 # largefiles. This will handle identical edits without prompting the user. |
533 @eh.wrapfunction(filemerge, '_filemerge') |
533 @eh.wrapfunction(filemerge, '_filemerge') |
534 def overridefilemerge(origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, |
534 def overridefilemerge(origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, |