Patchwork D7467: util: convert an exception to bytes when passing to Abort()

login
register
mail settings
Submitter phabricator
Date Nov. 22, 2019, 2:50 a.m.
Message ID <8fc13a757b4cf01a8a97dc8dbd688423@localhost.localdomain>
Download mbox | patch
Permalink /patch/43399/
State Not Applicable
Headers show

Comments

phabricator - Nov. 22, 2019, 2:50 a.m.
Closed by commit rHG5be128f669d4: util: convert an exception to bytes when passing to Abort() (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7467?vs=18265&id=18271

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7467/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7467

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1919,7 +1919,7 @@ 
                         ) & 0x7FFFFFFF
                         os.utime(dest, (advanced, advanced))
         except shutil.Error as inst:
-            raise error.Abort(str(inst))
+            raise error.Abort(stringutil.forcebytestr(inst))
 
 
 def copyfiles(src, dst, hardlink=None, progress=None):