comparison hgext/phabricator.py @ 44426:66a05dbb8b4c

phabricator: don't infer the old `fctx` in `notutf8()`

This is used along with `fctx.isbinary()` to gate `addoldbinary()`, so it seems
like a good idea to provide the caller similar control over the current and
parent filecontext.  Unlike `addoldbinary()`, it doesn't need both previous and
current contexts at the same time, so make the caller responsible for testing
both cases, as appropriate.  I haven't worked out all of the problems around
marking files as binary for move/remove/copy, but this will definitely help with
`--no-stack` too.

It also turns out to have been doing too much- in the remove case, it tested not
just the removed file in the parent context (which is what gets passed in that
case), but also in the parent of the parent context (which should be
irrelevant).  The previous code also required the `fctx.parents()` check to work
in the add (but without rename) case.  Now the add and remove cases test only
what they need to.  But now that it is written this way, the fact that only the
current `fctx` is checked to be binary in the case of modification or being
renamed seems wrong.

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

44425:aa9979bb6853

    """detect non-UTF-8 text files since Phabricator requires them to be marked
    as binary
    """
    try:
        fctx.data().decode('utf-8')
        if fctx.parents():
            fctx.p1().data().decode('utf-8')
        return False
    except UnicodeDecodeError:
        fctx.repo().ui.write(
            _(b'file %s detected as non-UTF-8, marked as binary\n')
            % fctx.path()

def addmodified(pdiff, ctx, modified):
    """add modified files to the phabdiff"""
    for fname in modified:
        fctx = ctx[fname]
        pchange = phabchange(currentPath=fname, oldPath=fname)
        filemode = gitmode[ctx[fname].flags()]
        originalmode = gitmode[ctx.p1()[fname].flags()]
        if filemode != originalmode:
            pchange.addoldmode(originalmode)
            pchange.addnewmode(filemode)

        if fctx.isbinary() or notutf8(fctx):
            makebinary(pchange, fctx)
            addoldbinary(pchange, fctx.p1(), fctx)
        else:
            maketext(pchange, ctx, fname)

    # additional copies we can mark them (moves get removed from removed)
    copiedchanges = {}
    movedchanges = {}
    for fname in added:
        fctx = ctx[fname]
        pchange = phabchange(currentPath=fname)

        filemode = gitmode[ctx[fname].flags()]
        renamed = fctx.renamed()

        if renamed:
            originalfname = renamed[0]
            originalmode = gitmode[ctx.p1()[originalfname].flags()]
            pchange.oldPath = originalfname

            if originalfname in removed:
                origpchange = phabchange(
                    currentPath=originalfname,

                pchange.addnewmode(filemode)
        else:  # Brand-new file
            pchange.addnewmode(gitmode[fctx.flags()])
            pchange.type = DiffChangeType.ADD

        if fctx.isbinary() or notutf8(fctx):
            makebinary(pchange, fctx)
            if renamed:
                addoldbinary(pchange, fctx.p1(), fctx)
        else:
            maketext(pchange, ctx, fname)

        pdiff.addchange(pchange)

44426:66a05dbb8b4c

    """detect non-UTF-8 text files since Phabricator requires them to be marked
    as binary
    """
    try:
        fctx.data().decode('utf-8')
        return False
    except UnicodeDecodeError:
        fctx.repo().ui.write(
            _(b'file %s detected as non-UTF-8, marked as binary\n')
            % fctx.path()

def addmodified(pdiff, ctx, modified):
    """add modified files to the phabdiff"""
    for fname in modified:
        fctx = ctx[fname]
        oldfctx = fctx.p1()
        pchange = phabchange(currentPath=fname, oldPath=fname)
        filemode = gitmode[ctx[fname].flags()]
        originalmode = gitmode[ctx.p1()[fname].flags()]
        if filemode != originalmode:
            pchange.addoldmode(originalmode)
            pchange.addnewmode(filemode)

        if fctx.isbinary() or notutf8(fctx) or notutf8(oldfctx):
            makebinary(pchange, fctx)
            addoldbinary(pchange, fctx.p1(), fctx)
        else:
            maketext(pchange, ctx, fname)

    # additional copies we can mark them (moves get removed from removed)
    copiedchanges = {}
    movedchanges = {}
    for fname in added:
        fctx = ctx[fname]
        oldfctx = None
        pchange = phabchange(currentPath=fname)

        filemode = gitmode[ctx[fname].flags()]
        renamed = fctx.renamed()

        if renamed:
            originalfname = renamed[0]
            oldfctx = ctx.p1()[originalfname]
            originalmode = gitmode[oldfctx.flags()]
            pchange.oldPath = originalfname

            if originalfname in removed:
                origpchange = phabchange(
                    currentPath=originalfname,

                pchange.addnewmode(filemode)
        else:  # Brand-new file
            pchange.addnewmode(gitmode[fctx.flags()])
            pchange.type = DiffChangeType.ADD

        if fctx.isbinary() or notutf8(fctx) or (oldfctx and notutf8(oldfctx)):
            makebinary(pchange, fctx)
            if renamed:
                addoldbinary(pchange, oldfctx, fctx)
        else:
            maketext(pchange, ctx, fname)

        pdiff.addchange(pchange)