This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2620

wireproto: define and implement unified framing protocol for SSH
AbandonedPublic

Authored by indygreg on Mar 3 2018, 6:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

THIS COMMIT IS INCOMPLETE AND TESTS STILL FAIL. DO NOT COMMIT.

(This is probably one of the largest patches you'll ever see me write.
Sorry about that: it is difficult to implement all of this
functionality across multiple commits.)

The existing HTTP and SSH wire protocols suffer from a host of flaws
and shortcomings. I've been wanting to rewrite the protocol for a while
now. Supporting partial clone - which will require new wire protocol
commands and capabilities - and other advanced server functionality
will be much easier if we start from a clean slate and don't have
to be constrained by limitations of the existing wire protocol.

This commit introduces a rewrite of the wire protocol. The current
implementation is very, very, very far from what I want the final
implementation to look like. It hasn't begun to tackle things like
compression, multi part responses, various side-channels, etc.

Anyway, the goal of this initial commit is to create a clean break
from the existing SSH wire protocol so we have *something* better.
And that *something* will gradually evolve over several backwards
incompatible changes.

As the updated internals documentation states, the new protocol
attempts to be transport agnostic: all that's required to run the
protocol is a pair of unidirectional, half-duplex pipes. While
we have only implemented the protocol for SSH, we eventually want
to "tunnel" this protocol over HTTP. (For HTTP I anticipate
supporting both exchanging this protocol format via HTTP message
bodies as well as leveraging the Upgrade header to switch from HTTP
to the new frame-based protocol - thus effectively making HTTP
connections behave identically to SSH. But this is for a future
commit.) One of the differences with this protocol for SSH is
it doesn't use stderr. This is by design: by limiting ourselves
to only a pair of pipes, we make it possible to speak this protocol
across any transport channel that supports ordered message delivery,
including HTTP.

The new protocol is built on top of "frames." A frame is an atomic
unit (kind of like a TCP packet). It has a header and data payload.
The header is currently extremely simple and will evolve significantly
over time. The header records the size of the payload, the frame
type, and per-type bit flags to denote frame behavior.

The defined frame types are based on features of the existing
wire protocol. You have frames to communicate a request to run a
command: a command frame, argument frame, and command data frame.
There are also frames to represent the response to that request:
a raw data frame, an error frame, and frames for sending server
output. I anticipate that the frame types will evolve heavily over
time. It is difficult to do anything too radical at this stage because
we need to concurrently support both the old and new protocols and
the client and server APIs still need to evolve a ways before we
can do crazier things.

Because the new protocol aims to be transport agnostic, we have
generic implementations for the peer and server. The SSH peer and
server are very thin wrappers around the generic implementation.

The server is implemented as a state machine of sorts. It basically
sits around, waiting to receive a frame. Once it has received a
request to run a command, it dispatches to the wire command handler
and then sends a response. It is a very traditional half-duplex
request-response protocol, not unlike HTTP/1.1. I anticipate
evolving the protocol to support full-duplex operations. But that's
way too complicated for the initial implementation.

The new protocol is fully functional over SSH. Support for speaking
this protocol over HTTP will be added later.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Mar 3 2018, 6:38 PM
indygreg abandoned this revision.Mar 13 2018, 6:25 PM

I'll break this up and send it as multiple commits.

Revision Contents
Changeset List

Diff 6508

mercurial/debugcommands.py

sslutil, sslutil,
streamclone, streamclone,
templater, templater,
treediscovery, treediscovery,
upgrade, upgrade,
url as urlmod, url as urlmod,
util, util,
vfs as vfsmod, vfs as vfsmod,
wireprotoframing,
wireprotoserver, wireprotoserver,
) )
from .utils import dateutil from .utils import dateutil
release = lockmod.release release = lockmod.release
command = registrar.command() command = registrar.command()
If the connection to the server encompasses multiple pipes, we poll both If the connection to the server encompasses multiple pipes, we poll both
pipes and read available data. pipes and read available data.
readline readline
-------- --------
Read a line of output from the server. If there are multiple output Read a line of output from the server. If there are multiple output
pipes, reads only the main pipe. pipes, reads only the main pipe.
readframe
---------
Read a frame protocol frame from the wire.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts['localssh'] and not repo: if opts['localssh'] and not repo:
raise error.Abort(_('--localssh requires a repository')) raise error.Abort(_('--localssh requires a repository'))
if opts['peer'] and opts['peer'] not in ('raw', 'ssh1', 'ssh2'): if opts['peer'] and opts['peer'] not in ('raw', 'ssh1', 'ssh2'):
raise error.Abort(_('invalid value for --peer'), raise error.Abort(_('invalid value for --peer'),
autoreadstderr = not opts['noreadstderr'] autoreadstderr = not opts['noreadstderr']
if opts['peer'] == 'ssh1': if opts['peer'] == 'ssh1':
ui.write(_('creating ssh peer for wire protocol version 1\n')) ui.write(_('creating ssh peer for wire protocol version 1\n'))
peer = sshpeer.sshv1peer(ui, url, proc, stdin, stdout, stderr, peer = sshpeer.sshv1peer(ui, url, proc, stdin, stdout, stderr,
None, autoreadstderr=autoreadstderr) None, autoreadstderr=autoreadstderr)
elif opts['peer'] == 'ssh2': elif opts['peer'] == 'ssh2':
ui.write(_('creating ssh peer for wire protocol version 2\n')) ui.write(_('creating ssh peer for wire protocol version 2\n'))
peer = sshpeer.sshv2peer(ui, url, proc, stdin, stdout, stderr, peer = sshpeer.sshv2peer(ui, url, proc, stdin, stdout, None)
None, autoreadstderr=autoreadstderr)
elif opts['peer'] == 'raw': elif opts['peer'] == 'raw':
ui.write(_('using raw connection to peer\n')) ui.write(_('using raw connection to peer\n'))
peer = None peer = None
else: else:
ui.write(_('creating ssh peer from handshake results\n')) ui.write(_('creating ssh peer from handshake results\n'))
peer = sshpeer.makepeer(ui, url, proc, stdin, stdout, stderr, peer = sshpeer.makepeer(ui, url, proc, stdin, stdout, stderr,
autoreadstderr=autoreadstderr) autoreadstderr=autoreadstderr)
fds = util.poll([stdout.fileno(), stderr.fileno()]) fds = util.poll([stdout.fileno(), stderr.fileno()])
if stdout.fileno() in fds: if stdout.fileno() in fds:
util.readpipe(stdout) util.readpipe(stdout)
if stderr.fileno() in fds: if stderr.fileno() in fds:
util.readpipe(stderr) util.readpipe(stderr)
elif action == 'readline': elif action == 'readline':
stdout.readline() stdout.readline()
elif action == 'readframe':
frame = wireprotoframing.readframe(stdout)
else: else:
raise error.Abort(_('unknown action: %s') % action) raise error.Abort(_('unknown action: %s') % action)
if batchedcommands is not None: if batchedcommands is not None:
raise error.Abort(_('unclosed "batchbegin" request')) raise error.Abort(_('unclosed "batchbegin" request'))
if peer: if peer:
peer.close() peer.close()
if proc: if proc:
proc.kill() proc.kill()

mercurial/help/internals/wireprotocol.txt

If the server receives an unknown command, it will send an empty ``string`` If the server receives an unknown command, it will send an empty ``string``
response. response.
The server terminates if it receives an empty command (a ``\n`` character). The server terminates if it receives an empty command (a ``\n`` character).
SSH Version 2 Transport SSH Version 2 Transport
----------------------- -----------------------
**Experimental** **Experimental and under development**
Version 2 of the SSH transport is a near complete rewrite of version 1 of
the SSH transport.
Version 2 of the SSH transport behaves identically to version 1 of the SSH Connections initiate in version 1 of the SSH transport. The handshake
transport with the exception of handshake semantics. See above for how protocol (see above) is followed to switch to version 2.
version 2 of the SSH transport is negotiated.
Immediately following the ``upgraded`` line signaling a switch to version Immediately following the ``upgraded`` line signaling a switch to version
2 of the SSH protocol, the server automatically sends additional details 2 of the SSH protocol, the server automatically sends additional details
about the capabilities of the remote server. This has the form: about the capabilities of the remote server. This has the form:
<integer length of value>\n <integer length of value>\n
capabilities: ...\n capabilities: ...\n
e.g. e.g.
s: upgraded 2e82ab3f-9ce3-4b4e-8f8c-6fd1c0e9e23a ssh-v2\n s: upgraded 2e82ab3f-9ce3-4b4e-8f8c-6fd1c0e9e23a ssh-v2\n
s: 240\n s: 240\n
s: capabilities: known getbundle batch ...\n s: capabilities: known getbundle batch ...\n
Following capabilities advertisement, the peers communicate using version Following capabilities advertisement, the peers communicate using the
1 of the SSH transport. *Unified Frame-Based Protocol* (see below). Only the ``stdin`` and ``stdout``
file descriptors are used (``stderr`` is unused).
Unified Frame-Based Protocol
============================
**Experimental and under development**
The *Unified Frame-Based Protocol* is a Mercurial wire protocol
implementation that aims to be mostly transport agnostic (works with
HTTP, SSH, etc).
To operate the protocol, a bi-directional, half-duplex pipe supporting
ordered sends and receives is required. That is, each peer has one pipe
for sending data to the other and another pipe to read data from the other.
The protocol is request-response based: the client issues requests to
the server, which issues replies to those requests. Server-initiated
messaging is not supported.
All data written to peers uses a unified framing format.
Frames begin with a 4 octet header followed by a variable length
payload::
+-----------------------------------------------+
| Length (24) |
+-----------+-----------------------------------+
| Type (4) |
+-----------+
| Flags (4) |
+===========+===================================================|
| Frame Payload (0...) ...
+---------------------------------------------------------------+
The length of the frame payload is expressed as an unsigned 24 bit
little endian integer. Values larger than 65535 MUST NOT be used unless
given permission by the server as part of the negotiated capabilities
during the handshake. The frame header is not part of the advertised
frame length.
The 4-bit ``Type`` field denotes the type of message being sent.
The 4-bit ``Flags`` field defines special attributes for the frame.
The sections below define the frame types and their behavior.
Command Request (``0x01``)
--------------------------
This frame contains a request to run a command.
The name of the command to run constitutes the entirety of the frame
payload.
This frame type MUST ONLY be sent from clients to servers: it is illegal
for a server to send this frame to a client.
The following flag values are defined for this type:
0x01
End of command data. When set, the client will not send any command
arguments or additional command data. When set, the command has been
fully issued and the server has the full context to process the command.
The next frame issued by the client is not part of this command.
0x02
Command argument frames expected. When set, the client will send
*Command Argument* frames containing command argument data.
0x04
Command data frames expected. When set, the client will send
*Command Data* frames containing a raw stream of data for this
command.
The ``0x01`` flag is mutually exclusive with both the ``0x02`` and ``0x04``
flags.
Command Argument (``0x02``)
---------------------------
This frame contains a named argument for a command.
The frame type MUST ONLY be sent from clients to servers: it is illegal
for a server to send this frame to a client.
The payload consists of:
* A 16-bit little endian integer denoting the length of the
argument name.
* A 16-bit little endian integer denoting the length of the
argument value.
* N bytes of ASCII data containing the argument name.
* N bytes of binary data containing the argument value.
The payload MUST hold the entirety of the 32-bit header and the
argument name. The argument value MAY span multiple frames. If this
occurs, the appropriate frame flag should be set to indicate this.
The following flag values are defined for this type:
0x01
Argument data continuation. When set, the data for this argument did
not fit in a single frame and the next frame will contain additional
argument data.
0x02
End of arguments data. When set, the client will not send any more
command arguments for the command this frame is associated with.
The next frame issued by the client will be command data or
belong to a separate request.
Command Data (``0x03``)
-----------------------
This frame contains raw data for a command.
Most commands can be executed by specifying arguments. However,
arguments have an upper bound to their length. For commands that
accept data that is beyond this length or whose length isn't known
when the command is initially sent, they will need to stream
arbitrary data to the server. This frame type facilitates the sending
of this data.
The payload of this frame type consists of a stream of raw data to be
consumed by the command handler on the server. The format of the data
is command specific.
The following flag values are defined for this type:
0x01
Command data continuation. When set, the data for this command
continues into a subsequent frame.
0x02
End of data. When set, command data has been fully sent to the
server. The command has been fully issued and no new data for this
command will be sent. The next frame will belong to a new command.
Output Data (``0x04``)
----------------------
This frame contains output that should be displayed on the client.
The payload is textual data that should be displayed to the client.
Bytes Response Data (``0x05``)
------------------------------
This frame contains raw bytes response data to an issued command.
The following flag values are defined for this type:
0x01
Data continuation. When set, an additional frame containing raw
response data will follow.
0x02
End of data. When sent, the response data has been fully sent and
no additional frames for this response will be sent.
The ``0x01`` flag is mutually exclusive with the ``0x02`` flag.
Error Response (``0x06``)
-------------------------
An error occurred when processing a request. This could indicate
a protocol-level failure or an application level failure depending
on the flags for this message type.
The payload for this type is an error message that should be
displayed to the user.
The following flag values are defined for this type:
0x01
The error occurred at the transport/protocol level. If set, the
connection should be closed.
0x02
The error occurred at the application level. e.g. invalid command.
Capabilities Capabilities
============ ============
Servers advertise supported wire protocol features. This allows clients to Servers advertise supported wire protocol features. This allows clients to
probe for server features before blindly calling a command or passing a probe for server features before blindly calling a command or passing a
specific argument. specific argument.

mercurial/sshpeer.py

import uuid import uuid
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
pycompat, pycompat,
util, util,
wireproto, wireproto,
wireprotoframing,
wireprotoserver, wireprotoserver,
wireprototypes, wireprototypes,
) )
def _serverquote(s): def _serverquote(s):
"""quote a string for the remote shell ... which we assume is sh""" """quote a string for the remote shell ... which we assume is sh"""
if not s: if not s:
return s return s
self._pipeo.write("%d\n" % len(data)) self._pipeo.write("%d\n" % len(data))
if data: if data:
self._pipeo.write(data) self._pipeo.write(data)
if flush: if flush:
self._pipeo.flush() self._pipeo.flush()
if self._autoreadstderr: if self._autoreadstderr:
self._readerr() self._readerr()
class sshv2peer(sshv1peer): class sshv2peer(wireprotoframing.framepeer):
"""A peer that speakers version 2 of the transport protocol.""" """A peer that speaks version 2 of the transport protocol.
# Currently version 2 is identical to version 1 post handshake.
# And handshake is performed before the peer is instantiated. So This peer is a thin wrapper around the frame-based peer.
# we need no custom code. """
def __init__(self, ui, url, proc, writepipe, readpipe, caps):
super(sshv2peer, self).__init__(ui, url, writepipe, readpipe, caps)
# self._proc is unused. Keeping a handle on the process prevents it
# from being garbage collected.
self._proc = proc
def _abort(self, exc):
_cleanuppipes(self.ui, self._readpipe, self._writepipe, None)
def makepeer(ui, path, proc, stdin, stdout, stderr, autoreadstderr=True): def makepeer(ui, path, proc, stdin, stdout, stderr, autoreadstderr=True):
"""Make a peer instance from existing pipes. """Make a peer instance from existing pipes.
``path`` and ``proc`` are stored on the eventual peer instance and may ``path`` and ``proc`` are stored on the eventual peer instance and may
not be used for anything meaningful. not be used for anything meaningful.
``stdin``, ``stdout``, and ``stderr`` are the pipes connected to the ``stdin``, ``stdout``, and ``stderr`` are the pipes connected to the
except Exception: except Exception:
_cleanuppipes(ui, stdout, stdin, stderr) _cleanuppipes(ui, stdout, stdin, stderr)
raise raise
if protoname == wireprototypes.SSHV1: if protoname == wireprototypes.SSHV1:
return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps, return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps,
autoreadstderr=autoreadstderr) autoreadstderr=autoreadstderr)
elif protoname == wireprototypes.SSHV2: elif protoname == wireprototypes.SSHV2:
return sshv2peer(ui, path, proc, stdin, stdout, stderr, caps, return sshv2peer(ui, path, proc, stdin, stdout, caps)
autoreadstderr=autoreadstderr)
else: else:
_cleanuppipes(ui, stdout, stdin, stderr) _cleanuppipes(ui, stdout, stdin, stderr)
raise error.RepoError(_('unknown version of SSH protocol: %s') % raise error.RepoError(_('unknown version of SSH protocol: %s') %
protoname) protoname)
def instance(ui, path, create): def instance(ui, path, create):
"""Create an SSH peer. """Create an SSH peer.

