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
|
#testcases publish-defaults publish-specific
Phases
======
This test verifies our behaviour with the ``hggit.usephases`` option.
We run it in two modes:
1) The defaults, i.e. the remote HEAD.
2) Specificly set what should be published to correspond to the defaults.
Load commonly used test logic
$ . "$TESTDIR/testutil"
$ git init gitrepo
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
$ cd gitrepo
$ git config receive.denyCurrentBranch ignore
$ echo alpha > alpha
$ git add alpha
$ fn_git_commit -m "add alpha"
$ cd ..
cloning with hggit.usephases publishes cloned HEAD
$ hg --config hggit.usephases=True clone -U gitrepo hgrepo
importing 1 git commits
new changesets ff7a2f2d8d70
$ cd hgrepo
$ hg phase -r master
0: public
$ cd ..
pulled changesets are public
$ cd gitrepo
$ git checkout -q master
$ echo beta > beta
$ git add beta
$ fn_git_commit -m 'add beta'
$ git checkout -b not-master
Switched to a new branch 'not-master'
$ echo gamma > gamma
$ git add gamma
$ fn_git_commit -m 'add gamma'
$ git tag thetag
$ echo delta > delta
$ git add delta
$ fn_git_commit -m 'add delta'
$ git checkout master
Switched to branch 'master'
$ cd ..
$ cd hgrepo
$ cat >>$HGRCPATH <<EOF
> [paths]
> other = $TESTTMP/gitrepo/.git
> [hggit]
> usephases = True
> EOF
$ hg phase -fd 'all()'
we can restrict publishing to the remote HEAD and that tag, which
happens to be the same thing here
#if publish-specific
$ cat >>$HGRCPATH <<EOF
> [git]
> public = default/master, thetag
> EOF
#endif
pulling publishes the branch
$ hg phase -r master
0: draft
#if publish-defaults
$ hg pull -r master other
pulling from $TESTTMP/gitrepo/.git
importing 1 git commits
updating bookmark master
new changesets 7fe02317c63d
1 local changesets published
(run 'hg update' to get a working copy)
#else
$ hg pull -r master other
pulling from $TESTTMP/gitrepo/.git
importing 1 git commits
updating bookmark master
new changesets 7fe02317c63d (1 drafts)
(run 'hg update' to get a working copy)
#endif
$ hg phase -r master
1: draft (publish-specific !)
1: public (publish-defaults !)
#if publish-defaults
$ hg phase -fd master
$ hg pull
pulling from $TESTTMP/gitrepo
importing 2 git commits
adding bookmark not-master
new changesets ca33a262eb46:03769a650ded (1 drafts)
1 local changesets published
(run 'hg update' to get a working copy)
#else
$ hg pull
pulling from $TESTTMP/gitrepo
importing 2 git commits
adding bookmark not-master
new changesets ca33a262eb46:03769a650ded (1 drafts)
2 local changesets published
(run 'hg update' to get a working copy)
#endif
$ hg phase -r master -r not-master -r thetag
1: public
3: draft
2: public
public bookmark not pushed is not published after pull
$ hg update 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo delta > delta
$ hg bookmark not-pushed
$ hg add delta
$ hg commit -m 'add delta'
created new head
$ hg phase -r 'all()' > $TESTTMP/before
$ hg pull --config git.public=master,not-pushed
pulling from $TESTTMP/gitrepo
no changes found
$ hg phase -r 'all()' > $TESTTMP/after
$ cmp -s $TESTTMP/before $TESTTMP/after
$ hg phase -r not-pushed
4: draft
$ rm $TESTTMP/before $TESTTMP/after
pushing public bookmark publishes local changesets, but only those
actually pushed
$ hg update master
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark master)
$ echo epsilon > epsilon
$ hg add epsilon
$ hg commit -m 'add epsilon'
created new head
$ hg phase -r 'all() - master' > $TESTTMP/before
$ hg push -B not-pushed
pushing to $TESTTMP/gitrepo
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
adding reference refs/heads/not-pushed
$ hg phase -r 'all() - master' > $TESTTMP/after
$ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+'
$ hg phase -r not-pushed -r master
4: draft
5: draft
$ hg push -B master
pushing to $TESTTMP/gitrepo
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ hg phase -r 'all() - master' > $TESTTMP/after
$ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+'
$ hg phase -r master
5: public
|
