Patchwork D461: morestatus: check whether the conflict message is None before printing

login
register
mail settings
Submitter phabricator
Date Aug. 23, 2017, 4 p.m.
Message ID <d6ad0b4e4ccd1065685fc3455cb1a2a1@localhost.localdomain>
Download mbox | patch
Permalink /patch/23255/
State Not Applicable
Headers show

Comments

phabricator - Aug. 23, 2017, 4 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe5d104c35e51: morestatus: check whether the conflict message is None before printing (authored by pulkit).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D461?vs=1122&id=1202

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

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-bisect.t

CHANGE DETAILS




To: pulkit, #hg-reviewers, dsp, durin42
Cc: mercurial-devel

Patch

diff --git a/tests/test-bisect.t b/tests/test-bisect.t
--- a/tests/test-bisect.t
+++ b/tests/test-bisect.t
@@ -187,7 +187,6 @@ 
   $ hg status -v
   # The repository is in an unfinished *bisect* state.
   
-  None
   # To mark the changeset good:    hg bisect --good
   # To mark the changeset bad:     hg bisect --bad
   # To abort:                      hg bisect --reset
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -673,7 +673,8 @@ 
         statemsg = _('The repository is in an unfinished *%s* state.') % state
         fm.write('statemsg', '%s\n',  _commentlines(statemsg), label=label)
         conmsg = _conflictsmsg(repo)
-        fm.write('conflictsmsg', '%s\n', conmsg, label=label)
+        if conmsg:
+            fm.write('conflictsmsg', '%s\n', conmsg, label=label)
         if helpfulmsg:
             helpmsg = helpfulmsg()
             fm.write('helpmsg', '%s\n', helpmsg, label=label)