This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7467

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

Authored by mharbison72 on Nov 21 2019, 6:23 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5be128f669d4: util: convert an exception to bytes when passing to Abort()
Summary

I happened to notice this searching for how to convert an exception to bytes in
the previous patch. I'm pretty sure I've got a bunch of other instances that
use pycompat.bytestr() suppressed locally.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 21 2019, 6:23 PM
indygreg accepted this revision.Nov 21 2019, 9:48 PM
This revision is now accepted and ready to land.Nov 21 2019, 9:48 PM

Revision Contents
Changeset List

Diff 18271

mercurial/util.py

newstat = filestat.frompath(dest) newstat = filestat.frompath(dest)
if newstat.isambig(oldstat): if newstat.isambig(oldstat):
# stat of copied file is ambiguous to original one # stat of copied file is ambiguous to original one
advanced = ( advanced = (
oldstat.stat[stat.ST_MTIME] + 1 oldstat.stat[stat.ST_MTIME] + 1
) & 0x7FFFFFFF ) & 0x7FFFFFFF
os.utime(dest, (advanced, advanced)) os.utime(dest, (advanced, advanced))
except shutil.Error as inst: except shutil.Error as inst:
raise error.Abort(str(inst)) raise error.Abort(stringutil.forcebytestr(inst))
def copyfiles(src, dst, hardlink=None, progress=None): def copyfiles(src, dst, hardlink=None, progress=None):
"""Copy a directory tree using hardlinks if possible.""" """Copy a directory tree using hardlinks if possible."""
num = 0 num = 0
def settopic(): def settopic():
if progress: if progress: