view tests/failfilemerge.py @ 47348:a4de570e61fa

dirstate-v2: Allow tree nodes without an entry to store a timestamp

Timestamps are stored on 96 bits:

* 64 bits for the signed number of seconds since the Unix epoch
* 32 bits for the nanoseconds in the `0 <= ns < 1_000_000_000` range

For now timestamps are not used or set yet.

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

# 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(b"^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


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