equal
deleted
inserted
replaced
658 |
658 |
659 @eh.wrapfunction(mergestatemod, b'recordupdates') |
659 @eh.wrapfunction(mergestatemod, b'recordupdates') |
660 def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): |
660 def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): |
661 if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions: |
661 if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions: |
662 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
662 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
663 with lfdirstate.parentchange(): |
663 with lfdirstate.parentchange(repo): |
664 for lfile, args, msg in actions[ |
664 for lfile, args, msg in actions[ |
665 MERGE_ACTION_LARGEFILE_MARK_REMOVED |
665 MERGE_ACTION_LARGEFILE_MARK_REMOVED |
666 ]: |
666 ]: |
667 # this should be executed before 'orig', to execute 'remove' |
667 # this should be executed before 'orig', to execute 'remove' |
668 # before all other actions |
668 # before all other actions |
1798 # largefiles is not a good candidate for in-memory merge (large |
1798 # largefiles is not a good candidate for in-memory merge (large |
1799 # files, custom dirstate, matcher usage). |
1799 # files, custom dirstate, matcher usage). |
1800 raise error.ProgrammingError( |
1800 raise error.ProgrammingError( |
1801 b'largefiles is not compatible with in-memory merge' |
1801 b'largefiles is not compatible with in-memory merge' |
1802 ) |
1802 ) |
1803 with lfdirstate.parentchange(): |
1803 with lfdirstate.parentchange(repo): |
1804 result = orig(repo, node, branchmerge, force, *args, **kwargs) |
1804 result = orig(repo, node, branchmerge, force, *args, **kwargs) |
1805 |
1805 |
1806 newstandins = lfutil.getstandinsstate(repo) |
1806 newstandins = lfutil.getstandinsstate(repo) |
1807 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
1807 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
1808 |
1808 |