# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1625158769 -7200
# Node ID 612f5f36fcf6bfb93e461b2d4354bfa99aff89d9
# Parent  f93298a48da1d3d17a2707595a4a55afbfefc025
dirstate: split a not-so-one-liner

This is shorter and simpler to read.

Differential Revision: https://phab.mercurial-scm.org/D10925

diff -r f93298a48da1 -r 612f5f36fcf6 mercurial/dirstate.py
--- 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)