1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
This test demonstrates how Hg works with remote Hg bookmarks compared with
remote branches via Hg-Git. Ideally, they would behave identically. In
practice, some differences are unavoidable, but we should try to minimize
them.
This test should not bother testing the behavior of bookmark creation,
deletion, activation, deactivation, etc. These behaviors, while important to
the end user, don't vary at all when Hg-Git is in use. Only the synchonization
of bookmarks should be considered "under test", and mutation of bookmarks
locally is only to provide a test fixture.
Load commonly used test logic
$ . "$TESTDIR/testutil"
$ gitcount=10
$ gitcommit()
> {
> GIT_AUTHOR_DATE="2007-01-01 00:00:$gitcount +0000"
> GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
> git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
> gitcount=`expr $gitcount + 1`
> }
$ hgcount=10
$ hgcommit()
> {
> HGDATE="2007-01-01 00:00:$hgcount +0000"
> hg commit -u "test <test@example.org>" -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg commit error"
> hgcount=`expr $hgcount + 1`
> }
$ gitstate()
> {
> git log --format=" %h \"%s\" refs:%d" $@ | sed 's/HEAD, //'
> }
$ hgstate()
> {
> hg log --template " {rev} {node|short} \"{desc}\" bookmarks: [{bookmarks}]\n" $@
> }
$ hggitstate()
> {
> hg log --template " {rev} {node|short} {gitnode|short} \"{desc}\" bookmarks: [{bookmarks}]\n" $@
> }
Initialize remote hg and git repos with equivalent initial contents
$ hg init hgremoterepo
$ cd hgremoterepo
$ hg bookmark master
$ for f in alpha beta gamma delta; do
> echo $f > $f; hg add $f; hgcommit -m "add $f"
> done
$ hg bookmark -r 1 b1
$ hgstate
3 fc2664cac217 "add delta" bookmarks: [master]
2 d85ced7ae9d6 "add gamma" bookmarks: []
1 7bcd915dc873 "add beta" bookmarks: [b1]
0 3442585be8a6 "add alpha" bookmarks: []
$ cd ..
$ git init -q gitremoterepo
$ cd gitremoterepo
$ for f in alpha beta gamma delta; do
> echo $f > $f; git add $f; gitcommit -m "add $f"
> done
$ git branch b1 9497a4e
$ gitstate
55b133e "add delta" refs: (*master) (glob)
d338971 "add gamma" refs:
9497a4e "add beta" refs: (b1)
7eeab2e "add alpha" refs:
$ cd ..
Cloning transfers all bookmarks from remote to local
$ hg clone -q hgremoterepo purehglocalrepo
$ cd purehglocalrepo
$ hgstate
3 fc2664cac217 "add delta" bookmarks: [master]
2 d85ced7ae9d6 "add gamma" bookmarks: []
1 7bcd915dc873 "add beta" bookmarks: [b1]
0 3442585be8a6 "add alpha" bookmarks: []
$ cd ..
$ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True
$ cd hggitlocalrepo
$ hggitstate
3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master]
2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: []
1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1]
0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: []
Make sure that master is public
$ hg phase -r master
3: public
$ cd ..
No changes
$ cd purehglocalrepo
$ hg incoming -B
comparing with $TESTTMP/hgremoterepo
searching for changed bookmarks
no changed bookmarks found
[1]
$ hg outgoing
comparing with $TESTTMP/hgremoterepo
searching for changes
no changes found
[1]
$ hg outgoing -B
comparing with $TESTTMP/hgremoterepo
searching for changed bookmarks
no changed bookmarks found
[1]
$ hg push
pushing to $TESTTMP/hgremoterepo
searching for changes
no changes found
[1]
$ cd ..
$ cd hggitlocalrepo
$ hg incoming -B
comparing with $TESTTMP/gitremoterepo
searching for changed bookmarks
no changed bookmarks found
[1]
$ hg outgoing
comparing with $TESTTMP/gitremoterepo
searching for changes
no changes found
[1]
$ hg outgoing -B
comparing with $TESTTMP/gitremoterepo
searching for changed bookmarks
no changed bookmarks found
[1]
$ hg push
pushing to $TESTTMP/gitremoterepo
searching for changes
no changes found
[1]
$ cd ..
Bookmarks on existing revs:
- change b1 on local repo
- introduce b2 on local repo
- introduce b3 on remote repo
Bookmarks on new revs
- introduce b4 on a new rev on the remote
$ cd hgremoterepo
$ hg bookmark -r master b3
$ hg bookmark -r master b4
$ hg update -q b4
$ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon'
$ hgstate
4 d979bb8e0fbb "add epsilon" bookmarks: [b4]
3 fc2664cac217 "add delta" bookmarks: [b3 master]
2 d85ced7ae9d6 "add gamma" bookmarks: []
1 7bcd915dc873 "add beta" bookmarks: [b1]
0 3442585be8a6 "add alpha" bookmarks: []
$ cd ..
$ cd purehglocalrepo
$ hg bookmark -fr 2 b1
$ hg bookmark -r 0 b2
$ hgstate
3 fc2664cac217 "add delta" bookmarks: [master]
2 d85ced7ae9d6 "add gamma" bookmarks: [b1]
1 7bcd915dc873 "add beta" bookmarks: []
0 3442585be8a6 "add alpha" bookmarks: [b2]
$ hg incoming -B
comparing with $TESTTMP/hgremoterepo
searching for changed bookmarks
b3 fc2664cac217
b4 d979bb8e0fbb
$ hg outgoing
comparing with $TESTTMP/hgremoterepo
searching for changes
no changes found
[1]
As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks
It only shows "new" bookmarks. Thus, b1 doesn't show up.
This changed in 3.4 to start showing changed and deleted bookmarks again.
$ hg outgoing -B | grep -v -E -w 'b1|b3|b4'
comparing with $TESTTMP/hgremoterepo
searching for changed bookmarks
b2 3442585be8a6
$ cd ..
$ cd gitremoterepo
$ git branch b3 master
$ git checkout -b b4 master
Switched to a new branch 'b4'
$ echo epsilon > epsilon
$ git add epsilon
$ gitcommit -m 'add epsilon'
$ gitstate
fcfd2c0 "add epsilon" refs: (*b4) (glob)
55b133e "add delta" refs: (master, b3)
d338971 "add gamma" refs:
9497a4e "add beta" refs: (b1)
7eeab2e "add alpha" refs:
$ cd ..
$ cd hggitlocalrepo
$ hg bookmark -fr 2 b1
$ hg bookmark -r 0 b2
$ hgstate
3 03769a650ded "add delta" bookmarks: [master]
2 ca33a262eb46 "add gamma" bookmarks: [b1]
1 7fe02317c63d "add beta" bookmarks: []
0 ff7a2f2d8d70 "add alpha" bookmarks: [b2]
$ hg incoming -B
comparing with $TESTTMP/gitremoterepo
searching for changed bookmarks
b3 03769a650ded
b4 fcfd2c0262db
$ hg outgoing
comparing with $TESTTMP/gitremoterepo
searching for changes
no changes found
[1]
As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks
It only shows "new" bookmarks. Thus, b1 doesn't show up.
This changed in 3.4 to start showing changed and deleted bookmarks again.
$ hg outgoing -B
comparing with $TESTTMP/gitremoterepo
searching for changed bookmarks
b1 ca33a262eb46
b2 ff7a2f2d8d70
b3
b4
$ cd ..
|
