Mercurial > hg-stable
comparison tests/test-branches.t @ 14162:301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
This speeds up the in-memory version of debugbuilddag that I'm
working on considerably for the case where we want to build just
a 00changelog.i (for discovery tests, for instance).
There are a couple of test changes because node ids in tests
have changed.
The changes to the patch names in test-mq-qdelete.t were required
because they could collide with nodeid abbreviations and newly
actually do (patch "c" collides with id "cafe..." for patch "b").
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Mon, 02 May 2011 19:20:29 +0200 |
| parents | e0f07847f8de |
| children | 41885892796e |
comparison
equal
deleted
inserted
replaced
| 14161:8a0fca925992 | 14162:301725c3df9a |
|---|---|
| 228 c 6:589736a22561 (inactive) | 228 c 6:589736a22561 (inactive) |
| 229 a 5:d8cbc61dbaa6 (inactive) | 229 a 5:d8cbc61dbaa6 (inactive) |
| 230 default 0:19709c5a4e75 (inactive) | 230 default 0:19709c5a4e75 (inactive) |
| 231 $ hg branches -c | 231 $ hg branches -c |
| 232 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | 232 a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
| 233 b 12:2da6583810df (closed) | 233 b 12:e3d49c0575d8 (closed) |
| 234 c 6:589736a22561 (inactive) | 234 c 6:589736a22561 (inactive) |
| 235 a 5:d8cbc61dbaa6 (inactive) | 235 a 5:d8cbc61dbaa6 (inactive) |
| 236 default 0:19709c5a4e75 (inactive) | 236 default 0:19709c5a4e75 (inactive) |
| 237 $ hg branches -a | 237 $ hg branches -a |
| 238 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | 238 a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
| 239 $ hg heads b | 239 $ hg heads b |
| 240 no open branch heads found on branches b | 240 no open branch heads found on branches b |
| 241 [1] | 241 [1] |
| 242 $ hg heads --closed b | 242 $ hg heads --closed b |
| 243 changeset: 12:2da6583810df | 243 changeset: 12:e3d49c0575d8 |
| 244 branch: b | 244 branch: b |
| 245 tag: tip | 245 tag: tip |
| 246 parent: 8:eebb944467c9 | 246 parent: 8:eebb944467c9 |
| 247 user: test | 247 user: test |
| 248 date: Thu Jan 01 00:00:09 1970 +0000 | 248 date: Thu Jan 01 00:00:09 1970 +0000 |
| 249 summary: close this part branch too | 249 summary: close this part branch too |
| 250 | 250 |
| 251 changeset: 11:c84627f3c15d | 251 changeset: 11:d3f163457ebf |
| 252 branch: b | 252 branch: b |
| 253 user: test | 253 user: test |
| 254 date: Thu Jan 01 00:00:09 1970 +0000 | 254 date: Thu Jan 01 00:00:09 1970 +0000 |
| 255 summary: prune bad branch | 255 summary: prune bad branch |
| 256 | 256 |
| 259 reopening closed branch head 12 | 259 reopening closed branch head 12 |
| 260 | 260 |
| 261 --- branch b is back in action | 261 --- branch b is back in action |
| 262 | 262 |
| 263 $ hg branches -a | 263 $ hg branches -a |
| 264 b 13:6ac12926b8c3 | 264 b 13:e23b5505d1ad |
| 265 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | 265 a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
| 266 | 266 |
| 267 ---- test heads listings | 267 ---- test heads listings |
| 268 | 268 |
| 269 $ hg heads | 269 $ hg heads |
| 270 changeset: 13:6ac12926b8c3 | 270 changeset: 13:e23b5505d1ad |
| 271 branch: b | 271 branch: b |
| 272 tag: tip | 272 tag: tip |
| 273 user: test | 273 user: test |
| 274 date: Thu Jan 01 00:00:09 1970 +0000 | 274 date: Thu Jan 01 00:00:09 1970 +0000 |
| 275 summary: reopen branch with a change | 275 summary: reopen branch with a change |
| 323 [1] | 323 [1] |
| 324 | 324 |
| 325 branch b | 325 branch b |
| 326 | 326 |
| 327 $ hg heads b | 327 $ hg heads b |
| 328 changeset: 13:6ac12926b8c3 | 328 changeset: 13:e23b5505d1ad |
| 329 branch: b | 329 branch: b |
| 330 tag: tip | 330 tag: tip |
| 331 user: test | 331 user: test |
| 332 date: Thu Jan 01 00:00:09 1970 +0000 | 332 date: Thu Jan 01 00:00:09 1970 +0000 |
| 333 summary: reopen branch with a change | 333 summary: reopen branch with a change |
| 334 | 334 |
| 335 $ hg heads --closed b | 335 $ hg heads --closed b |
| 336 changeset: 13:6ac12926b8c3 | 336 changeset: 13:e23b5505d1ad |
| 337 branch: b | 337 branch: b |
| 338 tag: tip | 338 tag: tip |
| 339 user: test | 339 user: test |
| 340 date: Thu Jan 01 00:00:09 1970 +0000 | 340 date: Thu Jan 01 00:00:09 1970 +0000 |
| 341 summary: reopen branch with a change | 341 summary: reopen branch with a change |
| 342 | 342 |
| 343 changeset: 11:c84627f3c15d | 343 changeset: 11:d3f163457ebf |
| 344 branch: b | 344 branch: b |
| 345 user: test | 345 user: test |
| 346 date: Thu Jan 01 00:00:09 1970 +0000 | 346 date: Thu Jan 01 00:00:09 1970 +0000 |
| 347 summary: prune bad branch | 347 summary: prune bad branch |
| 348 | 348 |
| 357 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | 357 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 358 $ hg commit -d '9 0' --close-branch -m 'reclosing this branch' | 358 $ hg commit -d '9 0' --close-branch -m 'reclosing this branch' |
| 359 $ hg up -C b | 359 $ hg up -C b |
| 360 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | 360 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 361 $ hg branches --color=always | 361 $ hg branches --color=always |
| 362 \x1b[0;32mb\x1b[0m \x1b[0;33m 13:6ac12926b8c3\x1b[0m (esc) | 362 \x1b[0;32mb\x1b[0m \x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) |
| 363 \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc) | 363 \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc) |
| 364 \x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | 364 \x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
| 365 \x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) | 365 \x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
| 366 | 366 |
| 367 default closed branch color: | 367 default closed branch color: |
| 368 | 368 |
| 369 $ hg branches --color=always --closed | 369 $ hg branches --color=always --closed |
| 370 \x1b[0;32mb\x1b[0m \x1b[0;33m 13:6ac12926b8c3\x1b[0m (esc) | 370 \x1b[0;32mb\x1b[0m \x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) |
| 371 \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc) | 371 \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc) |
| 372 \x1b[0;30;1mc\x1b[0m \x1b[0;33m 14:717d2e6fabe1\x1b[0m (closed) (esc) | 372 \x1b[0;30;1mc\x1b[0m \x1b[0;33m 14:f894c25619d3\x1b[0m (closed) (esc) |
| 373 \x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | 373 \x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
| 374 \x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) | 374 \x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
| 375 | 375 |
| 376 $ echo "[extensions]" >> $HGRCPATH | 376 $ echo "[extensions]" >> $HGRCPATH |
| 377 $ echo "color =" >> $HGRCPATH | 377 $ echo "color =" >> $HGRCPATH |
| 383 $ echo "log.changeset = cyan" >> $HGRCPATH | 383 $ echo "log.changeset = cyan" >> $HGRCPATH |
| 384 | 384 |
| 385 custom branch colors: | 385 custom branch colors: |
| 386 | 386 |
| 387 $ hg branches --color=always | 387 $ hg branches --color=always |
| 388 \x1b[0;31mb\x1b[0m \x1b[0;36m 13:6ac12926b8c3\x1b[0m (esc) | 388 \x1b[0;31mb\x1b[0m \x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) |
| 389 \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc) | 389 \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc) |
| 390 \x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | 390 \x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
| 391 \x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) | 391 \x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
| 392 | 392 |
| 393 custom closed branch color: | 393 custom closed branch color: |
| 394 | 394 |
| 395 $ hg branches --color=always --closed | 395 $ hg branches --color=always --closed |
| 396 \x1b[0;31mb\x1b[0m \x1b[0;36m 13:6ac12926b8c3\x1b[0m (esc) | 396 \x1b[0;31mb\x1b[0m \x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) |
| 397 \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc) | 397 \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc) |
| 398 \x1b[0;34mc\x1b[0m \x1b[0;36m 14:717d2e6fabe1\x1b[0m (closed) (esc) | 398 \x1b[0;34mc\x1b[0m \x1b[0;36m 14:f894c25619d3\x1b[0m (closed) (esc) |
| 399 \x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | 399 \x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
| 400 \x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) | 400 \x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |