Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: replace call to new_possibly_dirty
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 01 Oct 2021 09:24:48 +0200
changeset 48160 898de425bcd6
parent 48159 252d2f3f0d17
child 48161 20e41b367953
dirstate-item: replace call to new_possibly_dirty The constructor is on its way out, so we inline the last relevant call before dropping it. Differential Revision: https://phab.mercurial-scm.org/D11604
mercurial/pure/parsers.py file | annotate | diff | comparison | revisions
rust/hg-core/src/dirstate/entry.rs file | annotate | diff | comparison | revisions 
--- a/mercurial/pure/parsers.py	Fri Oct 01 09:23:28 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 09:24:48 2021 +0200
@@ -156,7 +156,7 @@
             if size == FROM_P2:
                 return cls(wc_tracked=True, p2_info=True)
             elif size == NONNORMAL:
-                return cls.new_possibly_dirty()
+                return cls(wc_tracked=True, p1_tracked=True)
             elif mtime == AMBIGUOUS_TIME:
                 instance = cls.new_normal(mode, size, 42)
                 instance._mtime = None
--- a/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 09:23:28 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 09:24:48 2021 +0200
@@ -75,7 +75,11 @@
                         mtime: None,
                     }
                 } else if size == SIZE_NON_NORMAL {
-                    Self::new_possibly_dirty()
+                    Self {
+                        flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED,
+                        mode_size: None,
+                        mtime: None,
+                    }
                 } else if mtime == MTIME_UNSET {
                     Self {
                         flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED,
Mercurial