comparison mercurial/commit.py @ 45323:aea6a812f7cb

commitctx: return a richer object from _prepare_files

Instead of returning a lot of different list, we introduce a rich object that
hold all the file related information. The unique object help with data
consistency and simply functions arguments and return.

In the rest of this series we will increase usage of this object to simplify
more code.

45322:c3376a724e32

    p1, p2 = ctx.p1(), ctx.p2()
    user = ctx.user()

    with repo.lock(), repo.transaction(b"commit") as tr:
        r = _prepare_files(tr, ctx, error=error, origctx=origctx)
        mn, files, p1copies, p2copies, filesadded, filesremoved = r

        extra = ctx.extra().copy()

        files = sorted(files)
        if extra is not None:
            for name in (
                b'p1copies',
                b'p2copies',
                b'filesadded',
                b'filesremoved',
            ):
                extra.pop(name, None)
        if repo.changelog._copiesstorage == b'extra':
            extra = _extra_with_copies(
                repo, extra, files, p1copies, p2copies, filesadded, filesremoved
            )

        # update changelog
        repo.ui.note(_(b"committing changelog\n"))
        repo.changelog.delayupdate(tr)
        n = repo.changelog.add(
            mn,
            files,
            ctx.description(),
            tr,
            p1.node(),
            p2.node(),
            user,
            ctx.date(),
            extra,
            p1copies,
            p2copies,
            filesadded,
            filesremoved,
        )
        xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
        repo.hook(
            b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2,
        )

            filesadded = added

    if origctx and origctx.manifestnode() == mn:
        touched = origctx.files()

    return mn, touched, p1copies, p2copies, filesadded, filesremoved


def _process_files(tr, ctx, error=False):
    repo = ctx.repo()
    p1 = ctx.p1()

        mn = p1.manifestnode()

    return mn


def _extra_with_copies(
    repo, extra, files, p1copies, p2copies, filesadded, filesremoved
):
    """encode copy information into a `extra` dictionnary"""
    if not _write_copy_meta(repo)[1]:
        # If writing only to changeset extras, use None to indicate that
        # no entry should be written. If writing to both, write an empty
        # entry to prevent the reader from falling back to reading
        # filelogs.

45323:aea6a812f7cb

    p1, p2 = ctx.p1(), ctx.p2()
    user = ctx.user()

    with repo.lock(), repo.transaction(b"commit") as tr:
        mn, files = _prepare_files(tr, ctx, error=error, origctx=origctx)

        extra = ctx.extra().copy()

        if extra is not None:
            for name in (
                b'p1copies',
                b'p2copies',
                b'filesadded',
                b'filesremoved',
            ):
                extra.pop(name, None)
        if repo.changelog._copiesstorage == b'extra':
            extra = _extra_with_copies(repo, extra, files)

        # update changelog
        repo.ui.note(_(b"committing changelog\n"))
        repo.changelog.delayupdate(tr)
        n = repo.changelog.add(
            mn,
            files.touched,
            ctx.description(),
            tr,
            p1.node(),
            p2.node(),
            user,
            ctx.date(),
            extra,
            files.copied_from_p1,
            files.copied_from_p2,
            files.added,
            files.removed,
        )
        xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
        repo.hook(
            b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2,
        )

            filesadded = added

    if origctx and origctx.manifestnode() == mn:
        touched = origctx.files()

    files = metadata.ChangingFiles()
    if touched:
        files.update_touched(touched)
    if p1copies:
        files.update_copies_from_p1(p1copies)
    if p2copies:
        files.update_copies_from_p2(p2copies)
    if filesadded:
        files.update_added(filesadded)
    if filesremoved:
        files.update_removed(filesremoved)

    return mn, files


def _process_files(tr, ctx, error=False):
    repo = ctx.repo()
    p1 = ctx.p1()

        mn = p1.manifestnode()

    return mn


def _extra_with_copies(repo, extra, files):
    """encode copy information into a `extra` dictionnary"""
    p1copies = files.copied_from_p1
    p2copies = files.copied_from_p2
    filesadded = files.added
    filesremoved = files.removed
    files = sorted(files.touched)
    if not _write_copy_meta(repo)[1]:
        # If writing only to changeset extras, use None to indicate that
        # no entry should be written. If writing to both, write an empty
        # entry to prevent the reader from falling back to reading
        # filelogs.