35
35
once. This avoids some unnecessary IO, and removes a network roundtrip
36
36
when doing ``bzr branch`` to a smart server URL. (Andrew Bennetts)
38
* ``bzr modified`` now read-locks the working tree (and branch and
39
repository) just once. (Andrew Bennetts)
38
41
* ``bzr resolve`` now accepts ``--take-this`` and ``--take-other`` actions
39
42
for text conflicts. This *replace* the whole file with the content
40
43
designated by the action. This will *ignore* all differences that would
41
44
have been merge cleanly otherwise. (Vincent Ladeuil, #638451)
46
* ``bzr tags``'s "sort" argument now allows registering custom sort
47
methods using the ``bzrlib.tag.tag_sort_methods`` registry.
48
(Jelmer Vernooij, #701244)
43
50
* ``bt.test_http`` was breaking ``os.environ`` by erasing the values saved by
44
51
``TestCase`` leading to ``bt.test_import_tariff`` failures.
45
52
(Vincent Ladeuil, #690563)
55
62
.. Fixes for situations where bzr would previously crash or give incorrect
56
63
or undesirable results.
65
* Avoid leaking SSH subprocess communication socket into unrelated child
66
processes, which could cause bzr to hang on exit. (Max Bowsher, #696285)
68
* ``bzr break-lock`` on a corrupted lock file works correctly, rather than
69
raising a PermissionDenied error. We were accidentally holding open the
70
file we were trying to delete. (John Arbash Meinel, #659978)
72
* ``bzr update`` in a checkout of a readonly branch works again, without
73
trying to set the tags in the master branch. This had been broken by the
74
bug fix for bug #603395. (John Arbash Meinel, #701212)
76
* Per-transport tests now prefer to use ``Transport.get_bytes()`` rather
77
than ``Transport.get().read()``. The SFTP code uses an async message to
78
close the file handle if you let the handle die from refcounting, while
79
it uses a synchronous message if you close it directly. This should help
80
prevent random test suite failures from race conditions.
81
(John Arbash Meinel, #681047)
83
* Stop using ``bzrlib.tuned_gzip.GzipFile``. It is incompatible with
84
python-2.7 and was only used for Knit format repositories, which haven't
85
been recommended since 2007. The file itself will be removed in the next
86
release. (John Arbash Meinel)
88
* The BZR_COLUMNS environment variable can be set to 0 to indicate no
89
limitation on the width of the terminal. (Neil Martinsen-Burrell, #675652)
91
* Treat WSAECONNABORTED the same as WSAECONNRESET for the purposes of
92
considering a smart data stream as being interrupted. This fixes a
93
failure in the windows test suite, that was trying to ensure we cleanly
94
handled a server disconnect. (John Arbash Meinel, #581311, #686587)
96
* Unshelving changes that occur in a now-unversioned directory now restore
97
the directory properly rather than crashing.
98
(John Arbash Meinel, #389674)
100
* You are now able to commit directly to a stacked branch. Any needed
101
parent inventories will be filled in as part of the commit process.
102
(John Arbash Meinel, #375013)
77
123
already opened that repository). Implementations of these APIs will
78
124
need to be updated to accept these arguments. (Andrew Bennetts)
126
* ``bzrlib.tuned_gzip.GzipFile`` is now deprecated and will be removed in
127
the bzr-2.4 series. Code that was using it can just use the python
128
stdlib ``gzip.GzipFile``. (John Arbash Meinel)
90
140
suite. This can include new facilities for writing tests, fixes to
91
141
spurious test failures and changes to the way things should be tested.
143
* ``bzrlib.tests`` defines ``isolated_environ`` with the definitions of all
144
the environment variables the tests should care about. It also defines
145
``override_os_environ`` and ``restore_os_environ`` to properly implement
146
isolation from ``os.environ`` for tests. ``bzrlib.tests`` now defines a
147
``DocTestSuite`` class using this facility for all ``bzrlib``
148
doctests. (Vincent Ladeuil, #321320)
93
150
* Catch exceptions related to bug #637821 during test cleanup to avoid
94
151
spurious failures. (Vincent Ladeuil, #686008).
96
153
* Check sphinx compatibility for tests requiring older sphinx versions.
97
154
(Vincent Ladeuil, #688072)
156
* ``test_onto_transport`` in the Launchpad plugin can now run with Python
157
2.7. (Vincent Ladeuil, #654733)
159
* ``TestCase._captureVar`` and ``TestCase._old_env`` have been deleted due to
160
bug #690563. Test writers are encouraged to use ``TestCase.overrideEnv``
161
instead. (Vincent Ladeuil)
99
163
* ``TestDebuntuExpansions`` was escaping the test isolation by calling the
100
164
wrong base class ``setUp``. (Vincent Ladeuil, #684622)