Patchwork D7594: status: add template/json data about whether a file has unresolved conflicts

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2019, 6:17 p.m.
Message ID <27524701c27b0891b7916f5d4e15095c@localhost.localdomain>
Download mbox | patch
Permalink /patch/43687/
State Not Applicable
Headers show

Comments

phabricator - Dec. 10, 2019, 6:17 p.m.
rdamazio updated this revision to Diff 18587.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7594?vs=18561&id=18587

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7594/new/

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

AFFECTED FILES
  mercurial/cmdutil.py
  mercurial/commands.py
  tests/test-conflict.t

CHANGE DETAILS




To: rdamazio, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -64,7 +64,8 @@ 
   [
    {
     "path": "a",
-    "status": "M"
+    "status": "M",
+    "unresolved": true
    },
    {
     "path": "a.orig",
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6893,6 +6893,8 @@ 
                         (b'  %s' + end) % uipathfn(copy[f]),
                         label=b'status.copied',
                     )
+                if morestatus:
+                    morestatus.formatfile(f, fm)
 
     if morestatus:
         morestatus.formatfooter(fm)
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -788,6 +788,10 @@ 
     unresolvedpaths = attr.ib()
     _label = b'status.morestatus'
 
+    def formatfile(self, path, fm):
+        if self.inmergestate and path in self.unresolvedpaths:
+            fm.data(unresolved=True)
+
     def formatfooter(self, fm):
         statemsg = _(b'The repository is in an unfinished *%s* state.'
                      ) % self.unfinishedop