From 6a6e163b11cc086745339988d96ec50c19c88ed6 Mon Sep 17 00:00:00 2001
From: Mathieu Courtois <mathieu.courtois@edf.fr>
Date: Thu, 31 Jan 2019 09:15:07 +0100
Subject: [PATCH] [submit] Fix single head check: ignore secret changesets.
--HG--
branch : edf/mc
---
lib/hgaster/hooks/generic.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/hgaster/hooks/generic.py b/lib/hgaster/hooks/generic.py
index eff1d15c..51761c05 100644
--- a/lib/hgaster/hooks/generic.py
+++ b/lib/hgaster/hooks/generic.py
@@ -184,7 +184,8 @@ def single_head_per_branch_hook(in_branch=None):
if node.branch() != branch or node.phase() == hg.phases.secret:
continue
unclosed = [head for head in heads
- if not repo[head].extra().get("close")]
+ if not repo[head].extra().get("close")
+ and repo[head].phase() != hg.phases.secret]
if len(unclosed) > 1:
ui.warn("ERROR: Only one head per branch is allowed "
"(problem on branch '{0}')!\n"
--
GitLab