mercurial/wireprotoframing.py

  • This file was added.
# wireprotoframing.py - unified framing protocol for wire protocol
#
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
# This file contains functionality to support the unified frame-based wire
# protocol. For details about the protocol, see
# `hg help internals.wireprotocol`.
from __future__ import absolute_import
import contextlib
import struct
from .i18n import _
from . import (
error,
pycompat,
util,
wireproto,
wireprototypes,
)
FRAME_HEADER_SIZE = 4
FRAME_TYPE_COMMAND_NAME = 0x01
FRAME_TYPE_COMMAND_ARGUMENT = 0x02
FRAME_TYPE_COMMAND_DATA = 0x03
FRAME_TYPE_OUTPUT = 0x04
FRAME_TYPE_RESPONSE_BYTES = 0x05
FRAME_TYPE_ERROR = 0x06
FLAG_COMMAND_NAME_EOS = 0x01
FLAG_COMMAND_NAME_HAVE_ARGS = 0x02
FLAG_COMMAND_NAME_HAVE_DATA = 0x04
FLAG_COMMAND_ARGUMENT_CONTINUATION = 0x01
FLAG_COMMAND_ARGUMENT_EOA = 0x02
FLAG_COMMAND_DATA_CONTINUATION = 0x01
FLAG_COMMAND_DATA_EOS = 0x02
FLAG_RESPONSE_CONTINUATION = 0x01
FLAG_RESPONSE_EOS = 0x02
FLAG_ERROR_PROTOCOL = 0x01
FLAG_ERROR_APPLICATION = 0x02
ARGUMENT_FRAME_HEADER = struct.Struct(r'<HH')
def readframe(fh):
"""Read a frame from the unified framing protocol."""
header = bytearray(FRAME_HEADER_SIZE)
readcount = fh.readinto(header)
if readcount == 0:
return None
if readcount != FRAME_HEADER_SIZE:
raise error.Abort(_('received incomplete frame: got %d bytes: %s') %
(readcount, header))
# 24 bits payload length
# 4 bits frame type
# 4 bits frame flags
# ... payload
framelength = header[0] + 256 * header[1] + 16384 * header[2]
typeflags = header[3]
frametype = (typeflags & 0xf0) >> 4
frameflags = typeflags & 0x0f
payload = fh.read(framelength)
if len(payload) != framelength:
raise error.Abort(_('frame length error: expected %d; got %d') %
(framelength, len(payload)))
return frametype, frameflags, payload
def readresponsetogenerator(fh):
"""Read a command response into a generator of payload chunks."""
while True:
frame = readframe(fh)
if not frame:
raise error.Abort(_('unexpected end to response stream'))
frametype, frameflags, payload = frame
if frametype == FRAME_TYPE_RESPONSE_BYTES:
yield payload
if frameflags & FLAG_RESPONSE_EOS:
return
elif frametype == FRAME_TYPE_ERROR:
if frameflags & FLAG_ERROR_PROTOCOL:
msg = _('protocol level error:')
elif frameflags & FLAG_ERROR_APPLICATION:
msg = _('application level error:')
else:
msg = _('unknown error:')
raise error.ResponseError(msg, payload)
else:
raise error.Abort(_('frame not handled: %d') % frametype)
def readoutputandsimpleresponse(fh):
"""Read frames constituting a simple response to a command.
We expect to see 0 or more side-channel frames containing server output
followed by either a bytes response or error frame, which signals the
end of the exchange.
"""
err = None
response = None
output = None
while True:
frame = readframe(fh)
if not frame:
raise error.Abort(_('unexpected end to simple response'))
frametype, frameflags, payload = frame
if frametype == FRAME_TYPE_RESPONSE_BYTES:
if not frameflags & FLAG_RESPONSE_EOS:
raise error.ResponseError(_('response spanned multiple frames'))
response = payload
break
elif frametype == FRAME_TYPE_ERROR:
err = payload
break
elif frametype == FRAME_TYPE_OUTPUT:
output = util.stringio()
output.write(payload)
else:
raise error.ResponseError(_('unexpected frame: %d') % frametype)
return err, response, output.getvalue()
def writeframe(fh, frametype, frameflags, payload):
# TODO assert size of payload.
frame = bytearray(FRAME_HEADER_SIZE + len(payload))
l = struct.pack(r'<I', len(payload))
frame[0:3] = l[0:3]
frame[3] = (frametype << 4) | frameflags
frame[4:] = payload
fh.write(frame)
def writeargumentframes(fh, name, value, lastargument=False):
"""Write frames necessary to send a command argument."""
# TODO handle splitting of argument values across frames.
payload = bytearray(ARGUMENT_FRAME_HEADER.size + len(name) + len(value))
offset = 0
ARGUMENT_FRAME_HEADER.pack_into(payload, offset, len(name), len(value))
offset += ARGUMENT_FRAME_HEADER.size
payload[offset:offset + len(name)] = name
offset += len(name)
payload[offset:offset + len(value)] = value
flags = FLAG_COMMAND_ARGUMENT_EOA if lastargument else 0
writeframe(fh, FRAME_TYPE_COMMAND_ARGUMENT, flags, payload)
def writecommanddataframes(ui, fh, datafh):
"""Write command data frames to a pipe.
The source file object is read until exhaustion.
"""
while True:
data = datafh.read(32768)
if not data:
return
if len(data) == 32768:
flags = FLAG_COMMAND_DATA_CONTINUATION
else:
flags = FLAG_COMMAND_DATA_EOS
ui.debug('sending command data frame with %d bytes' % len(data))
writeframe(fh, FRAME_TYPE_COMMAND_DATA, flags, data)
def writebytesresponsestatic(fh, value):
"""Write bytes response frame(s) from a static value."""
assert isinstance(value, bytes)
# TODO handle splitting frames.
writeframe(fh, FRAME_TYPE_RESPONSE_BYTES, FLAG_RESPONSE_EOS, value)
def writebytesresponsestream(fh, it):
cb = util.chunkbuffer(it)
while True:
data = cb.read(32768)
if not data:
return
if len(data) == 32768:
flags = FLAG_RESPONSE_CONTINUATION
else:
flags = FLAG_RESPONSE_EOS
writeframe(fh, FRAME_TYPE_RESPONSE_BYTES, flags, data)
def writeerrorresponse(fh, message, protocol=False, application=False):
assert isinstance(message, bytes)
flags = 0
if protocol:
flags |= FLAG_ERROR_PROTOCOL
if application:
flags |= FLAG_ERROR_APPLICATION
writeframe(fh, FRAME_TYPE_ERROR, flags, message)
class framedprotocolhandler(wireprototypes.baseprotocolhandler):
"""Transport agnostic protocol handler for the unified framing protocol."""
def __init__(self, ui, args, data=None):
self._ui = ui
self._args = args
self._data = data
def getargs(self, args):
data = {}
keys = args.split()
for k in keys:
if k == '*':
star = {}
for key in self._args:
if key not in keys:
star[key] = self._args[key]
data['*'] = star
else:
data[k] = self._args[k]
return [data[k] for k in keys]
def forwardpayload(self, ofh):
# TODO It feels like this should before we get here.
if not self._data:
raise error.Abort(_('request to forward payload when no data '
'defined'))
while True:
chunk = self._data.read(32768)
if not chunk:
break
ofh.write(chunk)
@contextlib.contextmanager
def mayberedirectstdio(self):
# TODO stream output as it is produced instead of buffering it.
oldout = self._ui.fout
olderr = self._ui.ferr
out = util.stringio()
try:
self._ui.fout = out
self._ui.ferr = out
yield out
finally:
self._ui.fout = oldout
self._ui.ferr = olderr
def addcapabilities(self, repo, caps):
return caps
def runserver(ui, repo, readpipe, writepipe, protocls):
"""Runs a frame-based protocol server until connction termination.
``readpipe`` and ``writepipe`` are a pair of unidirectional
pipes to use for reads and writes, respectively.
``protocls`` is a type defining the protocol handler for the
server.
This function acts as a state machine of sorts. The following
states are defined:
waiting
Server is waiting for a frame indicating to do something.
command-received-all
All arguments and data for the active command have been received.
command-receiving-args
A command request has been received. Actively receiving command
argument data.
command-receiving-data
A command request has been received. Actively receiving command
data.
arg-continuation
A command argument frame was received and its value did not fit
in a single frame. Additional argument data is expected.
And the transitions between states:
waiting -> command-received-all
A command request frame indicating no command arguments or data
to follow was received.
waiting-> command-receiving-args
A command request frame was received and has indicated that command
argument data will follow.
"""
state = 'waiting'
activecommand = None
activeargs = None
expectingargs = None
expectingdata = None
activeargname = None
activeargchunks = None
activedata = None
while True:
if state == 'waiting':
frame = readframe(readpipe)
if not frame:
return
frametype, frameflags, payload = frame
# The only frame type that should be received in this state
# is a command request.
if frametype != FRAME_TYPE_COMMAND_NAME:
writeerrorresponse(writepipe,
b'expected command frame; '
b'got %d' % frametype,
protocol=True)
writepipe.flush()
return
# The frame payload is the command to execute.
activecommand = payload
activeargs = {}
activedata = None
available = wireproto.commands.commandavailable(
activecommand, protocls(ui, None))
if not available:
writeerrorresponse(writepipe,
b'command not available: %s' % activecommand,
application=True)
writepipe.flush()
# TODO consume remaining frames related to command
return
if frameflags & FLAG_COMMAND_NAME_EOS:
state = 'command-received-all'
continue
expectingargs = bool(frameflags & FLAG_COMMAND_NAME_HAVE_ARGS)
expectingdata = bool(frameflags & FLAG_COMMAND_NAME_HAVE_DATA)
if expectingargs:
state = 'command-receiving-args'
elif expectingdata:
state = 'command-receiving-data'
else:
# This is in violation of the protocol: the EOS flag should
# have been set.
writeerrorresponse(writepipe,
b'missing flags on command frame',
protocol=True)
writepipe.flush()
return
continue
elif state == 'command-receiving-args':
frame = readframe(readpipe)
if not frame:
return
frametype, frameflags, payload = frame
if frametype != FRAME_TYPE_COMMAND_ARGUMENT:
writeerrorresponse(writepipe,
b'expected argument frame; got %d ' %
frametype, protocl=True)
writepipe.flush()
return
offset = 0
namesize, valuesize = ARGUMENT_FRAME_HEADER.unpack_from(payload)
offset += ARGUMENT_FRAME_HEADER.size
# The argument name MUST fit inside the frame.
argname = payload[offset:offset + namesize]
offset += namesize
if len(argname) != namesize:
writeerrorresponse(writepipe,
b'argument name size mismatch',
protocol=True)
writepipe.flush()
return
argvalue = payload[offset:]
# Argument value spans multiple frames. Record our active
# state and tell the state machine to expect additional argument
# data.
if frameflags & FLAG_COMMAND_ARGUMENT_CONTINUATION:
activeargname = argname
activeargchunks = [argvalue]
state = 'arg-continuation'
continue
# Common case: the argument value is completely contained in
# this frame.
if len(argvalue) != valuesize:
writeerrorresponse(writepipe,
b'argument value size mismatch',
protocol=True)
writepipe.flush()
return
activeargs[argname] = argvalue
if frameflags & FLAG_COMMAND_ARGUMENT_EOA:
if expectingdata:
state = 'command-receiving-data'
else:
state = 'command-received-all'
# Else additional argument frames are expected. Continue in this
# state.
continue
elif state == 'command-received-all':
proto = protocls(ui, activeargs, data=activedata)
rsp = wireproto.dispatch(repo, proto, activecommand)
if isinstance(rsp, bytes):
writebytesresponsestatic(writepipe, rsp)
elif isinstance(rsp, wireprototypes.bytesresponse):
writebytesresponsestatic(writepipe, rsp.data)
elif isinstance(rsp, wireprototypes.streamres):
writebytesresponsestream(writepipe, rsp.gen)
elif isinstance(rsp, wireprototypes.streamreslegacy):
writebytesresponsestream(writepipe, rsp.gen)
elif isinstance(rsp, wireprototypes.pushres):
# Send any output collected during execution.
# TODO this should be streamed, if possible.
if rsp.output:
writeframe(writepipe, FRAME_TYPE_OUTPUT, 0, rsp.output)
writebytesresponsestatic(writepipe, b'%d' % rsp.res)
elif isinstance(rsp, wireprototypes.pusherr):
if rsp.output:
writeframe(writepipe, FRAME_TYPE_OUTPUT, 0,
rsp.output)
writebytesresponsestatic(writepipe, rsp.res)
elif isinstance(rsp, wireprototypes.ooberror):
writeerrorresponse(writepipe, rsp.message, application=True)
else:
raise error.ProgrammingError('unhandled response type from '
'wire protocol command: %s' % rsp)
writepipe.flush()
state = 'waiting'
elif state == 'command-receiving-data':
# TODO support streaming this data instead of buffering it.
# This will require some refactoring to how frames are read.
activedata = util.stringio()
while True:
frame = readframe(readpipe)
if not frame:
writeerrorresponse(writepipe,
b'unexpected end to command data',
protocol=True)
writepipe.flush()
return
frametype, frameflags, payload = frame
if frametype != FRAME_TYPE_COMMAND_DATA:
writeerrorresponse(writepipe,
b'expected command data frame; got %d ' %
frametype, protocol=True)
writepipe.flush()
return
activedata.write(payload)
if frameflags & FLAG_COMMAND_DATA_CONTINUATION:
continue
elif frameflags & FLAG_COMMAND_DATA_EOS:
break
else:
writeerrorresponse(writepipe,
b'no flags set on command data frame',
protocol=True)
writepipe.flush()
return
activedata.seek(0)
state = 'command-received-all'
continue
else:
msg = 'unhandled sshv2 server state: %s' % state
writeerrorresponse(writepipe,
b'unhandled sshv2 server state: %s' % state,
application=True)
writepipe.flush()
raise error.ProgrammingError(msg)
# TODO delete this class once we stop supporting stream_out in protocol
# version 2.
class slowchunkbufferwithreadline(util.chunkbuffer):
"""A variation of chunkbuffer that has readline() support.
The implementation is not very efficient. This class should not be
used in performance sensitive code.
"""
def readline(self):
line = []
while True:
c = self.read(1)
if not c:
return b''.join(line)
line.append(c)
if c == b'\n':
return b''.join(line)
class framepeer(wireproto.wirepeer):
"""A peer that speaks the unified frame-based protocol."""
def __init__(self, ui, url, writepipe, readpipe, caps):
self._ui = ui
self._url = url
self._writepipe = writepipe
self._readpipe = readpipe
self._caps = caps
# Begin of _basepeer interface.
@util.propertycache
def ui(self):
return self._ui
def url(self):
return self._url
def local(self):
return None
def peer(self):
return self
def canpush(self):
return True
def close(self):
pass
# End of _basepeer interface.
# Begin of _basewirecommands interface.
def capabilities(self):
return self._caps
# End of _basewirecommands interface.
def _sendrequest(self, cmd, args, datafh=None):
# Write the command name frame.
flags = 0
if args:
flags |= FLAG_COMMAND_NAME_HAVE_ARGS
if datafh:
flags |= FLAG_COMMAND_NAME_HAVE_DATA
if not args and not datafh:
flags |= FLAG_COMMAND_NAME_EOS
self.ui.debug('sending %s command\n' % cmd)
writeframe(self._writepipe, FRAME_TYPE_COMMAND_NAME, flags, cmd)
for i, k in enumerate(sorted(args)):
v = args[k]
last = i == len(args) - 1
#self.ui.debug('sending argument frame: %s=%s\n' % (k, v))
writeargumentframes(self._writepipe, k, v, last)
if datafh:
writecommanddataframes(self.ui, self._writepipe, datafh)
self._writepipe.flush()
def _call(self, cmd, **args):
args = pycompat.byteskwargs(args)
self._sendrequest(cmd, args)
chunks = list(readresponsetogenerator(self._readpipe))
return ''.join(chunks)
def _callstream(self, cmd, **args):
args = pycompat.byteskwargs(args)
self._sendrequest(cmd, args)
# stream_out is the only command whose consumer calls readline()
# on the result. readline() requires read-ahead and adds performance
# overhead. We don't want to expose readline() to all callers. So
# only give it to consumers who need it. Eventually, we'll remove
# support for stream_out from protocol version 2, as it has been
# replaced by streaming support in getbundle.
# TODO remove this hack once stream_out is no longer supported.
if cmd == 'stream_out':
cls = slowchunkbufferwithreadline
else:
cls = util.chunkbuffer
return cls(readresponsetogenerator(self._readpipe))
def _callcompressable(self, cmd, **args):
return self._callstream(cmd, **args)
def _callpush(self, cmd, fh, **args):
# This method is only called for the bundle1 push case.
# TODO make this error when called once we ban bundle1 on this
# protocol.
args = pycompat.byteskwargs(args)
self._sendrequest(cmd, args, datafh=fh)
error, response, output = readoutputandsimpleresponse(self._readpipe)
if output:
for l in output.splitlines():
self._ui.status(_('remote: %s\n') % l)
# These are the values that callers expect.
error = error or ''
response = response or ''
return response, error
def _calltwowaystream(self, cmd, fh, **args):
args = pycompat.byteskwargs(args)
self._sendrequest(cmd, args, datafh=fh)
return util.chunkbuffer(readresponsetogenerator(self._readpipe))

