From fa04c4b2dec7b9f32d939b6ee20062fcd0b8ce09 Mon Sep 17 00:00:00 2001 From: Pierre-Yves David Date: Fri, 20 Jan 2012 00:27:11 +0100 Subject: [PATCH] phases: properly register excluded changeset when revision are specified There was no other drawback than a bad UI message for now. --- mercurial/discovery.py | 2 +- tests/test-mq-safety.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mercurial/discovery.py b/mercurial/discovery.py index 2f28185445..2de73a4db2 100644 --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -116,7 +116,7 @@ def findcommonoutgoing(repo, other, onlyheads=None, force=False, commoninc=None) 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 index e77f569b4f..81caff76e0 100644 --- a/tests/test-mq-safety.t +++ b/tests/test-mq-safety.t @@ -171,7 +171,7 @@ Pushing applied patch with --force $ 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