684 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
684 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
685 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist) |
685 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist) |
686 return result |
686 return result |
687 |
687 |
688 def hgmerge(orig, repo, node, force=None, remind=True): |
688 def hgmerge(orig, repo, node, force=None, remind=True): |
689 # Mark the repo as being in the middle of a merge, so that |
689 result = orig(repo, node, force, remind) |
690 # updatelfiles() will know that it needs to trust the standins in |
690 lfcommands.updatelfiles(repo.ui, repo) |
691 # the working copy, not in the standins in the current node |
|
692 repo._ismerging = True |
|
693 try: |
|
694 result = orig(repo, node, force, remind) |
|
695 lfcommands.updatelfiles(repo.ui, repo) |
|
696 finally: |
|
697 repo._ismerging = False |
|
698 return result |
691 return result |
699 |
692 |
700 # When we rebase a repository with remotely changed largefiles, we need to |
693 # When we rebase a repository with remotely changed largefiles, we need to |
701 # take some extra care so that the largefiles are correctly updated in the |
694 # take some extra care so that the largefiles are correctly updated in the |
702 # working copy |
695 # working copy |
749 numcached += len(cached) |
742 numcached += len(cached) |
750 ui.status(_("%d largefiles cached\n") % numcached) |
743 ui.status(_("%d largefiles cached\n") % numcached) |
751 if opts.get('all_largefiles'): |
744 if opts.get('all_largefiles'): |
752 revspostpull = len(repo) |
745 revspostpull = len(repo) |
753 revs = [] |
746 revs = [] |
754 for rev in xrange(revsprepull + 1, revspostpull): |
747 for rev in xrange(revsprepull, revspostpull): |
755 revs.append(repo[rev].rev()) |
748 revs.append(repo[rev].rev()) |
756 lfcommands.downloadlfiles(ui, repo, revs) |
749 lfcommands.downloadlfiles(ui, repo, revs) |
757 return result |
750 return result |
758 |
751 |
759 def overrideclone(orig, ui, source, dest=None, **opts): |
752 def overrideclone(orig, ui, source, dest=None, **opts): |