[Updated] D12105: merge: break up a not-so-one-liner for readability

[marmoute (Pierre-Yves David)]

Closed by commit rHGec23b0ba85c2: merge: break up a not-so-one-liner for readability (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12105?vs=32001&id=32063

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

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

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):



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220204/2d3e5493/attachment-0002.html>