Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: split a not-so-one-liner
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 01 Jul 2021 18:57:35 +0200
changeset 47480 f93298a48da1
parent 47479 e6b303eb8f7d
child 47481 612f5f36fcf6
dirstate: split a not-so-one-liner This is simpler to read. Differential Revision: https://phab.mercurial-scm.org/D10924
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstate.py	Thu Jul 01 18:56:34 2021 +0200
+++ b/mercurial/dirstate.py	Thu Jul 01 18:57:35 2021 +0200
@@ -433,9 +433,9 @@
         if state == b'a' or oldstate == b'r':
             scmutil.checkfilename(f)
             if self._map.hastrackeddir(f):
-                raise error.Abort(
-                    _(b'directory %r already in dirstate') % pycompat.bytestr(f)
-                )
+                msg = _(b'directory %r already in dirstate')
+                msg %= pycompat.bytestr(f)
+                raise error.Abort(msg)
             # shadows
             for d in pathutil.finddirs(f):
                 if self._map.hastrackeddir(d):
Mercurial