D12110: merge: break up a not-so-one-liner for readability
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Sat Jan 29 14:15:02 UTC 2022
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/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
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list