comparison hgext/largefiles/overrides.py @ 48168:df3021c1f093

largefiles: pass current transaction to `lfdirstate.write()`

Right now, the largefile dirstate is not included in transaction which makes
things complex. Next patch will add code to do so, so let's make it mandatory to
pass current transaction and pass from all existing callers.

Differential Revision: https://phab.mercurial-scm.org/D11610

48167:1b0f8aafedea

                    hash=b'',
                    executable=lfutil.getexecutable(repo.wjoin(f)),
                )
                standins.append(standinname)
                lfdirstate.set_tracked(f)
            lfdirstate.write()
            bad += [
                lfutil.splitstandin(f)
                for f in repo[None].add(standins)
                if f in m.files()
            ]

        repo[None].forget(remove)

        for f in remove:
            lfdirstate.set_untracked(lfutil.splitstandin(f))

        lfdirstate.write()

    return result


# For overriding mercurial.hgweb.webcommands so that largefiles will

                repo.dirstate.update_file(
                    lfile, p1_tracked=True, wc_tracked=False
                )
                # make sure lfile doesn't get synclfdirstate'd as normal
                lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True)
        lfdirstate.write()

    return orig(repo, actions, branchmerge, getfiledata)


# Override filemerge to prompt the user about how they wish to merge

                    lfdirstate.set_untracked(srclfile)
                else:
                    util.copyfile(repo.wjoin(srclfile), repo.wjoin(destlfile))

                lfdirstate.set_tracked(destlfile)
        lfdirstate.write()
    except error.Abort as e:
        if e.message != _(b'no files to copy'):
            raise e
        else:
            nolfiles = True

    # and then return them to a correct state we need to lock to
    # prevent others from changing them in their incorrect state.
    with repo.wlock():
        lfdirstate = lfutil.openlfdirstate(ui, repo)
        s = lfutil.lfdirstatestatus(lfdirstate, repo)
        lfdirstate.write()
        for lfile in s.modified:
            lfutil.updatestandin(repo, lfile, lfutil.standin(lfile))
        for lfile in s.deleted:
            fstandin = lfutil.standin(lfile)
            if repo.wvfs.exists(fstandin):

    # repository and we could race in-between.
    with repo.wlock():
        lfdirstate = lfutil.openlfdirstate(ui, repo)
        for f in forget:
            lfdirstate.set_untracked(f)
        lfdirstate.write()
        standins = [lfutil.standin(f) for f in forget]
        for f in standins:
            repo.wvfs.unlinkpath(f, ignoremissing=True)
        rejected = repo[None].forget(standins)

            lfutil.updatestandin(repo, lfile, fstandin)
        # mark all clean largefiles as dirty, just in case the update gets
        # interrupted before largefiles and lfdirstate are synchronized
        for lfile in oldclean:
            lfdirstate.set_possibly_dirty(lfile)
        lfdirstate.write()

        oldstandins = lfutil.getstandinsstate(repo)
        wc = kwargs.get('wc')
        if wc and wc.isinmemory():
            # largefiles is not a good candidate for in-memory merge (large

            # to avoid leaving all largefiles as dirty and thus rehash them, mark
            # all the ones that didn't change as clean
            for lfile in oldclean.difference(filelist):
                lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
            lfdirstate.write()

            if branchmerge or force or partial:
                filelist.extend(s.deleted + s.removed)

            lfcommands.updatelfiles(

48168:df3021c1f093

                    hash=b'',
                    executable=lfutil.getexecutable(repo.wjoin(f)),
                )
                standins.append(standinname)
                lfdirstate.set_tracked(f)
            lfdirstate.write(repo.currenttransaction())
            bad += [
                lfutil.splitstandin(f)
                for f in repo[None].add(standins)
                if f in m.files()
            ]

        repo[None].forget(remove)

        for f in remove:
            lfdirstate.set_untracked(lfutil.splitstandin(f))

        lfdirstate.write(repo.currenttransaction())

    return result


# For overriding mercurial.hgweb.webcommands so that largefiles will

                repo.dirstate.update_file(
                    lfile, p1_tracked=True, wc_tracked=False
                )
                # make sure lfile doesn't get synclfdirstate'd as normal
                lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True)
        lfdirstate.write(repo.currenttransaction())

    return orig(repo, actions, branchmerge, getfiledata)


# Override filemerge to prompt the user about how they wish to merge

                    lfdirstate.set_untracked(srclfile)
                else:
                    util.copyfile(repo.wjoin(srclfile), repo.wjoin(destlfile))

                lfdirstate.set_tracked(destlfile)
        lfdirstate.write(repo.currenttransaction())
    except error.Abort as e:
        if e.message != _(b'no files to copy'):
            raise e
        else:
            nolfiles = True

    # and then return them to a correct state we need to lock to
    # prevent others from changing them in their incorrect state.
    with repo.wlock():
        lfdirstate = lfutil.openlfdirstate(ui, repo)
        s = lfutil.lfdirstatestatus(lfdirstate, repo)
        lfdirstate.write(repo.currenttransaction())
        for lfile in s.modified:
            lfutil.updatestandin(repo, lfile, lfutil.standin(lfile))
        for lfile in s.deleted:
            fstandin = lfutil.standin(lfile)
            if repo.wvfs.exists(fstandin):

    # repository and we could race in-between.
    with repo.wlock():
        lfdirstate = lfutil.openlfdirstate(ui, repo)
        for f in forget:
            lfdirstate.set_untracked(f)
        lfdirstate.write(repo.currenttransaction())
        standins = [lfutil.standin(f) for f in forget]
        for f in standins:
            repo.wvfs.unlinkpath(f, ignoremissing=True)
        rejected = repo[None].forget(standins)

            lfutil.updatestandin(repo, lfile, fstandin)
        # mark all clean largefiles as dirty, just in case the update gets
        # interrupted before largefiles and lfdirstate are synchronized
        for lfile in oldclean:
            lfdirstate.set_possibly_dirty(lfile)
        lfdirstate.write(repo.currenttransaction())

        oldstandins = lfutil.getstandinsstate(repo)
        wc = kwargs.get('wc')
        if wc and wc.isinmemory():
            # largefiles is not a good candidate for in-memory merge (large

            # to avoid leaving all largefiles as dirty and thus rehash them, mark
            # all the ones that didn't change as clean
            for lfile in oldclean.difference(filelist):
                lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
            lfdirstate.write(repo.currenttransaction())

            if branchmerge or force or partial:
                filelist.extend(s.deleted + s.removed)

            lfcommands.updatelfiles(