[PATCH 07 of 10] qfinish: do not set secret changeset to draft if mq.secret=false
pierre-yves.david at logilab.fr
pierre-yves.david at logilab.fr
Mon Jan 30 10:49:41 CST 2012
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1327933028 -3600
# Branch stable
# Node ID 3bb3d9aa2b12313264fe346fbb48d40d83e31de7
# Parent 333e923770884d2adf04668644bb7444fa7c6e27
qfinish: do not set secret changeset to draft if mq.secret=false
If mq.secret=false, mq should not touch phase
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -824,13 +824,17 @@ class queue(object):
patches.append(patch)
return patches
def finish(self, repo, revs):
+ # Manually trigger phase computation to ensure phasedefaults is
+ # executed before we remove the patches.
+ repo._phaserev
patches = self._revpatches(repo, sorted(revs))
qfinished = self._cleanup(patches, len(patches))
- if qfinished:
+ if qfinished and repo.ui.configbool('mq', 'secret', False):
+ # only use this logic when the secret option is added
oldqbase = repo[qfinished[0]]
if oldqbase.p1().phase() < phases.secret:
phases.advanceboundary(repo, phases.draft, qfinished)
def delete(self, repo, patches, opts):
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -1462,5 +1462,24 @@ 1. mq.secret=false
$ rm -f .hg/store/phaseroots
$ hg phase 'qparent::'
0: secret
1: secret
2: secret
+
+Test that qfinish change phase when mq.secret=true
+
+ $ hg qfinish qbase
+ patch add-file1 finalized without changeset message
+ $ hg phase 'all()'
+ 0: draft
+ 1: secret
+ 2: secret
+
+Test that qfinish preserve phase when mq.secret=false
+
+ $ sed -i'' $HGRCPATH -e 's/secret=true/secret=false/'
+ $ hg qfinish qbase
+ patch add-file2 finalized without changeset message
+ $ hg phase 'all()'
+ 0: draft
+ 1: secret
+ 2: secret
More information about the Mercurial-devel
mailing list