annotate tests/failfilemerge.py @ 39483:1fc39367eafd

httppeer: calculate total expected bytes correctly

User-facing error messages that handled httplib.IncompleteRead errors in
Mercurial used to look like this:

  abort: HTTP request error (incomplete response; expected 3 bytes got 1)

But the errors that are being handled underneath the UI look like this:

  IncompleteRead(1 bytes read, 3 more expected)

I.e. the error actually counts total number of expected bytes minus bytes
already received.

Before, users could see weird messages like "expected 10 bytes got 10", while
in reality httplib expected 10 _more_ bytes (20 in total).

# 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)