Mercurial > hg-allpaths

annotate tests/basic.t @ 43:a1fb32ff4532

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further work on tests
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sat, 24 Sep 2016 23:31:49 +0200
parents aa0032c0ada8
children 2d6c7e0c1b2f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
1
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
2 Let's test all_paths operations.
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
3
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
4 Some locations used during testing:
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
5
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
6 $ WORK_DIR=${WORK_DIR-`pwd`/work}
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
7 $ rm -rf $WORK_DIR
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
8
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
9 $ export BASE=$WORK_DIR/base
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
10 $ export REP1=$WORK_DIR/rep1
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
11 $ export REP2=$WORK_DIR/rep2
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
12 $ export REP3=$WORK_DIR/rep3
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
13
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
14 First we need appropriate Mercurial configuration file (and variable
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
15 which ensures it is used).
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
16
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
17 $ export HGRCPATH=$WORK_DIR/hgrc
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
18 $ mkdir -p $HGRCPATH
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
19
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
20 $ cat > $HGRCPATH/basic.rc << EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
21 > [ui]
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
22 > username = Andy Default <default@nowhere.net>
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
23 > [extensions]
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
24 > mercurial_all_paths =
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
25 > EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
26
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
27 We need some repositories to test.
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
28
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
29 $ hg init "$BASE"
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
30 $ hg init "$REP1"
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
31 $ hg init "$REP2"
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
32 $ hg init "$REP3"
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
33
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
34 $ cat > $BASE/.hg/hgrc << EOF
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
35 > [paths]
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
36 > remote1=$REP1
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
37 > remote2=$REP2
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
38 > remote3=$REP3
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
39 > EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
40
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
41 Let's test pushing
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
42
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
43 $ cat > $BASE/file.txt << EOF
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
44 > Some text
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
45 > EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
46
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
47 $ hg --cwd $BASE add
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
48 adding file.txt
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
49 $ hg --cwd $BASE commit -m 'First'
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
50
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
51 $ hg --cwd $BASE pushal
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
52 pushing to */rep1 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
53 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
54 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
55 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
56 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
57 added 1 changesets with 1 changes to 1 files
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
58 pushing to */rep2 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
59 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
60 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
61 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
62 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
63 added 1 changesets with 1 changes to 1 files
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
64 pushing to */rep3 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
65 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
66 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
67 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
68 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
69 added 1 changesets with 1 changes to 1 files
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
70
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
71 $ hg --cwd $REP1 log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
72 0: First
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
73
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
74 $ hg --cwd $REP2 log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
75 0: First
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
76
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
77 $ hg --cwd $REP3 log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
78 0: First
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
79
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
80 Let's also test pulling
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
81
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
82 $ hg --cwd $REP1 update
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
84
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
85 $ cat > $REP1/rep1.txt << EOF
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
86 > Another text
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
87 > EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
88
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
89 $ hg --cwd $REP1 add
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
90 adding rep1.txt
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
91 $ hg --cwd $REP1 commit -m "In repo1"
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
92
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
93
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
94 $ hg --cwd $REP2 update
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
96
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
97 $ cat >> $REP2/file.txt << EOF
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
98 > From repo2…
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
99 > EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
100
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
101 $ hg --cwd $REP2 add
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
102 $ hg --cwd $REP2 commit -m "In repo2"
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
103
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
104 $ hg --cwd $BASE incomingall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
105 comparing with */rep1 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
106 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
107 changeset: 1:* (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
108 tag: tip
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
109 user: Andy Default <default@nowhere.net>
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
110 date: .* (re)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
111 summary: In repo1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
112
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
113 comparing with */rep2 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
114 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
115 changeset: 1:* (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
116 tag: tip
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
117 user: Andy Default <default@nowhere.net>
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
118 date: .* (re)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
119 summary: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
120
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
121 comparing with */rep3 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
122 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
123 no changes found
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
124
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
125 $ hg --cwd $BASE pullall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
126 pulling from */rep1 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
127 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
128 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
129 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
130 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
131 added 1 changesets with 1 changes to 1 files
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
132 (run 'hg update' to get a working copy)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
133 pulling from */rep2 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
134 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
135 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
136 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
137 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
138 added 1 changesets with 1 changes to 1 files (+1 heads)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
139 (run 'hg heads' to see heads, 'hg merge' to merge)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
140 pulling from */rep3 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
141 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
142 no changes found
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
143
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
144 $ hg --cwd $BASE log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
145 2: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
146 1: In repo1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
147 0: First
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
148
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
149 $ hg --cwd $BASE outgoingall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
150 comparing with */rep1 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
151 searching for changes
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
152 changeset: 2:.* (re)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
153 tag: tip
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
154 parent: 0:.* (re)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
155 user: Andy Default <default@nowhere.net>
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
156 date: .* (re)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
157 summary: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
158
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
159 comparing with */rep2 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
160 searching for changes
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
161 changeset: 1:* (glob)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
162 user: Andy Default <default@nowhere.net>
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
163 date: .* (re)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
164 summary: In repo1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
165
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
166 comparing with */rep3 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
167 searching for changes
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
168 changeset: 1:* (glob)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
169 user: Andy Default <default@nowhere.net>
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
170 date: .* (re)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
171 summary: In repo1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
172
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
173 changeset: 2:* (glob)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
174 tag: tip
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
175 parent: 0:* (glob)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
176 user: Andy Default <default@nowhere.net>
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
177 date: .* (re)
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
178 summary: In repo2
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
179
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
180
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
181 Without remotes those commands do nothing
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
182
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
183 $ hg --cwd $REP3 pullall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
184 abort: No paths defined in section paths
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
185 [255]
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
186
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
187 $ hg --cwd $REP3 pushall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
188 abort: No paths defined in section paths
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
189 [255]
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
190
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
191 $ hg --cwd $REP3 incomingall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
192 abort: No paths defined in section paths
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
193 [255]
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
194
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
195 $ hg --cwd $REP3 outgoingall
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
196 abort: No paths defined in section paths
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
197 [255]
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
198
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
199 Finally let's test that push options work
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
200
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
201 $ cat > $BASE/br1.txt << EOF
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
202 > Br1 text
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
203 > EOF
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
204
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
205 $ hg --cwd $BASE branch br1
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
206 marked working directory as branch br1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
207 (branches are permanent and global, did you want a bookmark?)
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
208 $ hg --cwd $BASE add
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
209 adding br1.txt
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
210 $ hg --cwd $BASE commit -m 'Br1'
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
211
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
212 $ hg --cwd $BASE update default
39
aa0032c0ada8 Basic tests properly pass
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 38
diff changeset
213 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
214 $ cat >> $BASE/file.txt << EOF
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
215 > later text
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
216 > EOF
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
217 $ hg --cwd $BASE commit -m 'Normal'
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
218
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
219 $ hg --cwd $BASE pushall -r default -f
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
220 pushing to */rep1 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
221 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
222 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
223 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
224 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
225 added 2 changesets with 2 changes to 1 files (+1 heads)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
226 pushing to */rep2 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
227 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
228 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
229 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
230 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
231 added 1 changesets with 1 changes to 1 files
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
232 pushing to */rep3 (glob)
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
233 searching for changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
234 adding changesets
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
235 adding manifests
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
236 adding file changes
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
237 added 2 changesets with 2 changes to 1 files
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
238
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
239 $ hg --cwd $BASE log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
240 4: Normal
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
241 3: Br1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
242 2: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
243 1: In repo1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
244 0: First
37
cf3fe04cd96b Initial work on testing
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents:
diff changeset
245
38
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
246 $ hg --cwd $REP1 log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
247 3: Normal
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
248 2: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
249 1: In repo1
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
250 0: First
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
251
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
252 $ hg --cwd $REP2 log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
253 2: Normal
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
254 1: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
255 0: First
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
256
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
257 $ hg --cwd $REP3 log -T '{rev}: {desc}\n'
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
258 2: Normal
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
259 1: In repo2
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
260 0: First
f371747bb8fc Improving basic tests
Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
parents: 37
diff changeset
261