Mercurial > hg

annotate tests/test-remotenames.t @ 35256:8fbb2678d8e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove {a..h} bashism from remotenames I'm not bothering with a check-code test because this is a weird construct that I didn't even know existed before it was breaking the BSD build, and it also appears to fail if /bin/sh is dash like it is on our Linux builder. Differential Revision: https://phab.mercurial-scm.org/D1605
author Augie Fackler <augie@google.com>
date Wed, 06 Dec 2017 09:25:43 -0500
parents 2ea6e42ed15e
children 773a9a06047c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
35236
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
1 Testing the functionality to pull remotenames
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
2 =============================================
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
3
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
4 $ cat >> $HGRCPATH << EOF
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
5 > [alias]
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
6 > glog = log -G -T '{rev}:{node|short} {desc}'
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
7 > EOF
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
8
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
9 Making a server repo
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
10 --------------------
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
11
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
12 $ hg init server
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
13 $ cd server
35256
8fbb2678d8e8 tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents: 35240
diff changeset
14 $ for ch in a b c d e f g h; do
8fbb2678d8e8 tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents: 35240
diff changeset
15 > echo "foo" >> $ch
8fbb2678d8e8 tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents: 35240
diff changeset
16 > hg ci -Aqm "Added "$ch
8fbb2678d8e8 tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents: 35240
diff changeset
17 > done
35236
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
18 $ hg glog
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
19 @ 7:ec2426147f0e Added h
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
20 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
21 o 6:87d6d6676308 Added g
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
22 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
23 o 5:825660c69f0c Added f
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
24 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
25 o 4:aa98ab95a928 Added e
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
26 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
27 o 3:62615734edd5 Added d
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
28 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
29 o 2:28ad74487de9 Added c
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
30 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
31 o 1:29becc82797a Added b
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
32 |
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
33 o 0:18d04c59bb5d Added a
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
34
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
35 $ hg bookmark -r 3 foo
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
36 $ hg bookmark -r 6 bar
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
37 $ hg up 4
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
38 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
39 $ hg branch wat
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
40 marked working directory as branch wat
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
41 (branches are permanent and global, did you want a bookmark?)
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
42 $ echo foo >> bar
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
43 $ hg ci -Aqm "added bar"
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
44
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
45 Making a client repo
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
46 --------------------
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
47
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
48 $ cd ..
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
49 $ hg init client
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
50 $ cd client
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
51 $ cat >> .hg/hgrc << EOF
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
52 > [experimental]
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
53 > remotenames = True
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
54 > EOF
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
55
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
56 $ hg pull ../server/
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
57 pulling from ../server/
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
58 requesting all changes
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
59 adding changesets
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
60 adding manifests
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
61 adding file changes
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
62 added 9 changesets with 9 changes to 9 files (+1 heads)
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
63 adding remote bookmark bar
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
64 adding remote bookmark foo
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
65 new changesets 18d04c59bb5d:3e1487808078
35237
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
66 (run 'hg heads' to see heads)
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
67
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
68 $ cat .hg/remotenames/bookmarks
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
69 0
35236
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
70
35237
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
71 87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
72 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
73
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
74 $ cat .hg/remotenames/branches
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
75 0
35236
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
76
35237
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
77 ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35236
diff changeset
78 3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)
35238
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
79
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
80 Making a new server
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
81 -------------------
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
82
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
83 $ cd ..
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
84 $ hg init server2
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
85 $ cd server2
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
86 $ hg pull ../server/
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
87 pulling from ../server/
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
88 requesting all changes
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
89 adding changesets
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
90 adding manifests
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
91 adding file changes
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
92 added 9 changesets with 9 changes to 9 files (+1 heads)
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
93 adding remote bookmark bar
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
94 adding remote bookmark foo
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
95 new changesets 18d04c59bb5d:3e1487808078
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
96 (run 'hg heads' to see heads)
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
97
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
98 Pulling form the new server
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
99 ---------------------------
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
100 $ cd ../client/
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
101 $ hg pull ../server2/
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
102 pulling from ../server2/
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
103 searching for changes
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
104 no changes found
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
105 $ cat .hg/remotenames/bookmarks
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
106 0
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
107
35240
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35238
diff changeset
108 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35238
diff changeset
109 87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)
35238
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
110 87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server2\x00bar (esc)
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
111 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server2\x00foo (esc)
35240
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35238
diff changeset
112
35238
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
113 $ cat .hg/remotenames/branches
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
114 0
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
115
35240
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35238
diff changeset
116 3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35238
diff changeset
117 ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)
35238
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
118 ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server2\x00default (esc)
54bb94b715ad remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35237
diff changeset
119 3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server2\x00wat (esc)