Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: break up a not-so-one-liner for readability
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 28 Jan 2022 14:25:51 +0100
changeset 48707 48aff31e7f4c
parent 48706 00bfd920169d
child 48708 25d5dffbb211
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12110
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri Jan 28 14:25:45 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:25:51 2022 +0100
@@ -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(),
mercurial