Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: properly register excluded changeset when revision are specified stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 20 Jan 2012 00:27:11 +0100
branchstable
changeset 15951 bd84fc0b5f64
parent 15950 27f56b73522c
child 15952 ec8a9e06cf05
phases: properly register excluded changeset when revision are specified There was no other drawback than a bad UI message for now.
mercurial/discovery.py file | annotate | diff | comparison | revisions
tests/test-mq-safety.t file | annotate | diff | comparison | revisions 
--- a/mercurial/discovery.py	Fri Jan 20 14:19:13 2012 -0600
+++ b/mercurial/discovery.py	Fri Jan 20 00:27:11 2012 +0100
@@ -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)
--- a/tests/test-mq-safety.t	Fri Jan 20 14:19:13 2012 -0600
+++ b/tests/test-mq-safety.t	Fri Jan 20 00:27:11 2012 +0100
@@ -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
mercurial