D7726: commitablectx: fix the default phase

Submitter	phabricator
Date	Dec. 27, 2019, 4:01 p.m.
Message ID	<differential-rev-PHID-DREV-s5n2twlae66uiqskodtd-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/44048/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Fri, 27 Dec 2019 16:01:02 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "marmoute (Pierre-Yves David)" <phabricator@mercurial-scm.org> Subject: D7726: commitablectx: fix the default phase Message-ID: <differential-rev-PHID-DREV-s5n2twlae66uiqskodtd-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-s5n2twlae66uiqskodtd Thread-Index: YmYyMWE0NGNjOTNlNDVhNWIzN2ExODU5OTcy MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "marmoute \(Pierre-Yves David\)" <phabricator+D7726+public+f2dce34c4a7bbf49@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Dec. 27, 2019, 4:01 p.m.

marmoute created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The code was ignoring the config option. Since the config option will control
  the actual phase of the committed result, we better take it in account early.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7726

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1439,7 +1439,7 @@ 
         return b
 
     def phase(self):
-        phase = phases.draft  # default phase to draft
+        phase = phases.newcommitphase(self._repo.ui)
         for p in self.parents():
             phase = max(phase, p.phase())
         return phase

Patchwork D7726: commitablectx: fix the default phase

Comments

Patch