mercurial/wireprotoserver.py

from .i18n import _ from .i18n import _
from . import ( from . import (
encoding, encoding,
error, error,
hook, hook,
pycompat, pycompat,
util, util,
wireproto, wireproto,
wireprotoframing,
wireprototypes, wireprototypes,
) )
stringio = util.stringio stringio = util.stringio
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
def client(self): def client(self):
client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0] client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
return 'remote:ssh:' + client return 'remote:ssh:' + client
def addcapabilities(self, repo, caps): def addcapabilities(self, repo, caps):
return caps return caps
class sshv2protocolhandler(sshv1protocolhandler): class sshv2protocolhandler(wireprotoframing.framedprotocolhandler):
"""Protocol handler for version 2 of the SSH protocol.""" """Protocol handler for version 2 of the SSH protocol."""
@property @property
def name(self): def name(self):
return wireprototypes.SSHV2 return wireprototypes.SSHV2
def client(self):
client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
return 'remote:ssh:%s' % client
def _runsshserver(ui, repo, fin, fout, ev): def _runsshserver(ui, repo, fin, fout, ev):
# This function operates like a state machine of sorts. The following # This function operates like a state machine of sorts. The following
# states are defined: # states are defined:
# #
# protov1-serving # protov1-serving
# Server is in protocol version 1 serving mode. Commands arrive on # Server is in protocol version 1 serving mode. Commands arrive on
# new lines. These commands are processed in this state, one command # new lines. These commands are processed in this state, one command
# after the other. # after the other.
# upgrade-v2-filter-legacy-handshake -> upgrade-v2-finish # upgrade-v2-filter-legacy-handshake -> upgrade-v2-finish
# Client fulfilled version 2 upgrade requirements. Finishing that # Client fulfilled version 2 upgrade requirements. Finishing that
# upgrade. # upgrade.
# #
# upgrade-v2-finish -> protov2-serving # upgrade-v2-finish -> protov2-serving
# Protocol upgrade to version 2 complete. Server can now speak protocol # Protocol upgrade to version 2 complete. Server can now speak protocol
# version 2. # version 2.
# #
# protov2-serving -> protov1-serving # protov2-serving -> shutdown
# Ths happens by default since protocol version 2 is the same as # When the server wants to shut down.
# version 1 except for the handshake.
state = 'protov1-serving' state = 'protov1-serving'
proto = sshv1protocolhandler(ui, fin, fout) proto = sshv1protocolhandler(ui, fin, fout)
protoswitched = False protoswitched = False
while not ev.is_set(): while not ev.is_set():
if state == 'protov1-serving': if state == 'protov1-serving':
# Commands are issued on new lines. # Commands are issued on new lines.
elif isinstance(rsp, wireprototypes.pusherr): elif isinstance(rsp, wireprototypes.pusherr):
_sshv1respondbytes(fout, rsp.res) _sshv1respondbytes(fout, rsp.res)
elif isinstance(rsp, wireprototypes.ooberror): elif isinstance(rsp, wireprototypes.ooberror):
_sshv1respondooberror(fout, ui.ferr, rsp.message) _sshv1respondooberror(fout, ui.ferr, rsp.message)
else: else:
raise error.ProgrammingError('unhandled response type from ' raise error.ProgrammingError('unhandled response type from '
'wire protocol command: %s' % rsp) 'wire protocol command: %s' % rsp)
# For now, protocol version 2 serving just goes back to version 1.
elif state == 'protov2-serving': elif state == 'protov2-serving':
state = 'protov1-serving' wireprotoframing.runserver(ui, repo, fin, fout,
sshv2protocolhandler)
state = 'shutdown'
continue continue
elif state == 'upgrade-initial': elif state == 'upgrade-initial':
# We should never transition into this state if we've switched # We should never transition into this state if we've switched
# protocols. # protocols.
assert not protoswitched assert not protoswitched
assert proto.name == wireprototypes.SSHV1 assert proto.name == wireprototypes.SSHV1
elif state == 'upgrade-v2-finish': elif state == 'upgrade-v2-finish':
# Send the upgrade response. # Send the upgrade response.
fout.write(b'upgraded %s %s\n' % (token, SSHV2)) fout.write(b'upgraded %s %s\n' % (token, SSHV2))
servercaps = wireproto.capabilities(repo, proto) servercaps = wireproto.capabilities(repo, proto)
rsp = b'capabilities: %s' % servercaps.data rsp = b'capabilities: %s' % servercaps.data
fout.write(b'%d\n%s\n' % (len(rsp), rsp)) fout.write(b'%d\n%s\n' % (len(rsp), rsp))
fout.flush() fout.flush()
proto = sshv2protocolhandler(ui, fin, fout)
protoswitched = True protoswitched = True
state = 'protov2-serving' state = 'protov2-serving'
continue continue
elif state == 'shutdown': elif state == 'shutdown':
break break

