Patchwork D5938: resolve: slightly simplify join expression by joining with empty strings

login
register
mail settings
Submitter phabricator
Date Feb. 13, 2019, 12:16 p.m.
Message ID <9601bb010dd6750a90158c62533ac14e@localhost.localdomain>
Download mbox | patch
Permalink /patch/38711/
State Not Applicable
Headers show

Comments

phabricator - Feb. 13, 2019, 12:16 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc31dd7b63ab3: resolve: slightly simplify join expression by joining with empty strings (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5938?vs=14034&id=14062

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4985,9 +4985,8 @@ 
 
         if hasconflictmarkers:
             ui.warn(_('warning: the following files still have conflict '
-                      'markers:\n  ') +
-                    '\n  '.join(uipathfn(f) for f in hasconflictmarkers) +
-                    '\n')
+                      'markers:\n') + ''.join('  ' + uipathfn(f) + '\n'
+                                              for f in hasconflictmarkers))
             if markcheck == 'abort' and not all and not pats:
                 raise error.Abort(_('conflict markers detected'),
                                   hint=_('use --all to mark anyway'))