Show More
@@ -248,8 +248,8 b' def callcatch(ui, func):' | |||
|
248 | 248 | and inst.args and inst.args[0] == errno.EPIPE): |
|
249 | 249 | pass |
|
250 | 250 | elif getattr(inst, "strerror", None): # common IOError |
|
251 | if getattr(inst, "filename", None): | |
|
252 | ui.error(_("abort: %s: %s\n") % ( | |
|
251 | if getattr(inst, "filename", None) is not None: | |
|
252 | ui.error(_("abort: %s: '%s'\n") % ( | |
|
253 | 253 | encoding.strtolocal(inst.strerror), |
|
254 | 254 | stringutil.forcebytestr(inst.filename))) |
|
255 | 255 | else: |
@@ -1125,7 +1125,7 b' file specified by acl.config does not ex' | |||
|
1125 | 1125 | bundle2-input-bundle: 4 parts total |
|
1126 | 1126 | transaction abort! |
|
1127 | 1127 | rollback completed |
|
1128 | abort: $ENOENT$: ../acl.config | |
|
1128 | abort: $ENOENT$: '../acl.config' | |
|
1129 | 1129 | no rollback information available |
|
1130 | 1130 | 0:6675d58eff77 |
|
1131 | 1131 |
@@ -589,7 +589,7 b' annotate missing file' | |||
|
589 | 589 | |
|
590 | 590 | $ hg annotate -ncr "wdir()" baz |
|
591 | 591 | abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) |
|
592 | abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !) | |
|
592 | abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !) | |
|
593 | 593 | [255] |
|
594 | 594 | |
|
595 | 595 | annotate removed file |
@@ -598,7 +598,7 b' annotate removed file' | |||
|
598 | 598 | |
|
599 | 599 | $ hg annotate -ncr "wdir()" baz |
|
600 | 600 | abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) |
|
601 | abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !) | |
|
601 | abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !) | |
|
602 | 602 | [255] |
|
603 | 603 | |
|
604 | 604 | $ hg revert --all --no-backup --quiet |
@@ -593,7 +593,7 b' annotate missing file' | |||
|
593 | 593 | $ rm baz |
|
594 | 594 | $ hg annotate -ncr "wdir()" baz |
|
595 | 595 | abort: $TESTTMP/repo/baz: $ENOENT$ (windows !) |
|
596 | abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !) | |
|
596 | abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !) | |
|
597 | 597 | [255] |
|
598 | 598 | |
|
599 | 599 | annotate removed file |
@@ -601,7 +601,7 b' annotate removed file' | |||
|
601 | 601 | $ hg rm baz |
|
602 | 602 | $ hg annotate -ncr "wdir()" baz |
|
603 | 603 | abort: $TESTTMP/repo/baz: $ENOENT$ (windows !) |
|
604 | abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !) | |
|
604 | abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !) | |
|
605 | 605 | [255] |
|
606 | 606 | |
|
607 | 607 | Test annotate with whitespace options |
@@ -362,7 +362,7 b' Corrupt histedit state file' | |||
|
362 | 362 | $ hg histedit --abort |
|
363 | 363 | warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up |
|
364 | 364 | abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !) |
|
365 | abort: $ENOENT$: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg (glob) (no-windows !) | |
|
365 | abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !) | |
|
366 | 366 | [255] |
|
367 | 367 | Histedit state has been exited |
|
368 | 368 | $ hg summary -q |
@@ -690,7 +690,7 b' test python hook configured with python:' | |||
|
690 | 690 | |
|
691 | 691 | $ hg up null |
|
692 | 692 | loading update.ne hook failed: |
|
693 | abort: $ENOENT$: $TESTTMP/d/repo/nonexistent.py | |
|
693 | abort: $ENOENT$: '$TESTTMP/d/repo/nonexistent.py' | |
|
694 | 694 | [255] |
|
695 | 695 | |
|
696 | 696 | $ hg id |
@@ -29,7 +29,7 b' Check that zero-size journals are correc' | |||
|
29 | 29 | |
|
30 | 30 | $ hg -R foo unbundle repo.hg |
|
31 | 31 | adding changesets |
|
32 | abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob) | |
|
32 | abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob) | |
|
33 | 33 | [255] |
|
34 | 34 | |
|
35 | 35 | $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi |
@@ -406,7 +406,7 b' Widening that fails can be recovered fro' | |||
|
406 | 406 | * bookmark 11:* (glob) |
|
407 | 407 | $ hg unbundle .hg/strip-backup/*-widen.hg |
|
408 | 408 | abort: .hg/strip-backup/*-widen.hg: $ENOTDIR$ (windows !) |
|
409 | abort: $ENOENT$: .hg/strip-backup/*-widen.hg (no-windows !) | |
|
409 | abort: $ENOENT$: '.hg/strip-backup/*-widen.hg' (no-windows !) | |
|
410 | 410 | [255] |
|
411 | 411 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
|
412 | 412 | 11: local |
@@ -22,7 +22,7 b'' | |||
|
22 | 22 | checking manifests |
|
23 | 23 | crosschecking files in changesets and manifests |
|
24 | 24 | checking files |
|
25 |
abort: Permission denied: $ |
|
|
25 | abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i' | |
|
26 | 26 | [255] |
|
27 | 27 | |
|
28 | 28 | $ chmod +r .hg/store/data/a.i |
@@ -39,7 +39,7 b'' | |||
|
39 | 39 | $ echo barber > a |
|
40 | 40 | $ hg commit -m "2" |
|
41 | 41 | trouble committing a! |
|
42 |
abort: Permission denied: $ |
|
|
42 | abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i' | |
|
43 | 43 | [255] |
|
44 | 44 | |
|
45 | 45 | $ chmod -w . |
@@ -53,7 +53,7 b'' | |||
|
53 | 53 | rollback failed - please run hg recover |
|
54 | 54 | (failure reason: [Errno 13] Permission denied .hg/store/data/b.i') |
|
55 | 55 | strip failed, backup bundle |
|
56 | abort: Permission denied .hg/store/data/b.i | |
|
56 | abort: Permission denied .hg/store/data/b.i' | |
|
57 | 57 | % after update 0, strip 2 |
|
58 | 58 | abandoned transaction found - run hg recover |
|
59 | 59 | checking changesets |
@@ -85,7 +85,7 b'' | |||
|
85 | 85 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
86 | 86 | summary: a |
|
87 | 87 | |
|
88 | abort: Permission denied .hg/store/data/b.i | |
|
88 | abort: Permission denied .hg/store/data/b.i' | |
|
89 | 89 | % after update 0, strip 2 |
|
90 | 90 | checking changesets |
|
91 | 91 | checking manifests |
@@ -107,7 +107,7 b'' | |||
|
107 | 107 | rollback failed - please run hg recover |
|
108 | 108 | (failure reason: [Errno 13] Permission denied .hg/store/00manifest.i') |
|
109 | 109 | strip failed, backup bundle |
|
110 | abort: Permission denied .hg/store/00manifest.i | |
|
110 | abort: Permission denied .hg/store/00manifest.i' | |
|
111 | 111 | % after update 0, strip 2 |
|
112 | 112 | abandoned transaction found - run hg recover |
|
113 | 113 | checking changesets |
@@ -34,7 +34,7 b' seems an unexpected case in real life, b' | |||
|
34 | 34 | > done |
|
35 | 35 | |
|
36 | 36 | $ hg id ssh://user@dummy/other |
|
37 |
remote: abort: Permission denied: $ |
|
|
37 | remote: abort: Permission denied: '$TESTTMP/other/.hg/requires' | |
|
38 | 38 | abort: no suitable response from remote hg! |
|
39 | 39 | [255] |
|
40 | 40 |
General Comments 0
You need to be logged in to leave comments.
Login now