[prev in list] [next in list] [prev in thread] [next in thread]
List: mercurial-devel
Subject: D12109: merge: break up a not-so-one-liner for readability
From: "marmoute (Pierre-Yves David)" <phabricator () mercurial-scm ! org>
Date: 2022-01-29 14:15:00
Message-ID: differential-rev-PHID-DREV-jcrkdsgtakfafk72ev7o-req () mercurial-scm ! org
[Download RAW message or body]
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/D12109
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
@@ -1931,10 +1931,9 @@
hint = _(b"use 'hg update' or check 'hg heads'")
raise error.Abort(msg, hint=hint)
if not force and (wc.files() or wc.deleted()):
- raise error.StateError(
- _(b"uncommitted changes"),
- hint=_(b"use 'hg status' to list changes"),
- )
+ msg = _(b"uncommitted changes")
+ hint = _(b"use 'hg status' to list changes")
+ raise error.StateError(msg, hint=hint)
if not wc.isinmemory():
for s in sorted(wc.substate):
wc.sub(s).bailifchanged()
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic