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:59:29 +0200
changeset 47481 612f5f36fcf6
parent 47480 f93298a48da1
child 47482 cb29484eaade
dirstate: split a not-so-one-liner This is shorter and simpler to read. Differential Revision: https://phab.mercurial-scm.org/D10925
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstate.py	Thu Jul 01 18:57:35 2021 +0200
+++ b/mercurial/dirstate.py	Thu Jul 01 18:59:29 2021 +0200
@@ -442,10 +442,9 @@
                     break
                 entry = self._map.get(d)
                 if entry is not None and entry[0] != b'r':
-                    raise error.Abort(
-                        _(b'file %r in dirstate clashes with %r')
-                        % (pycompat.bytestr(d), pycompat.bytestr(f))
-                    )
+                    msg = _(b'file %r in dirstate clashes with %r')
+                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
+                    raise error.Abort(msg)
         self._dirty = True
         self._updatedfiles.add(f)
         self._map.addfile(f, oldstate, state, mode, size, mtime)
Mercurial