D7594: status: add template/json data about whether a file has unresolved conflicts
rdamazio (Rodrigo Damazio Bovendorp)
phabricator at mercurial-scm.org
Tue Dec 10 18:17:51 UTC 2019
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
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
To: rdamazio, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list