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

[marmoute (Pierre-Yves David)]

Closed by commit rHG48aff31e7f4c: 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/D12110?vs=32006&id=32068

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

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

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
@@ -2368,9 +2368,8 @@
 def back_out(ctx, parent=None, wc=None):
     if parent is None:
         if ctx.p2() is not None:
-            raise error.ProgrammingError(
-                b"must specify parent of merge commit to back out"
-            )
+            msg = b"must specify parent of merge commit to back out"
+            raise error.ProgrammingError(msg)
         parent = ctx.p1()
     return _update(
         ctx.repo(),



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/ddd78174/attachment-0002.html>