Show More
@@ -3159,8 +3159,12 b' def qqueue(ui, repo, name=None, **opts):' | |||||
3159 | def mqphasedefaults(repo, roots): |
|
3159 | def mqphasedefaults(repo, roots): | |
3160 | """callback used to set mq changeset as secret when no phase data exists""" |
|
3160 | """callback used to set mq changeset as secret when no phase data exists""" | |
3161 | if repo.mq.applied: |
|
3161 | if repo.mq.applied: | |
|
3162 | if repo.ui.configbool('mq', 'secret', False): | |||
|
3163 | mqphase = phases.secret | |||
|
3164 | else: | |||
|
3165 | mqphase = phases.draft | |||
3162 | qbase = repo[repo.mq.applied[0].node] |
|
3166 | qbase = repo[repo.mq.applied[0].node] | |
3163 |
roots[phase |
|
3167 | roots[mqphase].add(qbase.node()) | |
3164 | return roots |
|
3168 | return roots | |
3165 |
|
3169 | |||
3166 | def reposetup(ui, repo): |
|
3170 | def reposetup(ui, repo): |
@@ -1448,4 +1448,19 b' insensitive filesystem is not enough:' | |||||
1448 | applying modify-file |
|
1448 | applying modify-file | |
1449 | now at: modify-file |
|
1449 | now at: modify-file | |
1450 |
|
1450 | |||
1451 | $ cd .. |
|
1451 | Proper phase default with mq: | |
|
1452 | ||||
|
1453 | 1. mq.secret=false | |||
|
1454 | ||||
|
1455 | $ rm .hg/store/phaseroots | |||
|
1456 | $ hg phase 'qparent::' | |||
|
1457 | 0: draft | |||
|
1458 | 1: draft | |||
|
1459 | 2: draft | |||
|
1460 | $ echo '[mq]' >> $HGRCPATH | |||
|
1461 | $ echo 'secret=true' >> $HGRCPATH | |||
|
1462 | $ rm -f .hg/store/phaseroots | |||
|
1463 | $ hg phase 'qparent::' | |||
|
1464 | 0: secret | |||
|
1465 | 1: secret | |||
|
1466 | 2: secret |
General Comments 0
You need to be logged in to leave comments.
Login now