Mercurial > hg
annotate tests/test-url-rev.t @ 30435:b86a448a2965
zstd: vendor python-zstandard 0.5.0
As the commit message for the previous changeset says, we wish
for zstd to be a 1st class citizen in Mercurial. To make that
happen, we need to enable Python to talk to the zstd C API. And
that requires bindings.
This commit vendors a copy of existing Python bindings. Why do we
need to vendor? As the commit message of the previous commit says,
relying on systems in the wild to have the bindings or zstd present
is a losing proposition. By distributing the zstd and bindings with
Mercurial, we significantly increase our chances that zstd will
work. Since zstd will deliver a better end-user experience by
achieving better performance, this benefits our users. Another
reason is that the Python bindings still aren't stable and the
API is somewhat fluid. While Mercurial could be coded to target
multiple versions of the Python bindings, it is safer to bundle
an explicit, known working version.
The added Python bindings are mostly a fully-featured interface
to the zstd C API. They allow one-shot operations, streaming,
reading and writing from objects implements the file object
protocol, dictionary compression, control over low-level compression
parameters, and more. The Python bindings work on Python 2.6,
2.7, and 3.3+ and have been tested on Linux and Windows. There are
CFFI bindings, but they are lacking compared to the C extension.
Upstream work will be needed before we can support zstd with PyPy.
But it will be possible.
The files added in this commit come from Git commit
e637c1b214d5f869cf8116c550dcae23ec13b677 from
https://github.com/indygreg/python-zstandard and are added without
modifications. Some files from the upstream repository have been
omitted, namely files related to continuous integration.
In the spirit of full disclosure, I'm the maintainer of the
"python-zstandard" project and have authored 100% of the code
added in this commit. Unfortunately, the Python bindings have
not been formally code reviewed by anyone. While I've tested
much of the code thoroughly (I even have tests that fuzz APIs),
there's a good chance there are bugs, memory leaks, not well
thought out APIs, etc. If someone wants to review the code and
send feedback to the GitHub project, it would be greatly
appreciated.
Despite my involvement with both projects, my opinions of code
style differ from Mercurial's. The code in this commit introduces
numerous code style violations in Mercurial's linters. So, the code
is excluded from most lints. However, some violations I agree with.
These have been added to the known violations ignore list for now.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 10 Nov 2016 22:15:58 -0800 |
parents | 3f4e1c033f40 |
children | 4431add9aef9 |
rev | line source |
---|---|
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12300
diff
changeset
|
1 Test basic functionality of url#rev syntax |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
3 $ hg init repo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
4 $ cd repo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
5 $ echo a > a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
6 $ hg ci -qAm 'add a' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
7 $ hg branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
8 marked working directory as branch foo |
15615 | 9 (branches are permanent and global, did you want a bookmark?) |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
10 $ echo >> a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
11 $ hg ci -m 'change a' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
12 $ cd .. |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
13 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
14 $ hg clone 'repo#foo' clone |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
15 adding changesets |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
16 adding manifests |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
17 adding file changes |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
18 added 2 changesets with 2 changes to 1 files |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
19 updating to branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
22 $ hg --cwd clone heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
23 changeset: 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
24 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
25 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
26 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
27 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
28 summary: change a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
29 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
30 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
31 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
32 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
33 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
34 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
35 $ hg --cwd clone parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
36 changeset: 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
37 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
38 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
39 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
40 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
41 summary: change a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
42 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
43 $ cat clone/.hg/hgrc |
29978
3d2ea1403c62
samplehgrcs: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
25382
diff
changeset
|
44 # example repository config (see 'hg help config' for more info) |
22837
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
45 [paths] |
23055
392ed77879c3
tests: add "(glob)" to paths in test-url-rev.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22837
diff
changeset
|
46 default = $TESTTMP/repo#foo (glob) |
22837
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
47 |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
48 # path aliases to other clones of this repo in URLs or filesystem paths |
29978
3d2ea1403c62
samplehgrcs: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
25382
diff
changeset
|
49 # (see 'hg help config.paths' for more info) |
22837
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
50 # |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
51 # default-push = ssh://jdoe@example.net/hg/jdoes-fork |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
52 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
53 # my-clone = /home/jdoe/jdoes-clone |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
54 |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
55 [ui] |
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22380
diff
changeset
|
56 # name and email (local to this repository, optional), e.g. |
22380
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
57 # username = Jane Doe <jdoe@example.com> |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
58 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
59 Changing original repo: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
60 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
61 $ cd repo |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
62 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
63 $ echo >> a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
64 $ hg ci -m 'new head of branch foo' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
65 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
66 $ hg up -qC default |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
67 $ echo bar > bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
68 $ hg ci -qAm 'add bar' |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
69 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
70 $ hg log |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
71 changeset: 3:4cd725637392 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
72 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
73 parent: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
74 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
75 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
76 summary: add bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
77 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
78 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
79 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
80 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
81 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
82 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
83 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
84 changeset: 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
85 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
86 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
87 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
88 summary: change a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
89 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
90 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
91 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
92 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
93 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
94 |
18994
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
95 $ hg -q outgoing '../clone' |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
96 2:faba9097cad4 |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
97 3:4cd725637392 |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
98 $ hg summary --remote --config paths.default='../clone' |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
99 parent: 3:4cd725637392 tip |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
100 add bar |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
101 branch: default |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
102 commit: (clean) |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
103 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
104 phases: 4 draft |
18994
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
105 remote: 2 outgoing |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
106 $ hg -q outgoing '../clone#foo' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
107 2:faba9097cad4 |
18994
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
108 $ hg summary --remote --config paths.default='../clone#foo' |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
109 parent: 3:4cd725637392 tip |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
110 add bar |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
111 branch: default |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
112 commit: (clean) |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
113 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
114 phases: 4 draft |
18994
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
115 remote: 1 outgoing |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
116 |
18996
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
117 $ hg -q --cwd ../clone incoming '../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
118 2:faba9097cad4 |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
119 $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
120 parent: 1:cd2a86ecc814 tip |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
121 change a |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
122 branch: foo |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
123 commit: (clean) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
124 update: (current) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
125 remote: 1 or more incoming |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
126 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
127 $ hg -q push '../clone#foo' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
128 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
129 $ hg --cwd ../clone heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
130 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
131 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
132 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
133 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
134 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
135 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
136 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
137 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
138 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
139 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
140 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
141 |
18996
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
142 $ hg -q --cwd ../clone incoming '../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
143 [1] |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
144 $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
145 parent: 1:cd2a86ecc814 |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
146 change a |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
147 branch: foo |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
148 commit: (clean) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
149 update: 1 new changesets (update) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
150 remote: (synced) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
151 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
152 $ cd .. |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
153 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
154 $ cd clone |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
155 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
156 repository tip rolled back to revision 1 (undo push) |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
157 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
158 $ hg -q incoming |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
159 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
160 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
161 $ hg -q pull |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
162 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
163 $ hg heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
164 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
165 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
166 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
167 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
168 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
169 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
170 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
171 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
172 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
173 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
174 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
175 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
176 Pull should not have updated: |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
177 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
178 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
179 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
180 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
181 Going back to the default branch: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
182 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
183 $ hg up -C 0 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
185 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
186 $ hg parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
187 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
188 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
189 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
190 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
191 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
192 No new revs, no update: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
193 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
194 $ hg pull -qu |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
195 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
196 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
197 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
198 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
199 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
200 repository tip rolled back to revision 1 (undo pull) |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
201 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
202 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
203 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
204 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
205 Pull -u takes us back to branch foo: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
206 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
207 $ hg pull -qu |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
208 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
209 $ hg parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
210 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
211 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
212 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
213 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
214 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
215 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
216 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
217 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
218 repository tip rolled back to revision 1 (undo pull) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
219 working directory now based on revision 0 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
220 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
221 $ hg up -C 0 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
223 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
224 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
225 0:1f0dee641bb7 |
5224
20817af258d8
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5223
diff
changeset
|
226 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
227 $ hg heads -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
228 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
229 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
230 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
231 $ hg pull -qur default default |
5224
20817af258d8
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5223
diff
changeset
|
232 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
233 $ hg parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
234 changeset: 3:4cd725637392 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
235 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
236 parent: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
237 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
238 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
239 summary: add bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
240 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
241 $ hg heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
242 changeset: 3:4cd725637392 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
243 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
244 parent: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
245 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
246 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
247 summary: add bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
248 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
249 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
250 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
251 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
252 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
253 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
254 |
15246
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
255 Test handling of invalid urls |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
256 |
15246
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
257 $ hg id http://foo/?bar |
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
258 abort: unsupported URL component: "bar" |
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
259 [255] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
260 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
261 $ cd .. |
18997
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
262 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
263 Test handling common incoming revisions between "default" and |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
264 "default-push" |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
265 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
266 $ hg -R clone rollback |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
267 repository tip rolled back to revision 1 (undo pull) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
268 working directory now based on revision 0 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
269 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
270 $ cd repo |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
271 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
272 $ hg update -q -C default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
273 $ echo modified >> bar |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
274 $ hg commit -m "new head to push current default head" |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
275 $ hg -q push -r ".^1" '../clone' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
276 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
277 $ hg -q outgoing '../clone' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
278 2:faba9097cad4 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
279 4:d515801a8f3d |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
280 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
281 $ hg summary --remote --config paths.default='../clone#default' --config paths.default-push='../clone#foo' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
282 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
283 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
284 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
285 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
286 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
287 phases: 1 draft |
18997
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
288 remote: 1 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
289 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
290 $ hg summary --remote --config paths.default='../clone#foo' --config paths.default-push='../clone' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
291 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
292 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
293 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
294 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
295 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
296 phases: 1 draft |
18997
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
297 remote: 2 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
298 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
299 $ hg summary --remote --config paths.default='../clone' --config paths.default-push='../clone#foo' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
300 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
301 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
302 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
303 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
304 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
305 phases: 1 draft |
18997
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
306 remote: 1 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
307 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
308 $ hg clone -q -r 0 . ../another |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
309 $ hg -q outgoing '../another#default' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
310 3:4cd725637392 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
311 4:d515801a8f3d |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
312 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
313 $ hg summary --remote --config paths.default='../another#default' --config paths.default-push='../clone#default' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
314 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
315 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
316 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
317 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
318 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
319 phases: 1 draft |
18997
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
320 remote: 1 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
321 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
322 $ cd .. |
30036
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
323 |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
324 Test url#rev syntax of local destination path, which should be taken as |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
325 a 'url#rev' path |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
326 |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
327 $ hg clone repo '#foo' |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
328 updating to branch default |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
329 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
330 $ hg root -R '#foo' |
3f4e1c033f40
url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents:
29978
diff
changeset
|
331 $TESTTMP/#foo (glob) |