[PATCH 1 of 6] phases: properly register excluded changeset when revision are specified

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Jan 20 20:30:53 UTC 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1327015631 -3600
# Branch stable
# Node ID 475afd5eb09b0a68dc0d563c83596dcc9a3a2dfe
# Parent  7ed056f1e97db94338c7ef1c49fd5dd49870f3e3
phases: properly register excluded changeset when revision are specified

There was no other drawback than a bad UI message for now.

diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -116,7 +116,7 @@
         sets = repo.changelog.findcommonmissing(og.commonheads, onlyheads)
         og._common, allmissing = sets
         og._missing = missing = []
-        og._excluded = excluded = []
+        og.excluded = excluded = []
         for node in allmissing:
             if repo[node].phase() >= phases.secret:
                 excluded.append(node)
diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t
--- a/tests/test-mq-safety.t
+++ b/tests/test-mq-safety.t
@@ -171,7 +171,7 @@
   $ hg push --force -r default ../forcepush2
   pushing to ../forcepush2
   searching for changes
-  no changes found
+  no changes to push but 1 secret changesets
   $ hg phase -d 'mq()'
   $ hg push --force -r default ../forcepush2
   pushing to ../forcepush2



More information about the Mercurial-devel mailing list