annotate tests/test-url-rev.t @ 50470:814f55775b21

store: no longer explicitly mark the splitted index as ignored Since the fncache is going to automatically recognised it as non "normal" revlog file, we don't need to explicitly make it ignored.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 15 May 2023 08:56:08 +0200
parents 4441705b7111
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15246
diff changeset
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
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 31064
diff changeset
19 new changesets 1f0dee641bb7:cd2a86ecc814
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
20 updating to branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
21 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
22
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
23 $ hg --cwd clone heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
24 changeset: 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
25 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
26 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
27 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
28 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
29 summary: change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
30
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
31 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
32 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
33 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
34 summary: add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
35
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
36 $ hg --cwd clone parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
37 changeset: 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
38 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
39 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
40 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
41 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
42 summary: change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
43
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
44 $ cat clone/.hg/hgrc
29978
3d2ea1403c62 samplehgrcs: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 25382
diff changeset
45 # 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
46 [paths]
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
47 default = $TESTTMP/repo#foo
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
48
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
49 # 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
50 # (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
51 #
31064
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485)
Rishabh Madan <rishabhmadan96@gmail.com>
parents: 30036
diff changeset
52 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485)
Rishabh Madan <rishabhmadan96@gmail.com>
parents: 30036
diff changeset
53 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485)
Rishabh Madan <rishabhmadan96@gmail.com>
parents: 30036
diff changeset
54 # my-clone = /home/jdoe/jdoes-clone
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
55
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 [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
57 # 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
58 # username = Jane Doe <jdoe@example.com>
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
59
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
60 Changing original repo:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
61
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
62 $ 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
63
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
64 $ echo >> a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
65 $ hg ci -m 'new head of branch foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
66
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
67 $ hg up -qC default
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
68 $ echo bar > bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
69 $ 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
70
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
71 $ hg log
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
72 changeset: 3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
73 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
74 parent: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
75 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
76 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
77 summary: add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
78
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
79 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
80 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
81 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
82 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
83 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
84
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
85 changeset: 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
86 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
87 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
88 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
89 summary: change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
90
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
91 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
92 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
93 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
94 summary: add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
95
18994
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
96 $ 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
97 2:faba9097cad4
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
98 3:4cd725637392
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
99 $ 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
100 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
101 add bar
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
102 branch: default
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
103 commit: (clean)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
104 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
105 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
106 remote: 2 outgoing
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
107 $ hg -q outgoing '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
108 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
109 $ 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
110 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
111 add bar
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
112 branch: default
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
113 commit: (clean)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
114 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
115 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
116 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
117
18996
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
118 $ 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
119 2:faba9097cad4
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
120 $ 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
121 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
122 change a
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
123 branch: foo
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
124 commit: (clean)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
125 update: (current)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
126 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
127
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
128 $ hg -q push '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
129
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
130 $ hg --cwd ../clone heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
131 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
132 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
133 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
134 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
135 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
136 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
137
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
138 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
139 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
140 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
141 summary: add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
142
18996
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
143 $ 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
144 [1]
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
145 $ 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
146 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
147 change a
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
148 branch: foo
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
149 commit: (clean)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
150 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
151 remote: (synced)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
152
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
153 $ cd ..
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
154
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
155 $ cd clone
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
156 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
157 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
158
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
159 $ hg -q incoming
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
160 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
161
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
162 $ hg -q pull
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
163
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
164 $ hg heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
165 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
166 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
167 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
168 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
169 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
170 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
171
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
172 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
173 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
174 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
175 summary: add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
176
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
177 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
178
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
179 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
180 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
181
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
182 Going back to the default branch:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
183
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
184 $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
185 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
186
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
187 $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
188 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
189 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
190 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
191 summary: add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
192
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
193 No new revs, no update:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
194
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
195 $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
196
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
197 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
198 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
199
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
200 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
201 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
202
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
203 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
204 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
205
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
206 Pull -u takes us back to branch foo:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
207
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
208 $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
209
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
210 $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
211 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
212 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
213 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
214 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
215 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
216 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
217
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
218 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
219 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
220 working directory now based on revision 0
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
221
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
222 $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
223 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
224
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
225 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
226 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
227
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
228 $ hg heads -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
229 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
230 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
231
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
232 $ 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
233
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
234 $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
235 changeset: 3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
236 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
237 parent: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
238 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
239 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
240 summary: add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
241
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
242 $ hg heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
243 changeset: 3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
244 tag: tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
245 parent: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
246 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
247 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
248 summary: add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
249
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
250 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
251 branch: foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
252 user: test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
253 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
254 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
255
15246
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
256 Test handling of invalid urls
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
257
15246
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
258 $ hg id http://foo/?bar
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
259 abort: unsupported URL component: "bar"
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
260 [255]
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
261
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
262 $ cd ..
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
263
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
264 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
265 "default-push"
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
266
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
267 $ hg -R clone rollback
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
268 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
269 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
270
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
271 $ cd repo
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
272
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
273 $ 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
274 $ echo modified >> bar
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
275 $ 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
276 $ 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
277
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
278 $ hg -q outgoing '../clone'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
279 2:faba9097cad4
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
280 4:d515801a8f3d
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
281
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
282 $ 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
283 parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
284 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
285 branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
286 commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
287 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
288 phases: 1 draft
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
289 remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
290
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
291 $ 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
292 parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
293 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
294 branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
295 commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
296 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
297 phases: 1 draft
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
298 remote: 2 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
299
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
300 $ 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
301 parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
302 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
303 branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
304 commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
305 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
306 phases: 1 draft
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
307 remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
308
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
309 $ 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
310 $ 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
311 3:4cd725637392
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
312 4:d515801a8f3d
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
313
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
314 $ 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
315 parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
316 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
317 branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
318 commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
319 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
320 phases: 1 draft
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
321 remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
322
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
323 $ cd ..
30036
3f4e1c033f40 url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents: 29978
diff changeset
324
3f4e1c033f40 url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents: 29978
diff changeset
325 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
326 a 'url#rev' path
3f4e1c033f40 url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents: 29978
diff changeset
327
3f4e1c033f40 url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents: 29978
diff changeset
328 $ hg clone repo '#foo'
3f4e1c033f40 url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents: 29978
diff changeset
329 updating to branch default
3f4e1c033f40 url: fix crash by empty path with #fragments
Yuya Nishihara <yuya@tcha.org>
parents: 29978
diff changeset
330 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
331 $ hg root -R '#foo'
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
332 $TESTTMP/#foo