mercurial/wireprototypes.py

# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import abc import abc
# Names of the SSH protocol implementations. # Names of the SSH protocol implementations.
SSHV1 = 'ssh-v1' SSHV1 = 'ssh-v1'
# This is advertised over the wire. Incremental the counter at the end # This is advertised over the wire. Incremental the counter at the end
# to reflect BC breakages. # to reflect BC breakages.
SSHV2 = 'exp-ssh-v2-0001' SSHV2 = 'exp-ssh-v2-0002'
# All available wire protocol transports. # All available wire protocol transports.
TRANSPORTS = { TRANSPORTS = {
SSHV1: { SSHV1: {
'transport': 'ssh', 'transport': 'ssh',
'version': 1, 'version': 1,
}, },
SSHV2: { SSHV2: {

tests/test-check-interfaces.py

ui = uimod.ui() ui = uimod.ui()
checkobject(badpeer()) checkobject(badpeer())
checkobject(httppeer.httppeer(ui, 'http://localhost')) checkobject(httppeer.httppeer(ui, 'http://localhost'))
checkobject(localrepo.localpeer(dummyrepo())) checkobject(localrepo.localpeer(dummyrepo()))
checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, dummypipe(), checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, dummypipe(),
dummypipe(), None, None)) dummypipe(), None, None))
checkobject(sshpeer.sshv2peer(ui, 'ssh://localhost/foo', None, dummypipe(), checkobject(sshpeer.sshv2peer(ui, 'ssh://localhost/foo', None, dummypipe(),
dummypipe(), None, None)) dummypipe(), None))
checkobject(bundlerepo.bundlepeer(dummyrepo())) checkobject(bundlerepo.bundlepeer(dummyrepo()))
checkobject(statichttprepo.statichttppeer(dummyrepo())) checkobject(statichttprepo.statichttppeer(dummyrepo()))
checkobject(unionrepo.unionpeer(dummyrepo())) checkobject(unionrepo.unionpeer(dummyrepo()))
main() main()

