Patchwork D12105: merge: break up a not-so-one-liner for readability

login
register
mail settings
Submitter phabricator
Date Jan. 29, 2022, 2:14 p.m.
Message ID <differential-rev-PHID-DREV-pauzshmoh42fx36rktnw-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50431/
State New
Headers show

Comments

phabricator - Jan. 29, 2022, 2:14 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -537,9 +537,8 @@ 
             hint = _(b'merging in the other direction may work')
             raise error.Abort(msg % f, hint=hint)
         else:
-            raise error.StateError(
-                _(b'conflict in file \'%s\' is outside narrow clone') % f
-            )
+            msg = _(b'conflict in file \'%s\' is outside narrow clone')
+            raise error.StateError(msg % f)
 
 
 class mergeresult(object):