This is an archive of the discontinued Mercurial Phabricator instance.

Differential D864

commands: rename clone --uncompressed to --stream and document
ClosedPublic

Authored by indygreg on Oct 1 2017, 6:31 AM.

Details

Reviewers
durin42
simpkins
Group Reviewers
hg-reviewers
Commits
rHGfffd3369aa83: commands: rename clone --uncompressed to --stream and document
Summary

--uncompressed isn't a very good name and its description in the
help documentation isn't very useful. We refer to this concept as
"stream clones" in a number of places. I think it makes sense to
change the user-facing argument to use the mode --stream. So this
commit does that.

We keep --uncompressed around for backwards compatibility.

While we're here, we overhaul the help docs for streaming clones
to be somewhat useful.

All tests have been updated to reflect the new preferred --stream
argument. A test for backwards compatibility of --uncompressed has
been added.

.. bc::

`hg clone --stream` should now be used instead of --uncompressed.

--uncompressed is marked as deprecated and is an alias for --stream.
There is no schedule for elimination of --uncompressed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Oct 1 2017, 6:31 AM
durin42 accepted this revision.Oct 1 2017, 6:49 AM
This revision is now accepted and ready to land.Oct 1 2017, 6:49 AM
simpkins accepted this revision.Oct 1 2017, 6:49 AM
simpkins added a subscriber: simpkins.

The code and test changes seem fine to me. I don't have context around the argument naming discussion, but it seems reasonable.

Closed by commit rHGfffd3369aa83: commands: rename clone --uncompressed to --stream and document (authored by indygreg). · Explain WhyOct 1 2017, 6:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2228

mercurial/commands.py

