# HG changeset patch
# User Yuya Nishihara <y...@tcha.org>
# Date 1548492715 -32400
# Sat Jan 26 17:51:55 2019 +0900
# Node ID 83cd7b49057adc113d349eba2af6d3da38d3a5af
# Parent f9eab964f2eaa3fe7ad9f92344b4919ef4514858
dispatch: quote filename in IOError as well
It's explicitly added for OSError at 720308f741cb "dispatch: show empty
filename in OSError aborts". Let's do the same for IOError.
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -248,8 +248,8 @@ def callcatch(ui, func):
and inst.args and inst.args[0] == errno.EPIPE):
pass
elif getattr(inst, "strerror", None): # common IOError
- if getattr(inst, "filename", None):
- ui.error(_("abort: %s: %s\n") % (
+ if getattr(inst, "filename", None) is not None:
+ ui.error(_("abort: %s: '%s'\n") % (
encoding.strtolocal(inst.strerror),
stringutil.forcebytestr(inst.filename)))
else:
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -1125,7 +1125,7 @@ file specified by acl.config does not ex
bundle2-input-bundle: 4 parts total
transaction abort!
rollback completed
- abort: $ENOENT$: ../acl.config
+ abort: $ENOENT$: '../acl.config'
no rollback information available
0:6675d58eff77
diff --git a/tests/test-annotate.t b/tests/test-annotate.t
--- a/tests/test-annotate.t
+++ b/tests/test-annotate.t
@@ -589,7 +589,7 @@ annotate missing file
$ hg annotate -ncr "wdir()" baz
abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
- abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
+ abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
[255]
annotate removed file
@@ -598,7 +598,7 @@ annotate removed file
$ hg annotate -ncr "wdir()" baz
abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
- abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
+ abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
[255]
$ hg revert --all --no-backup --quiet
diff --git a/tests/test-fastannotate-hg.t b/tests/test-fastannotate-hg.t
--- a/tests/test-fastannotate-hg.t
+++ b/tests/test-fastannotate-hg.t
@@ -593,7 +593,7 @@ annotate missing file
$ rm baz
$ hg annotate -ncr "wdir()" baz
abort: $TESTTMP/repo/baz: $ENOENT$ (windows !)
- abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
+ abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
[255]
annotate removed file
@@ -601,7 +601,7 @@ annotate removed file
$ hg rm baz
$ hg annotate -ncr "wdir()" baz
abort: $TESTTMP/repo/baz: $ENOENT$ (windows !)
- abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
+ abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
[255]
Test annotate with whitespace options
diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t
+++ b/tests/test-histedit-arguments.t
@@ -362,7 +362,7 @@ Corrupt histedit state file
$ hg histedit --abort
warning: encountered an exception during histedit --abort; the repository
may not have been completely cleaned up
abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows
!)
- abort: $ENOENT$: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg (glob)
(no-windows !)
+ abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob)
(no-windows !)
[255]
Histedit state has been exited
$ hg summary -q
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -690,7 +690,7 @@ test python hook configured with python:
$ hg up null
loading update.ne hook failed:
- abort: $ENOENT$: $TESTTMP/d/repo/nonexistent.py
+ abort: $ENOENT$: '$TESTTMP/d/repo/nonexistent.py'
[255]
$ hg id
diff --git a/tests/test-journal-exists.t b/tests/test-journal-exists.t
--- a/tests/test-journal-exists.t
+++ b/tests/test-journal-exists.t
@@ -29,7 +29,7 @@ Check that zero-size journals are correc
$ hg -R foo unbundle repo.hg
adding changesets
- abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)
+ abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)
[255]
$ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
diff --git a/tests/test-narrow-widen-no-ellipsis.t
b/tests/test-narrow-widen-no-ellipsis.t
--- a/tests/test-narrow-widen-no-ellipsis.t
+++ b/tests/test-narrow-widen-no-ellipsis.t
@@ -406,7 +406,7 @@ Widening that fails can be recovered fro
* bookmark 11:* (glob)
$ hg unbundle .hg/strip-backup/*-widen.hg
abort: .hg/strip-backup/*-widen.hg: $ENOTDIR$ (windows !)
- abort: $ENOENT$: .hg/strip-backup/*-widen.hg (no-windows !)
+ abort: $ENOENT$: '.hg/strip-backup/*-widen.hg' (no-windows !)
[255]
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
11: local
diff --git a/tests/test-permissions.t b/tests/test-permissions.t
--- a/tests/test-permissions.t
+++ b/tests/test-permissions.t
@@ -22,7 +22,7 @@
checking manifests
crosschecking files in changesets and manifests
checking files
- abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
+ abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i'
[255]
$ chmod +r .hg/store/data/a.i
@@ -39,7 +39,7 @@
$ echo barber > a
$ hg commit -m "2"
trouble committing a!
- abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
+ abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i'
[255]
$ chmod -w .
diff --git a/tests/test-repair-strip.t b/tests/test-repair-strip.t
--- a/tests/test-repair-strip.t
+++ b/tests/test-repair-strip.t
@@ -53,7 +53,7 @@
rollback failed - please run hg recover
(failure reason: [Errno 13] Permission denied .hg/store/data/b.i')
strip failed, backup bundle
- abort: Permission denied .hg/store/data/b.i
+ abort: Permission denied .hg/store/data/b.i'
% after update 0, strip 2
abandoned transaction found - run hg recover
checking changesets
@@ -85,7 +85,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
- abort: Permission denied .hg/store/data/b.i
+ abort: Permission denied .hg/store/data/b.i'
% after update 0, strip 2
checking changesets
checking manifests
@@ -107,7 +107,7 @@
rollback failed - please run hg recover
(failure reason: [Errno 13] Permission denied .hg/store/00manifest.i')
strip failed, backup bundle
- abort: Permission denied .hg/store/00manifest.i
+ abort: Permission denied .hg/store/00manifest.i'
% after update 0, strip 2
abandoned transaction found - run hg recover
checking changesets
diff --git a/tests/test-ssh-repoerror.t b/tests/test-ssh-repoerror.t
--- a/tests/test-ssh-repoerror.t
+++ b/tests/test-ssh-repoerror.t
@@ -34,7 +34,7 @@ seems an unexpected case in real life, b
> done
$ hg id ssh://user@dummy/other
- remote: abort: Permission denied: $TESTTMP/other/.hg/requires
+ remote: abort: Permission denied: '$TESTTMP/other/.hg/requires'
abort: no suitable response from remote hg!
[255]
diff --git a/tests/test-template-map.t b/tests/test-template-map.t
--- a/tests/test-template-map.t
+++ b/tests/test-template-map.t
@@ -1039,7 +1039,7 @@ Error if style not readable:
$ touch q
$ chmod 0 q
$ hg log --style ./q
- abort: Permission denied: ./q
+ abort: Permission denied: './q'
[255]
#endif
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
