Mercurial > hg

comparison tests/test-branches.out @ 8796:2bcef677a6c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: remove 'closed' argument to heads(...) function - repository heads are not associated with the closed attribute, so remove it making the code in line with the concept. - Fix functions that were calling heads with the parameter. - Adjust webcommands.branches to include the concept of inactive as well as open and closed branches - Fix code and docstrings in commands to make the correct use of closed branches & branch heads clearer - Improve grammar of 'hg heads' help text (2nd submission) this does not alter the cli for hg branches, that work is still to be done
author John Mulligan <phlogistonjohn@asynchrono.us>
date Wed, 10 Jun 2009 19:11:49 -0400
parents 405cacb06745
children 7e0b31dfc66f
comparison
equal deleted inserted replaced
8795:51c29aec0b75 8796:2bcef677a6c3
111 b 12:2da6583810df (closed) 111 b 12:2da6583810df (closed)
112 c 6:589736a22561 (inactive) 112 c 6:589736a22561 (inactive)
113 a 5:d8cbc61dbaa6 (inactive) 113 a 5:d8cbc61dbaa6 (inactive)
114 default 0:19709c5a4e75 (inactive) 114 default 0:19709c5a4e75 (inactive)
115 a branch name much longer than the default justification used by branches 7:10ff5895aa57 115 a branch name much longer than the default justification used by branches 7:10ff5895aa57
116 no open branch heads on branch b
117 changeset: 12:2da6583810df
118 branch: b
119 tag: tip
120 parent: 8:eebb944467c9
121 user: test
122 date: Thu Jan 01 00:00:09 1970 +0000
123 summary: close this part branch too
124
125 changeset: 11:c84627f3c15d
126 branch: b
127 user: test
128 date: Thu Jan 01 00:00:09 1970 +0000
129 summary: prune bad branch
130
116 --- branch b is back in action 131 --- branch b is back in action
117 b 13:6ac12926b8c3 132 b 13:6ac12926b8c3
118 a branch name much longer than the default justification used by branches 7:10ff5895aa57 133 a branch name much longer than the default justification used by branches 7:10ff5895aa57
134 ---- test heads listings
119 changeset: 13:6ac12926b8c3 135 changeset: 13:6ac12926b8c3
120 branch: b 136 branch: b
121 tag: tip 137 tag: tip
122 user: test 138 user: test
123 date: Thu Jan 01 00:00:09 1970 +0000 139 date: Thu Jan 01 00:00:09 1970 +0000
133 branch: a branch name much longer than the default justification used by branches 149 branch: a branch name much longer than the default justification used by branches
134 user: test 150 user: test
135 date: Thu Jan 01 00:00:06 1970 +0000 151 date: Thu Jan 01 00:00:06 1970 +0000
136 summary: Adding d branch 152 summary: Adding d branch
137 153
154 % branch default
155 changeset: 0:19709c5a4e75
156 user: test
157 date: Thu Jan 01 00:00:00 1970 +0000
158 summary: Adding root node
159
160 % branch a
161 changeset: 5:d8cbc61dbaa6
162 branch: a
163 parent: 2:881fe2b92ad0
164 user: test
165 date: Thu Jan 01 00:00:04 1970 +0000
166 summary: Adding b branch head 2
167
168 % branch b
138 changeset: 13:6ac12926b8c3 169 changeset: 13:6ac12926b8c3
139 branch: b 170 branch: b
140 tag: tip 171 tag: tip
141 user: test 172 user: test
142 date: Thu Jan 01 00:00:09 1970 +0000 173 date: Thu Jan 01 00:00:09 1970 +0000
143 summary: reopen branch with a change 174 summary: reopen branch with a change
144 175
145 changeset: 7:10ff5895aa57 176 changeset: 13:6ac12926b8c3
146 branch: a branch name much longer than the default justification used by branches 177 branch: b
178 tag: tip
147 user: test 179 user: test
148 date: Thu Jan 01 00:00:06 1970 +0000 180 date: Thu Jan 01 00:00:09 1970 +0000
149 summary: Adding d branch 181 summary: reopen branch with a change
150 182
183 changeset: 11:c84627f3c15d
184 branch: b
185 user: test
186 date: Thu Jan 01 00:00:09 1970 +0000
187 summary: prune bad branch
188