view tests/failfilemerge.py @ 36689:b394778b1a50 stable

test-subrepo: glob away an unstable hash

This is the instability mentioned at the beginning of the series.  I don't like
hiding it, but I don't want to sit on a fix for a user reported problem while
trying to figure this out.

The instability seems related to the cset with a .hgsub with a remote URL.
(There's very little existing remote URL subrepo testing.)

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, wctx, mynode, orig, fcd, fco, fca,
                  labels=None):
    raise error.Abort("^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

def extsetup(ui):
    extensions.wrapfunction(filemerge, '_filemerge',
                            failfilemerge)