comparison mercurial/commit.py @ 45251:0041a42c6f28

commitctx: gather more code dealing with copy-in-extra

Now that we have a function that deal with the copy-in-extra special case, we
can gather more code meant to deal with this special case. Making the rest of
the code simpler.

45250:efe8a67793b6

            filesremoved = removed
            filesadded = added

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

    if not writefilecopymeta:
        # 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.
        p1copies = p1copies or None
        p2copies = p2copies or None
        filesadded = filesadded or None
        filesremoved = filesremoved or None

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


def _process_files(tr, ctx, error=False):

def _extra_with_copies(
    repo, extra, files, p1copies, p2copies, filesadded, filesremoved
):
    """encode copy information into a `extra` dictionnary"""
    extrasentries = p1copies, p2copies, filesadded, filesremoved
    if extra is None and any(x is not None for x in extrasentries):
        extra = {}
    if p1copies is not None:
        p1copies = metadata.encodecopies(files, p1copies)

45251:0041a42c6f28

            filesremoved = removed
            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):

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.
        p1copies = p1copies or None
        p2copies = p2copies or None
        filesadded = filesadded or None
        filesremoved = filesremoved or None

    extrasentries = p1copies, p2copies, filesadded, filesremoved
    if extra is None and any(x is not None for x in extrasentries):
        extra = {}
    if p1copies is not None:
        p1copies = metadata.encodecopies(files, p1copies)