D11600: dirstate-item: replace call to new_added

Submitter	phabricator
Date	Oct. 3, 2021, 10:52 a.m.
Message ID	<differential-rev-PHID-DREV-bet5qf77vnacxmptcceq-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/49923/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sun, 3 Oct 2021 10:52:56 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "marmoute (Pierre-Yves David)" <phabricator@mercurial-scm.org> Subject: D11600: dirstate-item: replace call to new_added Message-ID: <differential-rev-PHID-DREV-bet5qf77vnacxmptcceq-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-bet5qf77vnacxmptcceq Thread-Index: YTI1MWRlMTFkMThiZDFhMjY0NDcxMTgyOWU3 MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "marmoute \(Pierre-Yves David\)" <phabricator+D11600+public+eaaacec1d345aeef@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 - Oct. 3, 2021, 10:52 a.m.

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

REVISION SUMMARY
  The constructor is on its way out, so we inline the last relevant call before
  dropping it.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/pure/parsers.py
  rust/hg-core/src/dirstate/entry.rs

CHANGE DETAILS




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

Patch

diff --git a/rust/hg-core/src/dirstate/entry.rs b/rust/hg-core/src/dirstate/entry.rs
--- a/rust/hg-core/src/dirstate/entry.rs
+++ b/rust/hg-core/src/dirstate/entry.rs
@@ -81,7 +81,11 @@ 
                     Self::new_normal(mode, size, mtime)
                 }
             }
-            EntryState::Added => Self::new_added(),
+            EntryState::Added => Self {
+                flags: Flags::WDIR_TRACKED,
+                mode_size: None,
+                mtime: None,
+            },
             EntryState::Removed => Self {
                 flags: if size == SIZE_NON_NORMAL {
                     Flags::P1_TRACKED | Flags::P2_INFO
diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -156,7 +156,7 @@ 
         if state == b'm':
             return cls(wc_tracked=True, p1_tracked=True, p2_info=True)
         elif state == b'a':
-            return cls.new_added()
+            return cls(wc_tracked=True)
         elif state == b'r':
             if size == NONNORMAL:
                 p1_tracked = True

Patchwork D11600: dirstate-item: replace call to new_added

Comments

Patch