tests/test-clone.t

$ hg clone 'ssh://-oProxyCommand=touch owned%20foo@example.com/nonexistent/path' $ hg clone 'ssh://-oProxyCommand=touch owned%20foo@example.com/nonexistent/path'
abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned foo@example.com/nonexistent/path' abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned foo@example.com/nonexistent/path'
[255] [255]
#if windows #if windows
$ hg clone "ssh://%26touch%20owned%20/" --debug $ hg clone "ssh://%26touch%20owned%20/" --debug
running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio" running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio"
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
$ hg clone "ssh://example.com:%26touch%20owned%20/" --debug $ hg clone "ssh://example.com:%26touch%20owned%20/" --debug
running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio" running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio"
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
#else #else
$ hg clone "ssh://%3btouch%20owned%20/" --debug $ hg clone "ssh://%3btouch%20owned%20/" --debug
running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio' running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio'
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
$ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug $ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug
running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio' running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio'
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
#endif #endif
$ hg clone "ssh://v-alid.example.com/" --debug $ hg clone "ssh://v-alid.example.com/" --debug
running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re) running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
We should not have created a file named owned - if it exists, the We should not have created a file named owned - if it exists, the
attack succeeded. attack succeeded.
$ if test -f owned; then echo 'you got owned'; fi $ if test -f owned; then echo 'you got owned'; fi

tests/test-ssh-bundle1.t

remote: KABOOM remote: KABOOM
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote $ hg pull --debug ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
protocol upgraded to exp-ssh-v2-0001 (sshv2 !) protocol upgraded to exp-ssh-v2-0002 (sshv2 !)
remote: 384 (sshv1 !) remote: 384 (sshv1 !)
remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
remote: 1 (sshv1 !) remote: 1 (sshv1 !)
preparing listkeys for "bookmarks" preparing listkeys for "bookmarks"
sending listkeys command sending listkeys command
received listkey for "bookmarks": 45 bytes received listkey for "bookmarks": 45 bytes
query 1; heads query 1; heads
sending batch command sending batch command

tests/test-ssh-proto-unbundle.t