@command('^clone', @command('^clone',
[('U', 'noupdate', None, _('the clone will include an empty working ' [('U', 'noupdate', None, _('the clone will include an empty working '
'directory (only a repository)')), 'directory (only a repository)')),
('u', 'updaterev', '', _('revision, tag, or branch to check out'), ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
_('REV')), _('REV')),
('r', 'rev', [], _('include the specified changeset'), _('REV')), ('r', 'rev', [], _('include the specified changeset'), _('REV')),
('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
('', 'pull', None, _('use pull protocol to copy metadata')), ('', 'pull', None, _('use pull protocol to copy metadata')),
('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), ('', 'uncompressed', None,
_('an alias to --stream (DEPRECATED)')),
('', 'stream', None,
_('clone with minimal data processing')),
] + remoteopts, ] + remoteopts,
_('[OPTION]... SOURCE [DEST]'), _('[OPTION]... SOURCE [DEST]'),
norepo=True) norepo=True)
def clone(ui, source, dest=None, **opts): def clone(ui, source, dest=None, **opts):
"""make a copy of an existing repository """make a copy of an existing repository
Create a copy of an existing repository in a new directory. Create a copy of an existing repository in a new directory.
-U/--noupdate to create a clone with no working directory. -U/--noupdate to create a clone with no working directory.
To pull only a subset of changesets, specify one or more revisions To pull only a subset of changesets, specify one or more revisions
identifiers with -r/--rev or branches with -b/--branch. The identifiers with -r/--rev or branches with -b/--branch. The
resulting clone will contain only the specified changesets and resulting clone will contain only the specified changesets and
their ancestors. These options (or 'clone src#rev dest') imply their ancestors. These options (or 'clone src#rev dest') imply
--pull, even for local source repositories. --pull, even for local source repositories.
In normal clone mode, the remote normalizes repository data into a common
exchange format and the receiving end translates this data into its local
storage format. --stream activates a different clone mode that essentially
copies repository files from the remote with minimal data processing. This
significantly reduces the CPU cost of a clone both remotely and locally.
However, it often increases the transferred data size by 30-40%. This can
result in substantially faster clones where I/O throughput is plentiful,
especially for larger repositories. A side-effect of --stream clones is
that storage settings and requirements on the remote are applied locally:
a modern client may inherit legacy or inefficient storage used by the
remote or a legacy Mercurial client may not be able to clone from a
modern Mercurial remote.
.. note:: .. note::
Specifying a tag will include the tagged changeset but not the Specifying a tag will include the tagged changeset but not the
changeset containing the tag. changeset containing the tag.
.. container:: verbose .. container:: verbose
For efficiency, hardlinks are used for cloning whenever the For efficiency, hardlinks are used for cloning whenever the
- create a lightweight local clone:: - create a lightweight local clone::
hg clone project/ project-feature/ hg clone project/ project-feature/
- clone from an absolute path on an ssh server (note double-slash):: - clone from an absolute path on an ssh server (note double-slash)::
hg clone ssh://user@server//home/projects/alpha/ hg clone ssh://user@server//home/projects/alpha/
- do a high-speed clone over a LAN while checking out a - do a streaming clone while checking out a specified version::
specified version::
hg clone --uncompressed http://server/repo -u 1.5 hg clone --stream http://server/repo -u 1.5
- create a repository without changesets after a particular revision:: - create a repository without changesets after a particular revision::
hg clone -r 04e544 experimental/ good/ hg clone -r 04e544 experimental/ good/
- clone (and track) a particular named branch:: - clone (and track) a particular named branch::
hg clone https://www.mercurial-scm.org/repo/hg/#stable hg clone https://www.mercurial-scm.org/repo/hg/#stable
See :hg:`help urls` for details on specifying URLs. See :hg:`help urls` for details on specifying URLs.
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get('noupdate') and opts.get('updaterev'): if opts.get('noupdate') and opts.get('updaterev'):
raise error.Abort(_("cannot specify both --noupdate and --updaterev")) raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
r = hg.clone(ui, opts, source, dest, r = hg.clone(ui, opts, source, dest,
pull=opts.get('pull'), pull=opts.get('pull'),
stream=opts.get('uncompressed'), stream=opts.get('stream') or opts.get('uncompressed'),
rev=opts.get('rev'), rev=opts.get('rev'),
update=opts.get('updaterev') or not opts.get('noupdate'), update=opts.get('updaterev') or not opts.get('noupdate'),
branch=opts.get('branch'), branch=opts.get('branch'),
shareopts=opts.get('shareopts')) shareopts=opts.get('shareopts'))
return r is None return r is None
@command('^commit|ci', @command('^commit|ci',

mercurial/help/internals/wireprotocol.txt

This capability was introduced during the Mercurial 0.9.2 development cycle in This capability was introduced during the Mercurial 0.9.2 development cycle in
2006. It was never present in a release, as it was replaced by the ``unbundle`` 2006. It was never present in a release, as it was replaced by the ``unbundle``
capability. This capability should not be encountered in the wild. capability. This capability should not be encountered in the wild.
stream-preferred stream-preferred
---------------- ----------------
If present the server prefers that clients clone using the streaming clone If present the server prefers that clients clone using the streaming clone
protocol (``hg clone --uncompressed``) rather than the standard protocol (``hg clone --stream``) rather than the standard
changegroup/bundle based protocol. changegroup/bundle based protocol.
This capability was introduced in Mercurial 2.2 (released May 2012). This capability was introduced in Mercurial 2.2 (released May 2012).
streamreqs streamreqs
---------- ----------
Indicates whether the server supports *streaming clones* and the *requirements* Indicates whether the server supports *streaming clones* and the *requirements*

tests/test-clone-uncompressed.t

$ hg -q commit -A -m 'add a lot of files' $ hg -q commit -A -m 'add a lot of files'
$ hg st $ hg st
$ hg serve -p $HGPORT -d --pid-file=hg.pid $ hg serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
Basic clone Basic clone
$ hg clone --uncompressed -U http://localhost:$HGPORT clone1 $ hg clone --stream -U http://localhost:$HGPORT clone1
streaming all changes
1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes
no changes found
--uncompressed is an alias to --stream
$ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
streaming all changes streaming all changes
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
Clone with background file closing enabled Clone with background file closing enabled
$ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --uncompressed -U http://localhost:$HGPORT clone-background | grep -v adding $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
sending branchmap command sending branchmap command
streaming all changes streaming all changes
sending stream_out command sending stream_out command
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
starting 4 threads for background file closing starting 4 threads for background file closing
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
query 1; heads query 1; heads
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
checking for updated bookmarks checking for updated bookmarks
Cannot stream clone when there are secret changesets Cannot stream clone when there are secret changesets
$ hg -R server phase --force --secret -r tip $ hg -R server phase --force --secret -r tip
$ hg clone --uncompressed -U http://localhost:$HGPORT secret-denied $ hg clone --stream -U http://localhost:$HGPORT secret-denied
warning: stream clone requested but server has them disabled warning: stream clone requested but server has them disabled
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
$ killdaemons.py $ killdaemons.py
Streaming of secrets can be overridden by server config Streaming of secrets can be overridden by server config
$ cd server $ cd server
$ hg --config server.uncompressedallowsecret=true serve -p $HGPORT -d --pid-file=hg.pid $ hg --config server.uncompressedallowsecret=true serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone --uncompressed -U http://localhost:$HGPORT secret-allowed $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
streaming all changes streaming all changes
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
$ killdaemons.py $ killdaemons.py
Clone not allowed when full bundles disabled and can't serve secrets Clone not allowed when full bundles disabled and can't serve secrets
$ cd server $ cd server
$ hg --config server.disablefullbundle=true serve -p $HGPORT -d --pid-file=hg.pid $ hg --config server.disablefullbundle=true serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone --uncompressed http://localhost:$HGPORT secret-full-disabled $ hg clone --stream http://localhost:$HGPORT secret-full-disabled
warning: stream clone requested but server has them disabled warning: stream clone requested but server has them disabled
requesting all changes requesting all changes
remote: abort: server has pull-based clones disabled remote: abort: server has pull-based clones disabled
abort: pull failed on remote abort: pull failed on remote
(remove --pull if specified or upgrade Mercurial) (remove --pull if specified or upgrade Mercurial)
[255] [255]
Local stream clone with secrets involved Local stream clone with secrets involved
(This is just a test over behavior: if you have access to the repo's files, (This is just a test over behavior: if you have access to the repo's files,
there is no security so it isn't important to prevent a clone here.) there is no security so it isn't important to prevent a clone here.)
$ hg clone -U --uncompressed server local-secret $ hg clone -U --stream server local-secret
warning: stream clone requested but server has them disabled warning: stream clone requested but server has them disabled
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
Stream clone while repo is changing: Stream clone while repo is changing:
$ $TESTDIR/seq.py 50000 > repo/f2 $ $TESTDIR/seq.py 50000 > repo/f2
$ hg -R repo ci -Aqm "0" $ hg -R repo ci -Aqm "0"
$ hg -R repo serve -p $HGPORT1 -d --pid-file=hg.pid --config extensions.delayer=delayer.py $ hg -R repo serve -p $HGPORT1 -d --pid-file=hg.pid --config extensions.delayer=delayer.py
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
clone while modifying the repo between stating file with write lock and clone while modifying the repo between stating file with write lock and
actually serving file content actually serving file content
$ hg clone -q --uncompressed -U http://localhost:$HGPORT1 clone & $ hg clone -q --stream -U http://localhost:$HGPORT1 clone &
$ sleep 1 $ sleep 1
$ echo >> repo/f1 $ echo >> repo/f1
$ echo >> repo/f2 $ echo >> repo/f2
$ hg -R repo ci -m "1" $ hg -R repo ci -m "1"
$ wait $ wait
$ hg -R clone id $ hg -R clone id
000000000000 000000000000

tests/test-clonebundles.t

adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
finished applying clone bundle finished applying clone bundle
searching for changes searching for changes
no changes found no changes found
Test interaction between clone bundles and --uncompressed Test interaction between clone bundles and --stream
A manifest with just a gzip bundle A manifest with just a gzip bundle
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> EOF > EOF
$ hg clone -U --uncompressed http://localhost:$HGPORT uncompressed-gzip $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
4 files to transfer, 613 bytes of data 4 files to transfer, 613 bytes of data
transferred 613 bytes in * seconds (*) (glob) transferred 613 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
A manifest with a stream clone but no BUNDLESPEC A manifest with a stream clone but no BUNDLESPEC
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/packed.hg > http://localhost:$HGPORT1/packed.hg
> EOF > EOF
$ hg clone -U --uncompressed http://localhost:$HGPORT uncompressed-no-bundlespec $ hg clone -U --stream http://localhost:$HGPORT uncompressed-no-bundlespec
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
4 files to transfer, 613 bytes of data 4 files to transfer, 613 bytes of data
transferred 613 bytes in * seconds (*) (glob) transferred 613 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
A manifest with a gzip bundle and a stream clone A manifest with a gzip bundle and a stream clone
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1
> EOF > EOF
$ hg clone -U --uncompressed http://localhost:$HGPORT uncompressed-gzip-packed $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed
applying clone bundle from http://localhost:$HGPORT1/packed.hg applying clone bundle from http://localhost:$HGPORT1/packed.hg
4 files to transfer, 613 bytes of data 4 files to transfer, 613 bytes of data
transferred 613 bytes in * seconds (*) (glob) transferred 613 bytes in * seconds (*) (glob)
finished applying clone bundle finished applying clone bundle
searching for changes searching for changes
no changes found no changes found
A manifest with a gzip bundle and stream clone with supported requirements A manifest with a gzip bundle and stream clone with supported requirements
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv1 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv1
> EOF > EOF
$ hg clone -U --uncompressed http://localhost:$HGPORT uncompressed-gzip-packed-requirements $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-requirements
applying clone bundle from http://localhost:$HGPORT1/packed.hg applying clone bundle from http://localhost:$HGPORT1/packed.hg
4 files to transfer, 613 bytes of data 4 files to transfer, 613 bytes of data
transferred 613 bytes in * seconds (*) (glob) transferred 613 bytes in * seconds (*) (glob)
finished applying clone bundle finished applying clone bundle
searching for changes searching for changes
no changes found no changes found
A manifest with a gzip bundle and a stream clone with unsupported requirements A manifest with a gzip bundle and a stream clone with unsupported requirements
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42
> EOF > EOF
$ hg clone -U --uncompressed http://localhost:$HGPORT uncompressed-gzip-packed-unsupported-requirements $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-unsupported-requirements
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
4 files to transfer, 613 bytes of data 4 files to transfer, 613 bytes of data
transferred 613 bytes in * seconds (*) (glob) transferred 613 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found

tests/test-completion.t

hg: command 's' is ambiguous: hg: command 's' is ambiguous:
serve showconfig status summary serve showconfig status summary
[255] [255]
Show all commands + options Show all commands + options
$ hg debugcommands $ hg debugcommands
add: include, exclude, subrepos, dry-run add: include, exclude, subrepos, dry-run
annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template
clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure
commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos
diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
export: output, switch-parent, rev, text, git, binary, nodates export: output, switch-parent, rev, text, git, binary, nodates
forget: include, exclude forget: include, exclude
init: ssh, remotecmd, insecure init: ssh, remotecmd, insecure
log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
merge: force, rev, preview, tool merge: force, rev, preview, tool
pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure

tests/test-http-bundle1.t

abort: cannot start server at 'localhost:$HGPORT1': Address already in use abort: cannot start server at 'localhost:$HGPORT1': Address already in use
[255] [255]
#endif #endif
$ cd .. $ cd ..
$ cat hg1.pid hg2.pid >> $DAEMON_PIDS $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
clone via stream clone via stream
$ hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
streaming all changes streaming all changes
6 files to transfer, 606 bytes of data 6 files to transfer, 606 bytes of data
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy $ hg verify -R copy
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
4 files, 1 changesets, 4 total revisions 4 files, 1 changesets, 4 total revisions
try to clone via stream, should use pull instead try to clone via stream, should use pull instead
$ hg clone --uncompressed http://localhost:$HGPORT1/ copy2 $ hg clone --stream http://localhost:$HGPORT1/ copy2
warning: stream clone requested but server has them disabled warning: stream clone requested but server has them disabled
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 4 changes to 4 files added 1 changesets with 4 changes to 4 files
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
try to clone via stream but missing requirements, so should use pull instead try to clone via stream but missing requirements, so should use pull instead
$ cat > $TESTTMP/removesupportedformat.py << EOF $ cat > $TESTTMP/removesupportedformat.py << EOF
> from mercurial import localrepo > from mercurial import localrepo
> def extsetup(ui): > def extsetup(ui):
> localrepo.localrepository.supportedformats.remove('generaldelta') > localrepo.localrepository.supportedformats.remove('generaldelta')
> EOF > EOF
$ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --uncompressed http://localhost:$HGPORT/ copy3 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
warning: stream clone requested but client is missing requirements: generaldelta warning: stream clone requested but client is missing requirements: generaldelta
(see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 4 changes to 4 files added 1 changesets with 4 changes to 4 files
updating to branch default updating to branch default
$ hg clone http://localhost:$HGPORT1/ disable-pull-clone $ hg clone http://localhost:$HGPORT1/ disable-pull-clone
requesting all changes requesting all changes
abort: remote error: abort: remote error:
server has pull-based clones disabled server has pull-based clones disabled
[255] [255]
... but keep stream clones working ... but keep stream clones working
$ hg clone --uncompressed --noupdate http://localhost:$HGPORT1/ test-stream-clone $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
streaming all changes streaming all changes
* files to transfer, * of data (glob) * files to transfer, * of data (glob)
transferred * in * seconds (* KB/sec) (glob) transferred * in * seconds (* KB/sec) (glob)
searching for changes searching for changes
no changes found no changes found
... and also keep partial clones and pulls working ... and also keep partial clones and pulls working
$ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone

tests/test-http-proxy.t

#require serve #require serve
$ hg init a $ hg init a
$ cd a $ cd a
$ echo a > a $ echo a > a
$ hg ci -Ama -d '1123456789 0' $ hg ci -Ama -d '1123456789 0'
adding a adding a
$ hg serve --config server.uncompressed=True -p $HGPORT -d --pid-file=hg.pid $ hg serve --config server.uncompressed=True -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
$ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null & $ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null &
$ while [ ! -f proxy.pid ]; do sleep 0; done $ while [ ! -f proxy.pid ]; do sleep 0; done
$ cat proxy.pid >> $DAEMON_PIDS $ cat proxy.pid >> $DAEMON_PIDS
url for proxy, stream url for proxy, stream
$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b
streaming all changes streaming all changes
3 files to transfer, 303 bytes of data 3 files to transfer, 303 bytes of data
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b $ cd b

tests/test-http.t

abort: cannot start server at 'localhost:$HGPORT1': Address already in use abort: cannot start server at 'localhost:$HGPORT1': Address already in use
[255] [255]
#endif #endif
$ cd .. $ cd ..
$ cat hg1.pid hg2.pid >> $DAEMON_PIDS $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
clone via stream clone via stream
$ hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
streaming all changes streaming all changes
6 files to transfer, 606 bytes of data 6 files to transfer, 606 bytes of data
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy $ hg verify -R copy
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
4 files, 1 changesets, 4 total revisions 4 files, 1 changesets, 4 total revisions
try to clone via stream, should use pull instead try to clone via stream, should use pull instead
$ hg clone --uncompressed http://localhost:$HGPORT1/ copy2 $ hg clone --stream http://localhost:$HGPORT1/ copy2
warning: stream clone requested but server has them disabled warning: stream clone requested but server has them disabled
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 4 changes to 4 files added 1 changesets with 4 changes to 4 files
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
try to clone via stream but missing requirements, so should use pull instead try to clone via stream but missing requirements, so should use pull instead
$ cat > $TESTTMP/removesupportedformat.py << EOF $ cat > $TESTTMP/removesupportedformat.py << EOF
> from mercurial import localrepo > from mercurial import localrepo
> def extsetup(ui): > def extsetup(ui):
> localrepo.localrepository.supportedformats.remove('generaldelta') > localrepo.localrepository.supportedformats.remove('generaldelta')
> EOF > EOF
$ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --uncompressed http://localhost:$HGPORT/ copy3 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
warning: stream clone requested but client is missing requirements: generaldelta warning: stream clone requested but client is missing requirements: generaldelta
(see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 4 changes to 4 files added 1 changesets with 4 changes to 4 files
updating to branch default updating to branch default
requesting all changes requesting all changes
remote: abort: server has pull-based clones disabled remote: abort: server has pull-based clones disabled
abort: pull failed on remote abort: pull failed on remote
(remove --pull if specified or upgrade Mercurial) (remove --pull if specified or upgrade Mercurial)
[255] [255]
... but keep stream clones working ... but keep stream clones working
$ hg clone --uncompressed --noupdate http://localhost:$HGPORT1/ test-stream-clone $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
streaming all changes streaming all changes
* files to transfer, * of data (glob) * files to transfer, * of data (glob)
transferred * in * seconds (*/sec) (glob) transferred * in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
$ cat error.log $ cat error.log
... and also keep partial clones and pulls working ... and also keep partial clones and pulls working

tests/test-ssh-bundle1.t

$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local
remote: abort: repository /$TESTTMP/nonexistent not found! remote: abort: repository /$TESTTMP/nonexistent not found!
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
clone remote via stream clone remote via stream
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream
streaming all changes streaming all changes
4 files to transfer, 602 bytes of data 4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob) transferred 602 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local-stream $ cd local-stream
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
2 files, 3 changesets, 2 total revisions 2 files, 3 changesets, 2 total revisions
$ hg branches $ hg branches
default 0:1160648e36ce default 0:1160648e36ce
$ cd .. $ cd ..
clone bookmarks via stream clone bookmarks via stream
$ hg -R local-stream book mybook $ hg -R local-stream book mybook
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2
streaming all changes streaming all changes
4 files to transfer, 602 bytes of data 4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob) transferred 602 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd stream2 $ cd stream2

tests/test-ssh-clone-r.t

(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip $ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd .. $ cd ..
clone remote via stream clone remote via stream
$ for i in 0 1 2 3 4 5 6 7 8; do $ for i in 0 1 2 3 4 5 6 7 8; do
> hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed -r "$i" ssh://user@dummy/remote test-"$i" > hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream -r "$i" ssh://user@dummy/remote test-"$i"
> if cd test-"$i"; then > if cd test-"$i"; then
> hg verify > hg verify
> cd .. > cd ..
> fi > fi
> done > done
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes

tests/test-ssh.t

$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local
remote: abort: repository $TESTTMP/nonexistent not found! remote: abort: repository $TESTTMP/nonexistent not found!
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
clone remote via stream clone remote via stream
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream
streaming all changes streaming all changes
4 files to transfer, 602 bytes of data 4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob) transferred 602 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local-stream $ cd local-stream
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
2 files, 3 changesets, 2 total revisions 2 files, 3 changesets, 2 total revisions
$ hg branches $ hg branches
default 0:1160648e36ce default 0:1160648e36ce
$ cd .. $ cd ..
clone bookmarks via stream clone bookmarks via stream
$ hg -R local-stream book mybook $ hg -R local-stream book mybook
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2
streaming all changes streaming all changes
4 files to transfer, 602 bytes of data 4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob) transferred 602 bytes in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd stream2 $ cd stream2

tests/test-treemanifest.t

checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
8 files, 4 changesets, 18 total revisions 8 files, 4 changesets, 18 total revisions
Stream clone with basicstore Stream clone with basicstore
$ hg clone --config experimental.changegroup3=True --uncompressed -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT1 stream-clone-basicstore > http://localhost:$HGPORT1 stream-clone-basicstore
streaming all changes streaming all changes
18 files to transfer, * of data (glob) 18 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
$ hg -R stream-clone-basicstore verify $ hg -R stream-clone-basicstore verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
8 files, 4 changesets, 18 total revisions 8 files, 4 changesets, 18 total revisions
Stream clone with encodedstore Stream clone with encodedstore
$ hg clone --config experimental.changegroup3=True --uncompressed -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT2 stream-clone-encodedstore > http://localhost:$HGPORT2 stream-clone-encodedstore
streaming all changes streaming all changes
18 files to transfer, * of data (glob) 18 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
$ hg -R stream-clone-encodedstore verify $ hg -R stream-clone-encodedstore verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
8 files, 4 changesets, 18 total revisions 8 files, 4 changesets, 18 total revisions
Stream clone with fncachestore Stream clone with fncachestore
$ hg clone --config experimental.changegroup3=True --uncompressed -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT stream-clone-fncachestore > http://localhost:$HGPORT stream-clone-fncachestore
streaming all changes streaming all changes
18 files to transfer, * of data (glob) 18 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
searching for changes searching for changes
no changes found no changes found
$ hg -R stream-clone-fncachestore verify $ hg -R stream-clone-fncachestore verify
checking changesets checking changesets