comparison hgext/largefiles/lfutil.py @ 23187:f726b05ecfe6

largefiles: update standins only at the 1st commit of "hg rebase --continue"

Before this patch, "hg rebase --continue" may record incorrect
standins, because largefiles extension always avoid updating standins
while rebasing, even though largefiles in the working directory may be
modified manually at the 1st commit of "hg rebase --continue".

But, on the other hand, updating standins should be avoided at
subsequent commits for efficiency reason.

To update standins only at the 1st commit of "hg rebase --continue",
this patch introduces state-full callable object
"automatedcommithook", which updates standins by
"lfutil.updatestandinsbymatch()" only at the 1st commit of resuming.

Even after this patch, "repo._isrebasing = True" is still needed to
avoid some status report while updating largefiles in
"lfcommands.updatelfiles()".

This is reason why this patch omits not "repo._isrebasing = True" in
"overriderebase" but examination of "getattr(repo, "_isrebasing",
False)" in "updatestandinsbymatch".

23186:6de61d0b773f

    # (1) updating standins, because standins should
    #     be already updated at this point
    # (2) aborting when standins are matched by "match",
    #     because automated committing may specify them directly
    #
    if getattr(repo, "_isrebasing", False) or \
            getattr(repo, "_istransplanting", False):
        return match

    # Case 1: user calls commit with no specific files or
    # include/exclude patterns: refresh and commit all files that
    # are "dirty".

            return f in standins

    match.matchfn = matchfn

    return match

23187:f726b05ecfe6

    # (1) updating standins, because standins should
    #     be already updated at this point
    # (2) aborting when standins are matched by "match",
    #     because automated committing may specify them directly
    #
    if getattr(repo, "_istransplanting", False):
        return match

    # Case 1: user calls commit with no specific files or
    # include/exclude patterns: refresh and commit all files that
    # are "dirty".

            return f in standins

    match.matchfn = matchfn

    return match

class automatedcommithook(object):
    '''Statefull hook to update standins at the 1st commit of resuming

    For efficiency, updating standins in the working directory should
    be avoided while automated committing (like rebase, transplant and
    so on), because they should be updated before committing.

    But the 1st commit of resuming automated committing (e.g. ``rebase
    --continue``) should update them, because largefiles may be
    modified manually.
    '''
    def __init__(self, resuming):
        self.resuming = resuming

    def __call__(self, repo, match):
        if self.resuming:
            self.resuming = False # avoids updating at subsequent commits
            return updatestandinsbymatch(repo, match)
        else:
            return match