remote output: remote output:
e> read(-1) -> 115: e> read(-1) -> 115:
e> abort: incompatible Mercurial client; bundle2 required\n e> abort: incompatible Mercurial client; bundle2 required\n
e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x01\x00\x00R
o> 0\n o> read(1) -> 1: 0
o> readline() -> 2: ** unknown exception encountered, please report by visiting
o> 1\n ** https://mercurial-scm.org/wiki/BugTracker
o> read(1) -> 1: 0 ** Python 2.7.14 (default, Nov 23 2017, 16:06:54) [GCC 4.2.1 Compatible Apple LLVM 9.0.0 (clang-900.0.38)]
result: 0 ** Mercurial Distributed SCM (version 4.5+785-8bb225342dee+20180302)
remote output: ** Extensions loaded:
e> read(-1) -> 115: Traceback (most recent call last):
e> abort: incompatible Mercurial client; bundle2 required\n File "/Users/gps/src/hg/hg", line 41, in <module>
e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n dispatch.run()
File "/Users/gps/src/hg/mercurial/dispatch.py", line 88, in run
status = (dispatch(req) or 0) & 255
File "/Users/gps/src/hg/mercurial/dispatch.py", line 183, in dispatch
ret = _runcatch(req)
File "/Users/gps/src/hg/mercurial/dispatch.py", line 324, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/gps/src/hg/mercurial/dispatch.py", line 332, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/gps/src/hg/mercurial/scmutil.py", line 154, in callcatch
return func()
File "/Users/gps/src/hg/mercurial/dispatch.py", line 314, in _runcatchfunc
return _dispatch(req)
File "/Users/gps/src/hg/mercurial/dispatch.py", line 917, in _dispatch
cmdpats, cmdoptions)
File "/Users/gps/src/hg/mercurial/dispatch.py", line 674, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/gps/src/hg/mercurial/dispatch.py", line 925, in _runcommand
return cmdfunc()
File "/Users/gps/src/hg/mercurial/dispatch.py", line 914, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/gps/src/hg/mercurial/util.py", line 1497, in check
return func(*args, **kwargs)
File "/Users/gps/src/hg/mercurial/debugcommands.py", line 2800, in debugwireproto
**pycompat.strkwargs(args))
File "/Users/gps/src/hg/mercurial/wireprotoframing.py", line 654, in _callpush
error, response, output = readoutputandsimpleresponse(self._readpipe)
File "/Users/gps/src/hg/mercurial/wireprotoframing.py", line 146, in readoutputandsimpleresponse
return err, response, output.getvalue()
AttributeError: 'NoneType' object has no attribute 'getvalue'
$ cd .. $ cd ..
Create a pretxnchangegroup hook that fails. Give it multiple modes of printing Create a pretxnchangegroup hook that fails. Give it multiple modes of printing
output so we can test I/O capture and behavior. output so we can test I/O capture and behavior.
Test pushing to a server that has a pretxnchangegroup Python hook that fails Test pushing to a server that has a pretxnchangegroup Python hook that fails
e> ui.write 1 line\n e> ui.write 1 line\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x9a\x00\x00@
o> 0\n o> read(154) -> 154:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 1 line\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 1 line
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 196: e> read(-1) -> 42:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1 line\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
And a variation that writes multiple lines using ui.write And a variation that writes multiple lines using ui.write
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hook2lines > pretxnchangegroup.fail = python:$TESTTMP/failhook:hook2lines
> EOF > EOF
e> ui.write 2 lines 2\n e> ui.write 2 lines 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xb0\x00\x00@
o> 0\n o> read(176) -> 176:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 2 lines 1\n
o> ui.write 2 lines 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 2 lines 1
remote: ui.write 2 lines 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 218: e> read(-1) -> 42:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 2 lines 1\n
e> ui.write 2 lines 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
And a variation that does a ui.flush() after writing output And a variation that does a ui.flush() after writing output
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hook1lineflush > pretxnchangegroup.fail = python:$TESTTMP/failhook:hook1lineflush
> EOF > EOF
e> ui.write 1 line flush\n e> ui.write 1 line flush\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xa0\x00\x00@
o> 0\n o> read(160) -> 160:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 1 line flush\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 1 line flush
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 202: e> read(-1) -> 42:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1 line flush\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
Multiple writes + flush Multiple writes + flush
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hookmultiflush > pretxnchangegroup.fail = python:$TESTTMP/failhook:hookmultiflush
> EOF > EOF
e> ui.write 2nd\n e> ui.write 2nd\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xa4\x00\x00@
o> 0\n o> read(164) -> 164:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 1st\n
o> ui.write 2nd\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 1st
remote: ui.write 2nd
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 206: e> read(-1) -> 42:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1st\n
e> ui.write 2nd\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
ui.write() + ui.write_err() output is captured ui.write() + ui.write_err() output is captured
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hookwriteandwriteerr > pretxnchangegroup.fail = python:$TESTTMP/failhook:hookwriteandwriteerr
> EOF > EOF
e> ui.write_err 2\n e> ui.write_err 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xbe\x00\x00@
o> 0\n o> read(190) -> 190:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 1\n
o> ui.write_err 1\n
o> ui.write 2\n
o> ui.write_err 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 1
remote: ui.write_err 1
remote: ui.write 2
remote: ui.write_err 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 232: e> read(-1) -> 42:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n
e> ui.write_err 1\n
e> ui.write 2\n
e> ui.write_err 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
print() output is captured print() output is captured
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hookprintstdout > pretxnchangegroup.fail = python:$TESTTMP/failhook:hookprintstdout
> EOF > EOF
e> printed line\n e> printed line\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x8a\x00\x00@
o> 0\n o> read(138) -> 138:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 193: e> read(-1) -> 55:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> printed line\n e> printed line\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
Mixed print() and ui.write() are both captured Mixed print() and ui.write() are both captured
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hookprintandwrite > pretxnchangegroup.fail = python:$TESTTMP/failhook:hookprintandwrite
> EOF > EOF
e> print 2\n e> print 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xa0\x00\x00@
o> 0\n o> read(160) -> 160:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 1\n
o> ui.write 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 1
remote: ui.write 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 218: e> read(-1) -> 58:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n
e> ui.write 2\n
e> print 1\n e> print 1\n
e> print 2\n e> print 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
print() to stdout and stderr both get captured print() to stdout and stderr both get captured
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [hooks] > [hooks]
> pretxnchangegroup.fail = python:$TESTTMP/failhook:hookprintstderrandstdout > pretxnchangegroup.fail = python:$TESTTMP/failhook:hookprintstderrandstdout
> EOF > EOF
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x8a\x00\x00@
o> 0\n o> read(138) -> 138:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 216: e> read(-1) -> 78:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> stderr 1\n e> stderr 1\n
e> stderr 2\n e> stderr 2\n
e> stdout 1\n e> stdout 1\n
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook failed\n e> abort: pretxnchangegroup.fail hook failed\n
Shell hook writing to stdout has output captured Shell hook writing to stdout has output captured
$ cat > $TESTTMP/hook.sh << EOF $ cat > $TESTTMP/hook.sh << EOF
> echo 'stdout 1' > echo 'stdout 1'
> echo 'stdout 2' > echo 'stdout 2'
> exit 1 > exit 1
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook exited with status 1\n e> abort: pretxnchangegroup.fail hook exited with status 1\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x9c\x00\x00@
o> 0\n o> read(156) -> 156:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> stdout 1\n
o> stdout 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: stdout 1
remote: stdout 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 212: e> read(-1) -> 56:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n
e> stdout 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook exited with status 1\n e> abort: pretxnchangegroup.fail hook exited with status 1\n
Shell hook writing to stderr has output captured Shell hook writing to stderr has output captured
$ cat > $TESTTMP/hook.sh << EOF $ cat > $TESTTMP/hook.sh << EOF
> echo 'stderr 1' 1>&2 > echo 'stderr 1' 1>&2
> echo 'stderr 2' 1>&2 > echo 'stderr 2' 1>&2
> exit 1 > exit 1
e> stderr 2\n e> stderr 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook exited with status 1\n e> abort: pretxnchangegroup.fail hook exited with status 1\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x9c\x00\x00@
o> 0\n o> read(156) -> 156:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> stderr 1\n
o> stderr 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: stderr 1
remote: stderr 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 212: e> read(-1) -> 56:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> stderr 1\n
e> stderr 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook exited with status 1\n e> abort: pretxnchangegroup.fail hook exited with status 1\n
Shell hook writing to stdout and stderr has output captured Shell hook writing to stdout and stderr has output captured
$ cat > $TESTTMP/hook.sh << EOF $ cat > $TESTTMP/hook.sh << EOF
> echo 'stdout 1' > echo 'stdout 1'
> echo 'stderr 1' 1>&2 > echo 'stderr 1' 1>&2
> echo 'stdout 2' > echo 'stdout 2'
e> stderr 2\n e> stderr 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.fail hook exited with status 1\n e> abort: pretxnchangegroup.fail hook exited with status 1\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xae\x00\x00@
o> 0\n o> read(174) -> 174:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> stdout 1\n
o> stderr 1\n
o> stdout 2\n
o> stderr 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: stdout 1
remote: stderr 1
remote: stdout 2
remote: stderr 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 230: e> read(-1) -> 56:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n
e> stderr 1\n
e> stdout 2\n
e> stderr 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.fail hook exited with status 1\n e> abort: pretxnchangegroup.fail hook exited with status 1\n
Shell and Python hooks writing to stdout and stderr have output captured Shell and Python hooks writing to stdout and stderr have output captured
$ cat > $TESTTMP/hook.sh << EOF $ cat > $TESTTMP/hook.sh << EOF
> echo 'shell stdout 1' > echo 'shell stdout 1'
> echo 'shell stderr 1' 1>&2 > echo 'shell stderr 1' 1>&2
> echo 'shell stdout 2' > echo 'shell stdout 2'
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
e> abort: pretxnchangegroup.b hook failed\n e> abort: pretxnchangegroup.b hook failed\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \xc6\x00\x00@
o> 0\n o> read(198) -> 198:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> shell stdout 1\n
o> shell stderr 1\n
o> shell stdout 2\n
o> shell stderr 2\n
o> transaction abort!\n
o> rollback completed\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 0 o> read(1) -> 1: 0
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: shell stdout 1
remote: shell stderr 1
remote: shell stdout 2
remote: shell stderr 2
remote: transaction abort!
remote: rollback completed
result: 0 result: 0
remote output: remote output:
e> read(-1) -> 273: e> read(-1) -> 75:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> shell stdout 1\n
e> shell stderr 1\n
e> shell stdout 2\n
e> shell stderr 2\n
e> stderr 1\n e> stderr 1\n
e> stderr 2\n e> stderr 2\n
e> stdout 1\n e> stdout 1\n
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n
e> rollback completed\n
e> abort: pretxnchangegroup.b hook failed\n e> abort: pretxnchangegroup.b hook failed\n
$ cd .. $ cd ..
Pushing a bundle1 with no output Pushing a bundle1 with no output
$ hg init simplerepo $ hg init simplerepo
$ cd simplerepo $ cd simplerepo
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: d\x00\x00@
o> 0\n o> read(100) -> 100:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 1 o> read(1) -> 1: 1
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
result: 1 result: 1
remote output: remote output:
e> read(-1) -> 100:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
$ cd .. $ cd ..
Pushing a bundle1 with ui.write() and ui.write_err() Pushing a bundle1 with ui.write() and ui.write_err()
$ cat > $TESTTMP/hook << EOF $ cat > $TESTTMP/hook << EOF
> def hookuiwrite(ui, repo, **kwargs): > def hookuiwrite(ui, repo, **kwargs):
> ui.write(b'ui.write 1\n') > ui.write(b'ui.write 1\n')
e> ui.write 1\n e> ui.write 1\n
e> ui.write_err 1\n e> ui.write_err 1\n
e> ui.write 2\n e> ui.write 2\n
e> ui.write_err 2\n e> ui.write_err 2\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x16unbundle
i> unbundle\n i> write(23) -> 23:
i> write(9) -> 9: i> \x13\x00\x00"\x05\x00\n
i> heads 10\n i> \x00heads666f726365
i> write(10) -> 10: 666f726365 i> write(430) -> 430:
i> flush() -> None i> \xaa\x01\x002HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
o> readline() -> 2:
o> 0\n
i> write(4) -> 4:
i> 426\n
i> write(426) -> 426:
i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00>cba485ca3678256e044428f70f58291196f6e9de\n
i> test\n i> test\n
i> 0 0\n i> 0 0\n
i> foo\n i> foo\n
i> \n i> \n
i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n i> initial\x00\x00\x00\x00\x00\x00\x00\x8d\xcb\xa4\x85\xca6x%n\x04D(\xf7\x0fX)\x11\x96\xf6\xe9\xde\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-foo\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe\n
i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n i> \x00\x00\x00\x00\x00\x00\x00\x07foo\x00\x00\x00b6/\xef(L\xe2\xca\x02\xae\xcc\x8d\xe6\xd5\xe8\xa1\xc3\xaf\x05V\xfe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00h\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x020\n
i> \x00\x00\x00\x00\x00\x00\x00\x00 i> \x00\x00\x00\x00\x00\x00\x00\x00
i> write(2) -> 2:
i> 0\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readinto(4) -> 4: \x98\x00\x00@
o> 0\n o> read(152) -> 152:
o> readline() -> 2: o> adding changesets\n
o> 1\n o> adding manifests\n
o> adding file changes\n
o> added 1 changesets with 1 changes to 1 files\n
o> ui.write 1\n
o> ui.write_err 1\n
o> ui.write 2\n
o> ui.write_err 2\n
o> readinto(4) -> 4: \x01\x00\x00R
o> read(1) -> 1: 1 o> read(1) -> 1: 1
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: ui.write 1
remote: ui.write_err 1
remote: ui.write 2
remote: ui.write_err 2
result: 1 result: 1
remote output: remote output:
e> read(-1) -> 152:
e> adding changesets\n
e> adding manifests\n
e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n
e> ui.write_err 1\n
e> ui.write 2\n
e> ui.write_err 2\n

tests/test-ssh-proto.t

o> 68986213bd4485ea51533535e3fc9e78007a711f\n o> 68986213bd4485ea51533535e3fc9e78007a711f\n
o> readline() -> 4: o> readline() -> 4:
o> 384\n o> 384\n
Send an upgrade request to a server that doesn't support that command Send an upgrade request to a server that doesn't support that command
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade 2e82ab3f-9ce3-4b4e-8f8c-6fd1c0e9e23a proto=irrelevant1%2Cirrelevant2\n > upgrade * proto=irrelevant1%2Cirrelevant2\n (glob)
> readline > readline
> raw > raw
> hello\n > hello\n
> between\n > between\n
> pairs 81\n > pairs 81\n
> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
> readline > readline
> readline > readline
> readline > readline
> readline > readline
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(77) -> 77: i> write(77) -> 77:
i> upgrade 2e82ab3f-9ce3-4b4e-8f8c-6fd1c0e9e23a proto=irrelevant1%2Cirrelevant2\n i> upgrade * proto=irrelevant1%2Cirrelevant2\n (glob)
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
o> readline() -> 4: o> readline() -> 4:
o> 384\n o> 384\n
o> readline() -> 384: o> readline() -> 384:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
$ cd .. $ cd ..
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) sending upgrade request: * proto=exp-ssh-v2-0002 (glob)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
remote: 0 remote: 0
remote: 384 remote: 384
remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
> EOF > EOF
Send an upgrade request to a server that supports upgrade Send an upgrade request to a server that supports upgrade
$ cd server $ cd server
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade this-is-some-token proto=exp-ssh-v2-0001\n > upgrade this-is-some-token proto=exp-ssh-v2-0002\n
> hello\n > hello\n
> between\n > between\n
> pairs 81\n > pairs 81\n
> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
> readline > readline
> readline > readline
> readline > readline
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(153) -> 153: i> write(153) -> 153:
i> upgrade this-is-some-token proto=exp-ssh-v2-0001\n i> upgrade this-is-some-token proto=exp-ssh-v2-0002\n
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
o> readline() -> 44: o> readline() -> 44:
o> upgraded this-is-some-token exp-ssh-v2-0001\n o> upgraded this-is-some-token exp-ssh-v2-0002\n
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> readline() -> 384: o> readline() -> 384:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n
$ cd .. $ cd ..
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) sending upgrade request: * proto=exp-ssh-v2-0002 (glob)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
protocol upgraded to exp-ssh-v2-0001 protocol upgraded to exp-ssh-v2-0002
remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
url: ssh://user@dummy/server url: ssh://user@dummy/server
local: no local: no
pushable: yes pushable: yes
Verify the peer has capabilities Verify the peer has capabilities
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) sending upgrade request: * proto=exp-ssh-v2-0002 (glob)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
protocol upgraded to exp-ssh-v2-0001 protocol upgraded to exp-ssh-v2-0002
remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
Main capabilities: Main capabilities:
batch batch
branchmap branchmap
$USUAL_BUNDLE2_CAPS_SERVER$ $USUAL_BUNDLE2_CAPS_SERVER$
changegroupsubset changegroupsubset
getbundle getbundle
known known
https https
Command after upgrade to version 2 is processed Command after upgrade to version 2 is processed
$ cd server $ cd server
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade this-is-some-token proto=exp-ssh-v2-0001\n > upgrade this-is-some-token proto=exp-ssh-v2-0002\n
> hello\n > hello\n
> between\n > between\n
> pairs 81\n > pairs 81\n
> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
> readline > readline
> readline > readline
> readline > readline
> raw > raw
> hello\n > # Frame of length 5
> readline > \x05\x00\x00
> readline > # 0x01 frame type with 0x01 end of data flag set.
> \x11
> hello
> readframe
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(153) -> 153: i> write(153) -> 153:
i> upgrade this-is-some-token proto=exp-ssh-v2-0001\n i> upgrade this-is-some-token proto=exp-ssh-v2-0002\n
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
o> readline() -> 44: o> readline() -> 44:
o> upgraded this-is-some-token exp-ssh-v2-0001\n o> upgraded this-is-some-token exp-ssh-v2-0002\n
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> readline() -> 384: o> readline() -> 384:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n
i> write(6) -> 6: i> write(9) -> 9: \x05\x00\x00\x11hello
i> hello\n o> readinto(4) -> 4: n\x01\x00R
o> readline() -> 4: o> read(366) -> 366:
o> 366\n
o> readline() -> 366:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n
Multiple upgrades is not allowed Multiple upgrades is not allowed
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade this-is-some-token proto=exp-ssh-v2-0001\n > upgrade this-is-some-token proto=exp-ssh-v2-0001\n
> hello\n > hello\n
> between\n > between\n
> pairs 81\n > pairs 81\n
> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
> readline > readline
> readline > readline
> readline > readline
> raw > raw
> upgrade another-token proto=irrelevant\n > \x26\x00\x00
> hello\n > # 0x01 << 4 | 0x01
> readline > \x11
> upgrade another-token proto=irrelevant
> \x05\x00\x00
> \x11
> hello
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(153) -> 153: i> write(153) -> 153:
i> upgrade this-is-some-token proto=exp-ssh-v2-0001\n i> upgrade this-is-some-token proto=exp-ssh-v2-0001\n
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
o> readline() -> 44: o> readline() -> 2:
o> upgraded this-is-some-token exp-ssh-v2-0001\n o> 0\n
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 384\n
o> readline() -> 384: o> readline() -> 384:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN\n
i> write(45) -> 45: i> write(51) -> 51: &\x00\x00\x11upgrade another-token proto=irrelevant\x05\x00\x00\x11hello
i> upgrade another-token proto=irrelevant\n o> read(-1) -> 3:
i> hello\n o> 1\n
o> readline() -> 1:
o> \n o> \n
e> read(-1) -> 42:
e> cannot upgrade protocols multiple times\n
e> -\n
Malformed upgrade request line (not exactly 3 space delimited tokens) Malformed upgrade request line (not exactly 3 space delimited tokens)
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade\n > upgrade\n
> readline > readline
> EOF > EOF
> invalid\n > invalid\n
> readline > readline
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(44) -> 44: i> write(44) -> 44:
i> upgrade token proto=exp-ssh-v2-0001\n i> upgrade token proto=exp-ssh-v2-0001\n
i> invalid\n i> invalid\n
o> readline() -> 1: o> readline() -> 2:
o> \n o> 0\n
e> read(-1) -> 46: o> read(-1) -> 2:
e> malformed handshake protocol: missing hello\n o> 0\n
e> -\n
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade token proto=exp-ssh-v2-0001\n > upgrade token proto=exp-ssh-v2-0001\n
> hello\n > hello\n
> invalid\n > invalid\n
> readline > readline
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(50) -> 50: i> write(50) -> 50:
i> upgrade token proto=exp-ssh-v2-0001\n i> upgrade token proto=exp-ssh-v2-0001\n
i> hello\n i> hello\n
i> invalid\n i> invalid\n
o> readline() -> 1: o> readline() -> 2:
o> \n o> 0\n
e> read(-1) -> 48:
e> malformed handshake protocol: missing between\n
e> -\n
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade token proto=exp-ssh-v2-0001\n > upgrade token proto=exp-ssh-v2-0001\n
> hello\n > hello\n
> between\n > between\n
> invalid\n > invalid\n
> readline > readline
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(58) -> 58: i> write(58) -> 58:
i> upgrade token proto=exp-ssh-v2-0001\n i> upgrade token proto=exp-ssh-v2-0001\n
i> hello\n i> hello\n
i> between\n i> between\n
i> invalid\n i> invalid\n
o> readline() -> 1: o> readline() -> 2:
o> \n o> 0\n
e> read(-1) -> 49:
e> malformed handshake protocol: missing pairs 81\n
e> -\n
Legacy commands are not exposed to version 2 of protocol Legacy commands are not exposed to version 2 of protocol
$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF $ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
> command branches > command branches
> nodes 0000000000000000000000000000000000000000 > nodes 0000000000000000000000000000000000000000
> EOF > EOF
creating ssh peer from handshake results creating ssh peer from handshake results
sending branches command sending branches command
response: abort: application level error:
'command not available: branches'
[255]
$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF $ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
> command changegroup > command changegroup
> roots 0000000000000000000000000000000000000000 > roots 0000000000000000000000000000000000000000
> EOF > EOF
creating ssh peer from handshake results creating ssh peer from handshake results
sending changegroup command sending changegroup command
response: abort: application level error:
'command not available: changegroup'
[255]
$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF $ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
> command changegroupsubset > command changegroupsubset
> bases 0000000000000000000000000000000000000000 > bases 0000000000000000000000000000000000000000
> heads 0000000000000000000000000000000000000000 > heads 0000000000000000000000000000000000000000
> EOF > EOF
creating ssh peer from handshake results creating ssh peer from handshake results
sending changegroupsubset command sending changegroupsubset command
response: abort: application level error:
'command not available: changegroupsubset'
[255]
$ cd .. $ cd ..
Test listkeys for listing namespaces Test listkeys for listing namespaces
$ hg init empty $ hg init empty
$ cd empty $ cd empty
$ debugwireproto << EOF $ debugwireproto << EOF
o> bookmarks \n o> bookmarks \n
o> namespaces \n o> namespaces \n
o> phases o> phases
response: bookmarks \nnamespaces \nphases response: bookmarks \nnamespaces \nphases
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(27) -> 27:
i> write(13) -> 13: i> \x17\x00\x00" \x00\n
i> namespace 10\n i> \x00namespacenamespaces
i> write(10) -> 10: namespaces
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> readinto(4) -> 4: \x1e\x00\x00R
o> 30\n o> read(30) -> 30:
o> bufferedread(30) -> 30:
o> bookmarks \n o> bookmarks \n
o> namespaces \n o> namespaces \n
o> phases o> phases
response: bookmarks \nnamespaces \nphases response: bookmarks \nnamespaces \nphases
$ cd .. $ cd ..
Test listkeys for bookmarks Test listkeys for bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 2: o> bufferedreadline() -> 2:
o> 0\n o> 0\n
response: response:
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(26) -> 26: \x16\x00\x00" \x00 \x00namespacebookmarks
i> write(12) -> 12:
i> namespace 9\n
i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 2: o> readinto(4) -> 4: \x00\x00\x00R
o> 0\n o> read(0) -> 0:
response: response:
With a single bookmark set With a single bookmark set
$ hg book -r 0 bookA $ hg book -r 0 bookA
$ debugwireproto << EOF $ debugwireproto << EOF
> command listkeys > command listkeys
> namespace bookmarks > namespace bookmarks
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 46\n o> 46\n
o> bufferedread(46) -> 46: bookA 68986213bd4485ea51533535e3fc9e78007a711f o> bufferedread(46) -> 46: bookA 68986213bd4485ea51533535e3fc9e78007a711f
response: bookA 68986213bd4485ea51533535e3fc9e78007a711f response: bookA 68986213bd4485ea51533535e3fc9e78007a711f
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(26) -> 26: \x16\x00\x00" \x00 \x00namespacebookmarks
i> write(12) -> 12:
i> namespace 9\n
i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> readinto(4) -> 4: .\x00\x00R
o> 46\n o> read(46) -> 46: bookA 68986213bd4485ea51533535e3fc9e78007a711f
o> bufferedread(46) -> 46: bookA 68986213bd4485ea51533535e3fc9e78007a711f
response: bookA 68986213bd4485ea51533535e3fc9e78007a711f response: bookA 68986213bd4485ea51533535e3fc9e78007a711f
With multiple bookmarks set With multiple bookmarks set
$ hg book -r 1 bookB $ hg book -r 1 bookB
$ debugwireproto << EOF $ debugwireproto << EOF
> command listkeys > command listkeys
> namespace bookmarks > namespace bookmarks
o> bufferedread(93) -> 93: o> bufferedread(93) -> 93:
o> bookA 68986213bd4485ea51533535e3fc9e78007a711f\n o> bookA 68986213bd4485ea51533535e3fc9e78007a711f\n
o> bookB 1880f3755e2e52e3199e0ee5638128b08642f34d o> bookB 1880f3755e2e52e3199e0ee5638128b08642f34d
response: bookA 68986213bd4485ea51533535e3fc9e78007a711f\nbookB 1880f3755e2e52e3199e0ee5638128b08642f34d response: bookA 68986213bd4485ea51533535e3fc9e78007a711f\nbookB 1880f3755e2e52e3199e0ee5638128b08642f34d
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(26) -> 26: \x16\x00\x00" \x00 \x00namespacebookmarks
i> write(12) -> 12:
i> namespace 9\n
i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> readinto(4) -> 4: ]\x00\x00R
o> 93\n o> read(93) -> 93:
o> bufferedread(93) -> 93:
o> bookA 68986213bd4485ea51533535e3fc9e78007a711f\n o> bookA 68986213bd4485ea51533535e3fc9e78007a711f\n
o> bookB 1880f3755e2e52e3199e0ee5638128b08642f34d o> bookB 1880f3755e2e52e3199e0ee5638128b08642f34d
response: bookA 68986213bd4485ea51533535e3fc9e78007a711f\nbookB 1880f3755e2e52e3199e0ee5638128b08642f34d response: bookA 68986213bd4485ea51533535e3fc9e78007a711f\nbookB 1880f3755e2e52e3199e0ee5638128b08642f34d
Test pushkey for bookmarks Test pushkey for bookmarks
$ debugwireproto << EOF $ debugwireproto << EOF
> command pushkey > command pushkey
o> 2\n o> 2\n
o> bufferedread(2) -> 2: o> bufferedread(2) -> 2:
o> 1\n o> 1\n
response: 1\n response: 1\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending pushkey command sending pushkey command
i> write(8) -> 8: i> write(11) -> 11: \x07\x00\x00\x12pushkey
i> pushkey\n i> write(17) -> 17: \r\x00\x00 \x03\x00\x06\x00keyremote
i> write(6) -> 6: i> write(26) -> 26: \x16\x00\x00 \x00 \x00namespacebookmarks
i> key 6\n i> write(51) -> 51: /\x00\x00 \x03\x00(\x00new68986213bd4485ea51533535e3fc9e78007a711f
i> write(6) -> 6: remote i> write(11) -> 11: \x07\x00\x00"\x03\x00\x00\x00old
i> write(12) -> 12:
i> namespace 9\n
i> write(9) -> 9: bookmarks
i> write(7) -> 7:
i> new 40\n
i> write(40) -> 40: 68986213bd4485ea51533535e3fc9e78007a711f
i> write(6) -> 6:
i> old 0\n
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 2: o> readinto(4) -> 4: \x02\x00\x00R
o> 2\n o> read(2) -> 2:
o> bufferedread(2) -> 2:
o> 1\n o> 1\n
response: 1\n response: 1\n
$ hg bookmarks $ hg bookmarks
bookA 0:68986213bd44 bookA 0:68986213bd44
bookB 1:1880f3755e2e bookB 1:1880f3755e2e
remote 0:68986213bd44 remote 0:68986213bd44
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 15\n o> 15\n
o> bufferedread(15) -> 15: publishing True o> bufferedread(15) -> 15: publishing True
response: publishing True response: publishing True
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(23) -> 23: \x13\x00\x00" \x00\x06\x00namespacephases
i> write(12) -> 12:
i> namespace 6\n
i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> readinto(4) -> 4: \x0f\x00\x00R
o> 15\n o> read(15) -> 15: publishing True
o> bufferedread(15) -> 15: publishing True
response: publishing True response: publishing True
Create some commits Create some commits
$ echo 0 > foo $ echo 0 > foo
$ hg add foo $ hg add foo
$ hg -q commit -m initial $ hg -q commit -m initial
$ hg phase --public $ hg phase --public
o> 20b8a89289d80036e6c4e87c2083e3bea1586637 1\n o> 20b8a89289d80036e6c4e87c2083e3bea1586637 1\n
o> c4750011d906c18ea2f0527419cbc1a544435150 1\n o> c4750011d906c18ea2f0527419cbc1a544435150 1\n
o> publishing True o> publishing True
response: 20b8a89289d80036e6c4e87c2083e3bea1586637 1\nc4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True response: 20b8a89289d80036e6c4e87c2083e3bea1586637 1\nc4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(23) -> 23: \x13\x00\x00" \x00\x06\x00namespacephases
i> write(12) -> 12:
i> namespace 6\n
i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 4: o> readinto(4) -> 4: e\x00\x00R
o> 101\n o> read(101) -> 101:
o> bufferedread(101) -> 101:
o> 20b8a89289d80036e6c4e87c2083e3bea1586637 1\n o> 20b8a89289d80036e6c4e87c2083e3bea1586637 1\n
o> c4750011d906c18ea2f0527419cbc1a544435150 1\n o> c4750011d906c18ea2f0527419cbc1a544435150 1\n
o> publishing True o> publishing True
response: 20b8a89289d80036e6c4e87c2083e3bea1586637 1\nc4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True response: 20b8a89289d80036e6c4e87c2083e3bea1586637 1\nc4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True
Single draft head Single draft head
$ hg phase --public -r 2 $ hg phase --public -r 2
o> bufferedread(58) -> 58: o> bufferedread(58) -> 58:
o> c4750011d906c18ea2f0527419cbc1a544435150 1\n o> c4750011d906c18ea2f0527419cbc1a544435150 1\n
o> publishing True o> publishing True
response: c4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True response: c4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(23) -> 23: \x13\x00\x00" \x00\x06\x00namespacephases
i> write(12) -> 12:
i> namespace 6\n
i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> readinto(4) -> 4: :\x00\x00R
o> 58\n o> read(58) -> 58:
o> bufferedread(58) -> 58:
o> c4750011d906c18ea2f0527419cbc1a544435150 1\n o> c4750011d906c18ea2f0527419cbc1a544435150 1\n
o> publishing True o> publishing True
response: c4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True response: c4750011d906c18ea2f0527419cbc1a544435150 1\npublishing True
All public heads All public heads
$ hg phase --public -r 4 $ hg phase --public -r 4
$ debugwireproto << EOF $ debugwireproto << EOF
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 15\n o> 15\n
o> bufferedread(15) -> 15: publishing True o> bufferedread(15) -> 15: publishing True
response: publishing True response: publishing True
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending listkeys command sending listkeys command
i> write(9) -> 9: i> write(12) -> 12: \x08\x00\x00\x12listkeys
i> listkeys\n i> write(23) -> 23: \x13\x00\x00" \x00\x06\x00namespacephases
i> write(12) -> 12:
i> namespace 6\n
i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> readinto(4) -> 4: \x0f\x00\x00R
o> 15\n o> read(15) -> 15: publishing True
o> bufferedread(15) -> 15: publishing True
response: publishing True response: publishing True
Setting public phase via pushkey Setting public phase via pushkey
$ hg phase --draft --force -r . $ hg phase --draft --force -r .
$ debugwireproto << EOF $ debugwireproto << EOF
> command pushkey > command pushkey
o> 2\n o> 2\n
o> bufferedread(2) -> 2: o> bufferedread(2) -> 2:
o> 1\n o> 1\n
response: 1\n response: 1\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending pushkey command sending pushkey command
i> write(8) -> 8: i> write(11) -> 11: \x07\x00\x00\x12pushkey
i> pushkey\n i> write(51) -> 51: /\x00\x00 \x03\x00(\x00key7127240a084fd9dc86fe8d1f98e26229161ec82b
i> write(7) -> 7: i> write(23) -> 23: \x13\x00\x00 \x00\x06\x00namespacephases
i> key 40\n i> write(12) -> 12: \x08\x00\x00 \x03\x00\x01\x00new0
i> write(40) -> 40: 7127240a084fd9dc86fe8d1f98e26229161ec82b i> write(12) -> 12: \x08\x00\x00"\x03\x00\x01\x00old1
i> write(12) -> 12:
i> namespace 6\n
i> write(6) -> 6: phases
i> write(6) -> 6:
i> new 1\n
i> write(1) -> 1: 0
i> write(6) -> 6:
i> old 1\n
i> write(1) -> 1: 1
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 2: o> readinto(4) -> 4: \x02\x00\x00R
o> 2\n o> read(2) -> 2:
o> bufferedread(2) -> 2:
o> 1\n o> 1\n
response: 1\n response: 1\n
$ hg phase . $ hg phase .
4: public 4: public
$ cd .. $ cd ..
o> publishing True o> publishing True
response #0: bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n response #0: bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
response #1: bookA 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\nbookB bfebe6bd38eebc6f8202e419c1171268987ea6a6 response #1: bookA 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\nbookB bfebe6bd38eebc6f8202e419c1171268987ea6a6
response #2: 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab 1\nbfebe6bd38eebc6f8202e419c1171268987ea6a6 1\npublishing True response #2: 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab 1\nbfebe6bd38eebc6f8202e419c1171268987ea6a6 1\npublishing True
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0002\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 62: o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob) o> upgraded * exp-ssh-v2-0002\n (glob)
o> readline() -> 4: o> readline() -> 4:
o> 383\n o> 383\n
o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN o> read(383) -> 383: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
o> read(1) -> 1: o> read(1) -> 1:
o> \n o> \n
sending batch with 3 sub-commands sending batch with 3 sub-commands
i> write(6) -> 6: i> write(9) -> 9: \x05\x00\x00\x12batch
i> batch\n i> write(73) -> 73: E\x00\x00"\x04\x00=\x00cmdsheads ;listkeys namespace=bookmarks;listkeys namespace=phases
i> write(4) -> 4:
i> * 0\n
i> write(8) -> 8:
i> cmds 61\n
i> write(61) -> 61: heads ;listkeys namespace=bookmarks;listkeys namespace=phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 4: o> readinto(4) -> 4: \x16\x01\x00R
o> 278\n o> read(278) -> 278:
o> bufferedread(278) -> 278:
o> bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n o> bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
o> ;bookA 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n o> ;bookA 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
o> bookB bfebe6bd38eebc6f8202e419c1171268987ea6a6;4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab 1\n o> bookB bfebe6bd38eebc6f8202e419c1171268987ea6a6;4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab 1\n
o> bfebe6bd38eebc6f8202e419c1171268987ea6a6 1\n o> bfebe6bd38eebc6f8202e419c1171268987ea6a6 1\n
o> publishing True o> publishing True
response #0: bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n response #0: bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
response #1: bookA 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\nbookB bfebe6bd38eebc6f8202e419c1171268987ea6a6 response #1: bookA 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\nbookB bfebe6bd38eebc6f8202e419c1171268987ea6a6
response #2: 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab 1\nbfebe6bd38eebc6f8202e419c1171268987ea6a6 1\npublishing True response #2: 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab 1\nbfebe6bd38eebc6f8202e419c1171268987ea6a6 1\npublishing True

tests/test-ssh.t

remote: KABOOM IN PROCESS remote: KABOOM IN PROCESS
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0002 (glob) (sshv2 !)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
remote: 384 (sshv1 !) remote: 384 (sshv1 !)
protocol upgraded to exp-ssh-v2-0001 (sshv2 !) protocol upgraded to exp-ssh-v2-0002 (sshv2 !)
remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash batch changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
remote: 1 (sshv1 !) remote: 1 (sshv1 !)
query 1; heads query 1; heads
devel-peer-request: batch devel-peer-request: batch
devel-peer-request: cmds: 141 bytes devel-peer-request: cmds: 141 bytes
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally