Mercurial > hg-stable
annotate tests/test-convert-bzr-treeroot.t @ 33668:cde4cfeb6e3e stable
ui: restore behavior to ignore some I/O errors (issue5658)
e9646ff34d55 and 1bfb9a63b98e refactored ui methods to no longer
silently swallow some IOError instances. This is arguably the
correct thing to do. However, it had the unfortunate side-effect
of causing StdioError to bubble up to sensitive code like
transaction aborts, leading to an uncaught exceptions and failures
to e.g. roll back a transaction. This could occur when a remote
HTTP or SSH client connection dropped. The new behavior is
resulting in semi-frequent "abandonded transaction" errors on
multiple high-volume repositories at Mozilla.
This commit effectively reverts e9646ff34d55 and 1bfb9a63b98e to
restore the old behavior.
I agree with the principle that I/O errors shouldn't be ignored.
That makes this change... unfortunate. However, our hands are tied
for what to do on stable. I think the proper solution is for the
ui's behavior to be configurable (possibly via a context manager).
During critical sections like transaction rollback and abort, it
should be possible to suppress errors. But this feature would not
be appropriate on stable.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 15 Aug 2017 13:04:31 -0700 |
parents | 75be14993fda |
children | 5abc47d4ca6b |
rev | line source |
---|---|
26066
89872688893f
tests: move '#require bzr' into .t files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
1 #require bzr |
7053 | 2 |
12517
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
3 $ . "$TESTDIR/bzr-definitions" |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
4 $ cat > treeset.py <<EOF |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
5 > import sys |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
6 > from bzrlib import workingtree |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
7 > wt = workingtree.WorkingTree.open('.') |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
8 > |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
9 > message, rootid = sys.argv[1:] |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
10 > wt.set_root_id('tree_root-%s' % rootid) |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
11 > wt.commit(message) |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
12 > EOF |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
13 |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
14 change the id of the tree root |
7053 | 15 |
12517
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
16 $ mkdir test-change-treeroot-id |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
17 $ cd test-change-treeroot-id |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
18 $ bzr init -q source |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
19 $ cd source |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
20 $ echo content > file |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
21 $ bzr add -q file |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
22 $ bzr commit -q -m 'Initial add' |
32958
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
26066
diff
changeset
|
23 $ $PYTHON ../../treeset.py 'Changed root' new |
12517
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
24 $ cd .. |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
25 $ hg convert source source-hg |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
26 initializing destination source-hg repository |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
27 scanning source... |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
28 sorting... |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
29 converting... |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
30 1 Initial add |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
31 0 Changed root |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
32 $ manifest source-hg tip |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
33 % manifest of tip |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
34 644 file |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12517
diff
changeset
|
35 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12517
diff
changeset
|
36 $ cd .. |