5
* urllib implements keep-alive connections and share them
6
(Vincent Ladeuil, #53654)
12
* Give nicer error message when an http server returns a 403
13
error code. (Vincent Ladeuil, #57644).
15
* When a multi-range http GET request fails, try a single
16
range one. If it fails too, forget about ranges. Remember that until
17
the death of the transport and propagates that to the clones.
18
(Vincent Ladeuil, #62276, #62029).
20
* Handles user/passwords supplied in url from command
21
line (for the urllib implementation). Don't request already
22
known passwords (Vincent Ladeuil, #42383, #44647, #48527)
26
* TestingHTTPRequestHandler really handles the Range header
27
(previously it was ignoring it and returning the whole file,).
30
bzr 0.12rc1 2006-10-23
34
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
35
rather than just showing a decimal revision number for revisions on the
36
mainline. These revision numbers are not yet accepted as input into bzr
37
commands such as log, diff etc. (Robert Collins)
39
* revisions can now be specified using dotted-decimal revision numbers.
40
For instance, ``bzr diff -r 1.2.1..1.2.3. (Robert Collins)
42
* ``bzr help commands`` output is now shorter (Aaron Bentley)
44
* New connection: ``bzr+http://`` which supports tunnelling the smart
45
protocol over an HTTP connection. If writing is enabled on the bzr
46
server, then you can write over the http connection.
49
* ``bzr`` now uses lazy importing to reduce the startup time. This has
50
a moderate effect on lots of actions, especially ones that have
51
little to do. For example ``bzr rocks`` time is down to 116ms from
52
283ms. (John Arbash Meinel)
54
* New Registry class to provide name-to-object registry-like support,
55
for example for schemes where plugins can register new classes to
56
do certain tasks (e.g. log formatters). Also provides lazy registration
57
to allow modules to be loaded on request. (John Arbash Meinel, Adeodato
62
* LogFormatter subclasses show now expect the 'revno' parameter to
63
show() to be a string rather than an int. (Robert Collins)
67
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
68
can take a ``working_dir='foo'`` parameter, which will change directory
69
for the command. (John Arbash Meinel)
71
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
72
around a regex, which defers compilation until first use.
75
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
76
``--no-plugins`` parameter to ensure test reproducability, and avoid
77
problems with system-wide installed plugins. (John Arbash Meinel)
79
* Unique tree root ids are now supported. Newly created trees still
80
use the common root id for compatibility with bzr versions before 0.12.
83
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
84
pass in inventory.ROOT_ID if you want the default root id value.
85
(Robert Collins, John Arbash Meinel)
87
* New method ``WorkingTree.flush()`` which will write the current memory
88
inventory out to disk. At the same time, read_working_inventory will
89
no longer trash the current tree inventory if it has been modified within
90
the current lock, and the tree will now ``flush()`` automatically on
91
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
92
advantage of this functionality. (Robert Collins, John Arbash Meinel)
94
* ``bzrlib.tsort.merge_sorted`` now accepts ``generate_revnos``. This
95
parameter will cause it to add another column to its output, which
96
contains the dotted-decimal revno for each revision, as a tuple.
99
* ``LogFormatter.show_merge`` is deprecated in favour of
100
``LogFormatter.show_merge_revno``. (Robert Collins)
104
* Avoid circular imports by creating a deprecated function for
105
``bzrlib.tree.RevisionTree``. Callers should have been using
106
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel,
109
* Don't use ``socket.MSG_WAITALL`` as it doesn't exist on all
110
platforms. (Martin Pool, #66356)
112
* Don't require ``Content-Type`` in range responses. Assume they are a
113
single range if ``Content-Type`` does not exist.
114
(John Arbash Meinel, #62473)
116
* bzr branch/pull no longer complain about progress bar cleanup when
117
interrupted during fetch. (Aaron Bentley, #54000)
119
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
120
the basis inventory, rather than going through the repository. This
121
allows us to have 1 inventory read, and 2 inventory writes when
122
committing a new tree. (John Arbash Meinel)
124
* When reverting, files that are not locally modified that do not exist
125
in the target are deleted, not just unversioned (Aaron Bentley)
127
* When trying to acquire a lock, don't fail immediately. Instead, try
128
a few times (up to 1 hour) before timing out. Also, report why the
129
lock is unavailable (John Arbash Meinel, #43521, #49556)
131
* Leave HttpTransportBase daughter classes decides how they
132
implement cloning. (Vincent Ladeuil, #61606)
134
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
138
* New test base class TestCaseWithMemoryTransport offers memory-only
139
testing facilities: its not suitable for tests that need to mutate disk
140
state, but most tests should not need that and should be converted to
141
TestCaseWithMemoryTransport. (Robert Collins)
143
* ``TestCase.make_branch_and_memory_tree`` now takes a format
144
option to set the BzrDir, Repository and Branch formats of the
145
created objects. (Robert Collins, John Arbash Meinel)
149
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
151
bzr 0.11rc2 2006-09-27
155
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
157
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
160
bzr 0.11rc1 2006-09-25
164
* Knit files now wait to create their contents until the first data is
165
added. The old code used to create an empty .knit and a .kndx with just
166
the header. However, this caused a lot of extra round trips over sftp.
167
This can change the time for ``bzr push`` to create a new remote branch
168
from 160s down to 100s. This also affects ``bzr commit`` performance when
169
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
170
down to 40s (John Arbash Meinel, #44692)
172
* When an entire subtree has been deleted, commit will now report that
173
just the top of the subtree has been deleted, rather than reporting
174
all the individual items. (Robert Collins)
176
* Commit performs one less XML parse. (Robert Collins)
178
* ``bzr checkout`` now operates on readonly branches as well
179
as readwrite branches. This fixes bug #39542. (Robert Collins)
181
* ``bzr bind`` no longer synchronises history with the master branch.
182
Binding should be followed by an update or push to synchronise the
183
two branches. This is closely related to the fix for bug #39542.
186
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
187
objects. This allows all imports to stay at the global scope, but
188
modules will not actually be imported if they are not used.
191
* Support bzr:// and bzr+ssh:// urls to work with the new RPC-based
192
transport which will be used with the upcoming high-performance smart
193
server. The new command ``bzr serve`` will invoke bzr in server mode,
194
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
197
* New command ``bzr version-info`` which can be used to get a summary
198
of the current state of the tree. This is especially useful as part
199
of a build commands. See ``doc/version_info.txt`` for more information
204
* 'bzr inventory [FILE...]' allows restricting the file list to a
205
specific set of files. (John Arbash Meinel, #3631)
207
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
209
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
210
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
211
reading a nested Stanza. (John Arbash Meinel)
213
* Transform._set_mode() needs to stat the right file.
214
(John Arbash Meinel, #56549)
216
* Raise WeaveFormatError rather than StopIteration when trying to read
217
an empty Weave file. (John Arbash Meinel, #46871)
219
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
220
(Vincent Ladeuil, #59835)
222
* Handle boundary="" lines properly to allow access through a Squid proxy.
223
(John Arbash Meinel, #57723)
225
* revert now removes newly-added directories (Aaron Bentley, #54172)
227
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
228
isn't a working tree. (David Allouche, #40679)
230
* Give nicer error messages when a user supplies an invalid --revision
231
parameter. (John Arbash Meinel, #55420)
233
* Handle when LANG is not recognized by python. Emit a warning, but
234
just revert to using 'ascii'. (John Arbash Meinel, #35392)
236
* Don't use preexec_fn on win32, as it is not supported by subprocess.
239
* Skip specific tests when the dependencies aren't met. This includes
240
some ``setup.py`` tests when ``python-dev`` is not available, and
241
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
243
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
244
the system. (Andrew Bennetts, John Arbash Meinel)
246
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
247
other branch, and will not push or pull between the two branches.
248
API users will need to perform a push or pull or update operation if they
249
require branch synchronisation to take place. (Robert Collins, #47344)
251
* When creating a tarball or zipfile export, export unicode names as utf-8
252
paths. This may not work perfectly on all platforms, but has the best
253
chance of working in the common case. (John Arbash Meinel, #56816)
255
* When committing, only files that exist in working tree or basis tree
256
may be specified (Aaron Bentley, #50793)
260
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
264
* TestCaseInTempDir now creates a separate directory for HOME, rather
265
than having HOME set to the same location as the working directory.
268
* run_bzr_subprocess() can take an optional 'env_changes={}' parameter,
269
which will update os.environ inside the spawned child. It also can
270
take a 'universal_newlines=True', which helps when checking the output
271
of the command. (John Arbash Meinel)
273
* Refactor SFTP vendors to allow easier re-use when ssh is used.
276
* Transport.list_dir() and Transport.iter_files_recursive() should always
277
return urlescaped paths. This is now tested (there were bugs in a few
278
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
280
* New utility function symbol_versioning.deprecation_string. Returns the
281
formatted string for a callable, deprecation format pair. (Robert Collins)
283
* New TestCase helper applyDeprecated. This allows you to call a callable
284
which is deprecated without it spewing to the screen, just by supplying
285
the deprecation format string issued for it. (Robert Collins)
287
* Transport.append and Transport.put have been deprecated in favor of
288
.append_bytes, .append_file, .put_bytes, and .put_file. This removes the
289
ambiguity in what type of object the functions take.
290
Transport.non_atomic_put_{bytes,file} has also been added. Which works
291
similarly to Transport.append() except for SFTP, it doesn't have a round
292
trip when opening the file. Also, it provides functionality for creating
293
a parent directory when trying to create a file, rather than raise
294
NoSuchFile and forcing the caller to repeat their request.
297
* WorkingTree has a new api ``unversion`` which allow the unversioning of
298
entries by their file id. (Robert Collins)
300
* WorkingTree.pending_merges is deprecated. Please use the get_parent_ids
301
(introduced in 0.10) method instead. (Robert Collins)
303
* WorkingTree has a new lock_tree_write method which locks the branch for
304
read rather than write. This is appropriate for actions which only need
305
the branch data for reference rather than mutation. A new decorator
306
needs_tree_write_lock is provided in the workingtree module. Like the
307
needs_read_lock and needs_write_lock decorators this allows static
308
declaration of the locking requirements of a function to ensure that
309
a lock is taken out for casual scripts. (Robert Collins, #54107)
311
* All WorkingTree methods which write to the tree, but not to the branch
312
have been converted to use ``needs_tree_write_lock`` rather than
313
``needs_write_lock``. Also converted is the revert, conflicts and tree
314
transform modules. This provides a modest performance improvement on
315
metadir style trees, due to the reduce lock-acquisition, and a more
316
significant performance improvement on lightweight checkouts from
317
remote branches, where trivial operations used to pay a significant
318
penalty. It also provides the basis for allowing readonly checkouts.
321
* Special case importing the standard library 'copy' module. This shaves
322
off 40ms of startup time, while retaining compatibility. See:
323
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
325
* WorkingTree has a new parent class MutableTree which represents the
326
specialisations of Tree which are able to be altered. (Robert Collins)
328
* New methods mkdir and put_file_bytes_non_atomic on MutableTree that
329
mutate the tree and its contents. (Robert Collins)
331
* Transport behaviour at the root of the URL is now defined and tested.
332
(Andrew Bennetts, Robert Collins)
336
* New test helper classs MemoryTree. This is typically accessed via
337
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
339
* Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to
340
continue running concurrently with a subprocess of bzr. (Andrew Bennetts,
343
* Add a new method ``Transport.get_smart_client()``. This is provided to
344
allow upgrades to a richer interface than the VFS one provided by
345
Transport. (Andrew Bennetts, Martin Pool)
350
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
351
tree. (Aaron Bentley)
353
* 'bzr add --file-ids-from' can be used to specify another path to use
354
for creating file ids, rather than generating all new ones. Internally,
355
the 'action' passed to smart_add_tree() can return file_ids that
356
will be used, rather than having bzrlib generate new ones.
357
(John Arbash Meinel, #55781)
359
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
360
This will cache some of the intermediate trees, and decrease the
361
setup time for benchmark tests. (John Arbash Meinel)
363
* Inverse forms are provided for all boolean options. For example,
364
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
366
* Serialize out Inventories directly, rather than using ElementTree.
367
Writing out a kernel sized inventory drops from 2s down to ~350ms.
368
(Robert Collins, John Arbash Meinel)
372
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
374
* Change LockDir so that if the lock directory doesn't exist when
375
lock_write() is called, an attempt will be made to create it.
376
(John Arbash Meinel, #56974)
378
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
380
* Active FTP transport now works as intended. (ghozzy, #56472)
382
* Really fix mutter() so that it won't ever raise a UnicodeError.
383
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
384
But it is a debugging log, not a real user file.
385
(John Arbash Meinel, #56947, #53880)
387
* Change Command handle to allow Unicode command and options.
388
At present we cannot register Unicode command names, so we will get
389
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
390
But that is better than a UnicodeError + a traceback.
391
(John Arbash Meinel, #57123)
393
* Handle TZ=UTC properly when reading/writing revisions.
394
(John Arbash Meinel, #55783, #56290)
396
* Use GPG_TTY to allow gpg --cl to work with gpg-agent in a pipeline,
397
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
399
* External diff does the right thing for binaries even in foreign
400
languages. (John Arbash Meinel, #56307)
402
* Testament handles more cases when content is unicode. Specific bug was
403
in handling of revision properties. (John Arbash Meinel, Holger Krekel,
406
* The bzr selftest was failing on installed versions due to a bug in a new
407
test helper. (John Arbash Meinel, Robert Collins, #58057)
411
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
412
which can be used to cache the conversion between utf8 and Unicode.
413
Especially helpful for some of the knit annotation code, which has to
414
convert revision ids to utf8 to annotate lines in storage.
417
* ``setup.py`` now searches the filesystem to find all packages which
418
need to be installed. This should help make the life of packagers
419
easier. (John Arbash Meinel)
425
* The hard-coded built-in ignore rules have been removed. There are
426
now two rulesets which are enforced. A user global one in
427
~/.bazaar/ignore which will apply to every tree, and the tree
428
specific one '.bzrignore'.
429
~/.bazaar/ignore will be created if it does not exist, but with
430
a more conservative list than the old default.
431
This fixes bugs with default rules being enforced no matter what.
432
The old list of ignore rules from bzr is available by
433
running 'bzr ignore --old-default-rules'.
434
(Robert Collins, Martin Pool, John Arbash Meinel)
436
* 'branches.conf' has been changed to 'locations.conf', since it can apply
437
to more locations than just branch locations.
442
* The revision specifier "revno:" is extended to accept the syntax
443
revno:N:branch. For example,
444
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
445
bzr.dev. (Matthieu Moy)
447
* Tests updates to ensure proper URL handling, UNICODE support, and
448
proper printing when the user's terminal encoding cannot display
449
the path of a file that has been versioned.
450
``bzr branch`` can take a target URL rather than only a local directory.
451
Branch.get_parent()/set_parent() now save a relative path if possible,
452
and normalize the parent based on root, allowing access across
453
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
454
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
457
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
458
Use terminal width for single-line logs from ``bzr log --line`` and
459
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
462
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
463
(Alexander Belchenko)
465
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
467
* Show the correct number of revisions pushed when pushing a new branch.
470
* 'bzr selftest' now shows a progress bar with the number of tests, and
471
progress made. 'make check' shows tests in -v mode, to be more useful
472
for the PQM status window. (Robert Collins).
473
When using a progress bar, failed tests are printed out, rather than
474
being overwritten by the progress bar until the suite finishes.
477
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
478
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
479
profile data for the individual profiled calls, allowing for fine
480
grained analysis of performance.
481
(Robert Collins, Martin Pool).
483
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
484
where commit can take an appreciable time. (Robert Collins)
486
* 'bzr add' is now less verbose in telling you what ignore globs were
487
matched by files being ignored. Instead it just tells you how many
488
were ignored (because you might reasonably be expecting none to be
489
ignored). 'bzr add -v' is unchanged and will report every ignored
490
file. (Robert Collins).
492
* ftp now has a test server if medusa is installed. As part of testing,
493
ftp support has been improved, including support for supplying a
494
non-standard port. (John Arbash Meinel).
496
* 'bzr log --line' shows the revision number, and uses only the
497
first line of the log message (#5162, Alexander Belchenko;
500
* 'bzr status' has had the --all option removed. The 'bzr ls' command
501
should be used to retrieve all versioned files. (Robert Collins)
503
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
504
over email, and applied on the other end, while maintaining ancestry.
505
This bundle can be applied with either 'bzr merge' or 'bzr pull',
506
the same way you would apply another branch.
507
(John Arbash Meinel, Aaron Bentley)
509
* 'bzr whoami' can now be used to set your identity from the command line,
510
for a branch or globally. (Robey Pointer)
512
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
515
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
518
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
519
Also updates things like 'http+pycurl://' if pycurl is not present.
520
(John Arbash Meinel) (Malone #47821, #52204)
522
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
523
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
524
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
526
* Improve the help text for 'bzr diff' to explain what various options do.
527
(John Arbash Meinel, #6391)
529
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
530
revision 10. This makes -r10 more in line with what other commands do.
531
'bzr uncommit' also now saves the pending merges of the revisions that
532
were removed. So it is safe to uncommit after a merge, fix something,
533
and commit again. (John Arbash Meinel, #32526, #31426)
535
* 'bzr init' now also works on remote locations.
536
(Wouter van Heyst, #48904)
538
* HTTP support has been updated. When using pycurl we now support
539
connection keep-alive, which reduces dns requests and round trips.
540
And for both urllib and pycurl we support multi-range requests,
541
which decreases the number of round-trips. Performance results for
542
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
543
http branching is now 2-3x faster, and ``bzr pull`` in an existing
544
branch is as much as 4x faster.
545
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
547
* Performance improvements for sftp. Branching and pulling are now up to
548
2x faster. Utilize paramiko.readv() support for async requests if it
549
is available (paramiko > 1.6) (John Arbash Meinel)
553
* Fix shadowed definition of TestLocationConfig that caused some
554
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
557
* Fix unnecessary requirement of sign-my-commits that it be run from
558
a working directory. (Martin Pool, Robert Collins)
560
* 'bzr push location' will only remember the push location if it succeeds
561
in connecting to the remote location. (#49742, John Arbash Meinel)
563
* 'bzr revert' no longer toggles the executable bit on win32
564
(#45010, John Arbash Meinel)
566
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
568
* sftp tests now work correctly on win32 if you have a newer paramiko
571
* Cleanup win32 test suite, and general cleanup of places where
572
file handles were being held open. (John Arbash Meinel)
574
* When specifying filenames for 'diff -r x..y', the name of the file in the
575
working directory can be used, even if its name is different in both x
578
* File-ids containing single- or double-quotes are handled correctly by
579
push. (#52227, Aaron Bentley)
581
* Normalize unicode filenames to ensure cross-platform consistency.
582
(John Arbash Meinel, #43689)
584
* The argument parser can now handle '-' as an argument. Currently
585
no code interprets it specially (it is mostly handled as a file named
586
'-'). But plugins, and future operations can use it.
587
(John Arbash meinel, #50984)
589
* Bundles can properly read binary files with a plain '\r' in them.
590
(John Arbash Meinel, #51927)
592
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
594
* Lots of win32 fixes (the test suite passes again).
595
(John Arbash Meinel, #50155)
597
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
599
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
601
* Removals are only committed if they match the filespec (or if there is
602
no filespec). (#46635, Aaron Bentley)
604
* smart-add recurses through all supplied directories
605
(John Arbash Meinel, #52578)
607
* Make the bundle reader extra lines before and after the bundle text.
608
This allows you to parse an email with the bundle inline.
609
(John Arbash Meinel, #49182)
611
* Change the file id generator to squash a little bit more. Helps when
612
working with long filenames on windows. (Also helps for unicode filenames
613
not generating hidden files). (John Arbash Meinel, #43801)
615
* Restore terminal mode on C-c while reading sftp password. (#48923,
616
Nicholas Allen, Martin Pool)
618
* Timestamps are rounded to 1ms, and revision entries can be recreated
619
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
621
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
622
use local paths, since it is user visible (John Arbash Meinel, #53653)
624
* ``bzr status foo`` when foo was unversioned used to cause a full delta
625
to be generated (John Arbash Meinel, #53638)
627
* When reading revision properties, an empty value should be considered
628
the empty string, not None (John Arbash Meinel, #47782)
630
* ``bzr diff --diff-options`` can now handle binary files being changed.
631
Also, the output is consistent when --diff-options is not supplied.
632
(John Arbash Meinel, #54651, #52930)
634
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
636
* Fix Branch.get_parent() to handle the case when the parent is not
637
accessible (John Arbash Meinel, #52976)
641
* Combine the ignore rules into a single regex rather than looping over
642
them to reduce the threshold where N^2 behaviour occurs in operations
643
like status. (Jan Hudec, Robert Collins).
645
* Appending to bzrlib.DEFAULT_IGNORE is now deprecated. Instead, use
646
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
648
* 'bzr push' should only push the ancestry of the current revision, not
649
all of the history in the repository. This is especially important for
650
shared repositories. (John Arbash Meinel)
652
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
653
rather than randomly walking the inventories. (John Arbash Meinel)
655
* Doctests are now run in temporary directories which are cleaned up when
656
they finish, rather than using special ScratchDir/ScratchBranch objects.
659
* Split ``check`` into separate methods on the branch and on the repository,
660
so that it can be specialized in ways that are useful or efficient for
661
different formats. (Martin Pool, Robert Collins)
663
* Deprecate Repository.all_revision_ids; most methods don't really need
664
the global revision graph but only that part leading up to a particular
665
revision. (Martin Pool, Robert Collins)
667
* Add a BzrDirFormat control_formats list which allows for control formats
668
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
669
(Robert Collins, Jelmer Vernooij).
671
* bzrlib.diff.external_diff can be redirected to any file-like object.
672
Uses subprocess instead of spawnvp.
673
(#4047, #48914, James Henstridge, John Arbash Meinel)
675
* New command line option '--profile-imports', which will install a custom
676
importer to log time to import modules and regex compilation time to
677
sys.stderr (John Arbash Meinel)
679
* 'EmptyTree' is now deprecated, please use repository.revision_tree(None)
680
instead. (Robert Collins)
682
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
688
* setup.py failed to install launchpad plugin. (Martin Pool)
694
* Fix failure to commit a merge in a checkout. (Martin Pool,
695
Robert Collins, Erik Bågfors, #43959)
697
* Nicer messages from 'commit' in the case of renames, and correct
698
messages when a merge has occured. (Robert Collins, Martin Pool)
700
* Separate functionality from assert statements as they are skipped in
701
optimized mode of python. Add the same check to pending merges.
702
(#44443, Olaf Conradi)
706
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
708
* Add info on standalone branches without a working tree.
709
(#44155, Olaf Conradi)
711
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
715
* Make editor invocation comply with Debian Policy. First check
716
environment variables VISUAL and EDITOR, then try editor from
717
alternatives system. If that all fails, fall back to the pre-defined
718
list of editors. (#42904, Olaf Conradi)
722
* New 'register-branch' command registers a public branch into
723
Launchpad.net, where it can be associated with bugs, etc.
724
(Martin Pool, Bjorn Tillenius, Robert Collins)
728
* New public api in InventoryEntry - 'describe_change(old, new)' which
729
provides a human description of the changes between two old and
730
new. (Robert Collins, Martin Pool)
734
* Fix test case for bzr info in upgrading a standalone branch to metadir,
735
uses bzrlib api now. (Olaf Conradi)
739
NOTES WHEN UPGRADING:
741
Release 0.8 of bzr introduces a new format for history storage, called
742
'knit', as an evolution of to the 'weave' format used in 0.7. Local
743
and remote operations are faster using knits than weaves. Several
744
operations including 'init', 'init-repo', and 'upgrade' take a
745
--format option that controls this. Branching from an existing branch
746
will keep the same format.
748
It is possible to merge, pull and push between branches of different
749
formats but this is slower than moving data between homogenous
750
branches. It is therefore recommended (but not required) that you
751
upgrade all branches for a project at the same time. Information on
752
formats is shown by 'bzr info'.
754
bzr 0.8 now allows creation of 'repositories', which hold the history
755
of files and revisions for several branches. Previously bzr kept all
756
the history for a branch within the .bzr directory at the root of the
757
branch, and this is still the default. To create a repository, use
758
the new 'bzr init-repo' command. Branches exist as directories under
759
the repository and contain just a small amount of information
760
indicating the current revision of the branch.
762
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
763
subversion. Checkouts are associated with a branch (optionally in a
764
repository), which contains all the historical information. The
765
result is that a checkout can be deleted without losing any
766
already-committed revisions. A new 'update' command is also available.
768
Repositories and checkouts are not supported with the 0.7 storage
769
format. To use them you must upgrad to either knits, or to the
770
'metaweave' format, which uses weaves but changes the .bzr directory
776
* Sftp paths can now be relative, or local, according to the lftp
777
convention. Paths now take the form:
778
sftp://user:pass@host:port/~/relative/path
780
sftp://user:pass@host:port/absolute/path
782
* The FTP transport now tries to reconnect after a temporary
783
failure. ftp put is made atomic. (Matthieu Moy)
785
* The FTP transport now maintains a pool of connections, and
786
reuses them to avoid multiple connections to the same host (like
787
sftp did). (Daniel Silverstone)
789
* The bzr_man.py file has been removed. To create the man page now,
790
use ./generate_docs.py man. The new program can also create other files.
791
Run "python generate_docs.py --help" for usage information. (Hans
792
Ulrich Niedermann & James Blackwell).
794
* Man Page now gives full help (James Blackwell). Help also updated to
795
reflect user config now being stored in .bazaar (Hans Ulrich
798
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
800
* Pull now accepts a --revision argument (Erik Bågfors)
802
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
803
line. You can now use the following command to sign all of your old commits.
804
find .bzr/revision-store// -name my@email-* \
805
| sed 's/.*\/\/..\///' \
808
* Upgrade can now upgrade over the network. (Robert Collins)
810
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
811
behaviour. By default they will cache history in the checkout, but
812
with --lightweight almost all data is kept in the master branch.
815
* 'revert' unversions newly-versioned files, instead of deleting them.
817
* 'merge' is more robust. Conflict messages have changed.
819
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
822
* Default log format can be set in configuration and plugins can register
823
their own formatters. (Erik Bågfors)
825
* New 'reconcile' command will check branch consistency and repair indexes
826
that can become out of sync in pre 0.8 formats. (Robert Collins,
829
* New 'bzr init --format' and 'bzr upgrade --format' option to control
830
what storage format is created or produced. (Robert Collins,
833
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
835
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
837
* New 'init-repository' command, plus support for repositories in 'init'
838
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
840
* Improve output of 'info' command. Show all relevant locations related to
841
working tree, branch and repository. Use kibibytes for binary quantities.
842
Fix off-by-one error in missing revisions of working tree. Make 'info'
843
work on branches, repositories and remote locations. Show locations
844
relative to the shared repository, if applicable. Show locking status
845
of locations. (Olaf Conradi)
847
* Diff and merge now safely handle binary files. (Aaron Bentley)
849
* 'pull' and 'push' now normalise the revision history, so that any two
850
branches with the same tip revision will have the same output from 'log'.
853
* 'merge' accepts --remember option to store parent location, like 'push'
854
and 'pull'. (Olaf Conradi)
856
* bzr status and diff when files given as arguments do not exist
857
in the relevant trees. (Martin Pool, #3619)
859
* Add '.hg' to the default ignore list. (Martin Pool)
861
* 'knit' is now the default disk format. This improves disk performance and
862
utilization, increases incremental pull performance, robustness with SFTP
863
and allows checkouts over SFTP to perform acceptably.
864
The initial Knit code was contributed by Johan Rydberg based on a
865
specification by Martin Pool.
866
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
868
* New tool to generate all-in-one html version of the manual. (Alexander
871
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
872
to be left in the SFTP repository. (Robert Collins, Martin Pool).
874
* New option 'diff --prefix' to control how files are named in diff
875
output, with shortcuts '-p0' and '-p1' corresponding to the options for
876
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
878
* Add --revision option to 'annotate' command. (Olaf Conradi)
880
* If bzr shows an unexpected revision-history after pulling (perhaps due
881
to a reweave) it can now be corrected by 'bzr reconcile'.
886
* Commit is now verbose by default, and shows changed filenames and the
887
new revision number. (Robert Collins, Martin Pool)
889
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
891
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
893
* Make 'pull' and 'push' remember location on failure using --remember.
896
* For compatibility, make old format for using weaves inside metadir
897
available as 'metaweave' format. Rename format 'metadir' to 'default'.
898
Clean up help for option --format in commands 'init', 'init-repo' and
899
'upgrade'. (Olaf Conradi)
903
* The internal storage of history, and logical branch identity have now
904
been split into Branch, and Repository. The common locking and file
905
management routines are now in bzrlib.lockablefiles.
906
(Aaron Bentley, Robert Collins, Martin Pool)
908
* Transports can now raise DependencyNotPresent if they need a library
909
which is not installed, and then another implementation will be
912
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
915
* Using Tree Transform for merge, revert, tree-building
917
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
918
Branch.initialize are now deprecated. Please see BzrDir.create_* for
919
replacement API's. (Robert Collins)
921
* New BzrDir class represents the .bzr control directory and manages
922
formatting issues. (Robert Collins)
924
* New repository.InterRepository class encapsulates Repository to
925
Repository actions and allows for clean selection of optimised code
926
paths. (Robert Collins)
928
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
929
please use 'branch.fetch' or 'repository.fetch' depending on your
930
needs. (Robert Collins)
932
* deprecated methods now have a 'is_deprecated' flag on them that can
933
be checked, if you need to determine whether a given callable is
934
deprecated at runtime. (Robert Collins)
936
* Progress bars are now nested - see
937
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
939
* New API call get_format_description() for each type of format.
942
* Changed branch.set_parent() to accept None to remove parent.
945
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
947
* WorkingTree.branch is now a read only property. (Robert Collins)
949
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
950
can be None or a factory that will create a progress bar. This is
951
useful for testing or for overriding the bzrlib.progress heuristic.
954
* New API method get_physical_lock_status() to query locks present on a
955
transport. (Olaf Conradi)
957
* Repository.reconcile now takes a thorough keyword parameter to allow
958
requesting an indepth reconciliation, rather than just a data-loss
959
check. (Robert Collins)
961
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
962
the user for yes/no style input. (Robert Collins)
966
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
967
for testing SFTP protocol support. (Robey Pointer)
969
* Branch formats are now tested once per implementation (see bzrlib.
970
tests.branch_implementations. This is analagous to the transport
971
interface tests, and has been followed up with working tree,
972
repository and BzrDir tests. (Robert Collins)
974
* New test base class TestCaseWithTransport provides a transport aware
975
test environment, useful for testing any transport-interface using
976
code. The test suite option --transport controls the transport used
977
by this class (when its not being used as part of implementation
978
contract testing). (Robert Collins)
980
* Close logging handler on disabling the test log. This will remove the
981
handler from the internal list inside python's logging module,
982
preventing shutdown from closing it twice. (Olaf Conradi)
984
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
986
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
987
will provide String("foo") to the command as its stdin.
993
* .bzrignore is excluded from exports, on the grounds that it's a bzr
994
internal-use file and may not be wanted. (Jamie Wilkinson)
996
* The "bzr directories" command were removed in favor of the new
997
--kind option to the "bzr inventory" command. To list all
998
versioned directories, now use "bzr inventory --kind directory".
1001
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
1002
by default. (John Arbash Meinel)
1004
* The parent of Bzr configuration directory can be set by BZR_HOME
1005
environment variable. Now the path for it is searched in BZR_HOME, then
1006
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
1007
points to C:\Documents and Settings\User Name\Application Data), HOME.
1008
(John Arbash Meinel)
1010
* Plugins with the same name in different directories in the bzr plugin
1011
path are no longer loaded: only the first successfully loaded one is
1012
used. (Robert Collins)
1014
* Use systems' external ssh command to open connections if possible.
1015
This gives better integration with user settings such as ProxyCommand.
1018
* Permissions on files underneath .bzr/ are inherited from the .bzr
1019
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
1020
will mean that future file will be created with group write permissions.
1022
* configure.in and config.guess are no longer in the builtin default
1025
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
1026
files. (John Arbash Meinel, Martin Pool)
1030
* "bzr INIT dir" now initializes the specified directory, and creates
1031
it if it does not exist. (John Arbash Meinel)
1033
* New remerge command (Aaron Bentley)
1035
* Better zsh completion script. (Steve Borho)
1037
* 'bzr diff' now returns 1 when there are changes in the working
1038
tree. (Robert Collins)
1040
* 'bzr push' now exists and can push changes to a remote location.
1041
This uses the transport infrastructure, and can store the remote
1042
location in the ~/.bazaar/branches.conf configuration file.
1045
* Test directories are only kept if the test fails and the user requests
1048
* Tweaks to short log printing
1050
* Added branch nicks, new nick command, printing them in log output.
1053
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
1054
occurs. (Martin Pool)
1056
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
1057
the same as Subversion. (Martin Pool)
1059
* New ftp transport support (on ftplib), for ftp:// and aftp://
1060
URLs. (Daniel Silverstone)
1062
* Commit editor temporary files now start with 'bzr_log.', to allow
1063
text editors to match the file name and set up appropriate modes or
1064
settings. (Magnus Therning)
1066
* Improved performance when integrating changes from a remote weave.
1067
(Goffredo Baroncelli)
1069
* Sftp will attempt to cache the connection, so it is more likely that
1070
a connection will be reused, rather than requiring multiple password
1073
* bzr revno now takes an optional argument indicating the branch whose
1074
revno should be printed. (Michael Ellerman)
1076
* bzr cat defaults to printing the last version of the file.
1077
(#3632, Matthieu Moy)
1079
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
1080
profiler. (Denys Duchier)
1082
* Faster commits by reading only the headers of affected weave files.
1085
* 'bzr add' now takes a --dry-run parameter which shows you what would be
1086
added, but doesn't actually add anything. (Michael Ellerman)
1088
* 'bzr add' now lists how many files were ignored per glob. add --verbose
1089
lists the specific files. (Aaron Bentley)
1091
* 'bzr missing' now supports displaying changes in diverged trees and can
1092
be limited to show what either end of the comparison is missing.
1093
(Aaron Bently, with a little prompting from Daniel Silverstone)
1097
* SFTP can walk up to the root path without index errors. (Robert Collins)
1099
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
1101
* Error when run with -OO
1103
* Fix bug in reporting http errors that don't have an http error code.
1106
* Handle more cases of pipe errors in display commands
1108
* Change status to 3 for all errors
1110
* Files that are added and unlinked before committing are completely
1111
ignored by diff and status
1113
* Stores with some compressed texts and some uncompressed texts are now
1114
able to be used. (John A Meinel)
1116
* Fix for bzr pull failing sometimes under windows
1118
* Fix for sftp transport under windows when using interactive auth
1120
* Show files which are both renamed and modified as such in 'bzr
1121
status' output. (#4503, Daniel Silverstone)
1123
* Make annotate cope better with revisions committed without a valid
1124
email address. (Marien Zwart)
1126
* Fix representation of tab characters in commit messages. (Harald
1129
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
1130
now parsed properly under Windows. (Alexander Belchenko)
1132
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
1134
* Keep a cached copy of the basis inventory to speed up operations
1135
that need to refer to it. (Johan Rydberg, Martin Pool)
1137
* Fix bugs in bzr status display of non-ascii characters. (Martin
1140
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
1143
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
1147
* Fix selftest asking for passwords when there are no SFTP keys.
1148
(Robey Pointer, Jelmer Vernooij)
1150
* Fix selftest run with 'python -O'. (Martin Pool)
1152
* Fix HTTP tests under Windows. (John Arbash Meinel)
1154
* Make tests work even if HOME is not set (Aaron Bentley)
1156
* Updated build_tree to use fixed line-endings for tests which read
1157
the file cotents and compare. Make some tests use this to pass under
1158
Windows. (John Arbash Meinel)
1160
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
1162
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
1163
(John Arbash Meinel)
1165
* Use terminal width to align verbose test output. (Martin Pool)
1167
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
1168
If adding a new test script please add that to
1169
bzrlib.tests.blackbox.__init__. (Robert Collins)
1171
* Much better error message if one of the test suites can't be
1172
imported. (Martin Pool)
1174
* Make check now runs the test suite twice - once with the default locale,
1175
and once with all locales forced to C, to expose bugs. This is not
1176
trivially done within python, so for now its only triggered by running
1177
Make check. Integrators and packagers who wish to check for full
1178
platform support should run 'make check' to test the source.
1181
* Tests can now run TestSkipped if they can't execute for any reason.
1182
(Martin Pool) (NB: TestSkipped should only be raised for correctable
1183
reasons - see the wiki spec ImprovingBzrTestSuite).
1185
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
1186
paths for the transport tests. Introduce blackbox remote sftp tests that
1187
test the same permutations. (Robert Collins, Robey Pointer)
1189
* Transport implementation tests are now independent of the local file
1190
system, which allows tests for esoteric transports, and for features
1191
not available in the local file system. They also repeat for variations
1192
on the URL scheme that can introduce issues in the transport code,
1193
see bzrlib.transport.TransportTestProviderAdapter() for this.
1196
* TestCase.build_tree uses the transport interface to build trees, pass
1197
in a transport parameter to give it an existing connection.
1202
* WorkingTree.pull has been split across Branch and WorkingTree,
1203
to allow Branch only pulls. (Robert Collins)
1205
* commands.display_command now returns the result of the decorated
1206
function. (Robert Collins)
1208
* LocationConfig now has a set_user_option(key, value) call to save
1209
a setting in its matching location section (a new one is created
1210
if needed). (Robert Collins)
1212
* Branch has two new methods, get_push_location and set_push_location
1213
to respectively, get and set the push location. (Robert Collins)
1215
* commands.register_command now takes an optional flag to signal that
1216
the registrant is planning to decorate an existing command. When
1217
given multiple plugins registering a command is not an error, and
1218
the original command class (whether built in or a plugin based one) is
1219
returned to the caller. There is a new error 'MustUseDecorated' for
1220
signalling when a wrapping command should switch to the original
1221
version. (Robert Collins)
1223
* Some option parsing errors will raise 'BzrOptionError', allowing
1224
granular detection for decorating commands. (Robert Collins).
1226
* Branch.read_working_inventory has moved to
1227
WorkingTree.read_working_inventory. This necessitated changes to
1228
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
1229
as well. To make it clear that a WorkingTree cannot always be obtained
1230
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
1231
be obtained. (Robert Collins)
1233
* All pending merges operations from Branch are now on WorkingTree.
1236
* The follow operations from Branch have moved to WorkingTree:
1244
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1246
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
1248
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
1251
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1252
query method. (Robert Collins)
1254
* New options to read only the table-of-contents of a weave.
1257
* Raise NoSuchFile when someone tries to add a non-existant file.
1260
* Simplify handling of DivergedBranches in cmd_pull().
1264
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
1265
is exposed as Branch().control_files. Also this has been altered with the
1266
controlfile pre/suffix replaced by simple method names like 'get' and
1267
'put'. (Aaron Bentley, Robert Collins).
1269
* Deprecated functions and methods can now be marked as such using the
1270
bzrlib.symbol_versioning module. Marked method have their docstring
1271
updated and will issue a DeprecationWarning using the warnings module
1272
when they are used. (Robert Collins)
1274
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1275
for functions that need unicode strings. (Robert Collins)
1281
* pull now takes --verbose to show you what revisions are added or removed
1284
* merge now takes a --show-base option to include the base text in
1288
* The config files are now read using ConfigObj, so '=' should be used as
1289
a separator, not ':'.
1292
* New 'bzr commit --strict' option refuses to commit if there are
1293
any unknown files in the tree. To commit, make sure all files are
1294
either ignored, added, or deleted. (Michael Ellerman)
1296
* The config directory is now ~/.bazaar, and there is a single file
1297
~/.bazaar/bazaar.conf storing email, editor and other preferences.
1300
* 'bzr add' no longer takes a --verbose option, and a --quiet option
1301
has been added that suppresses all output.
1303
* Improved zsh completion support in contrib/zsh, from Clint
1306
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
1307
Goffredo Baroncelli.
1309
* 'bzr check' now accepts -v for verbose reporting, and checks for
1310
ghosts in the branch. (Robert Collins)
1312
* New command 're-sign' which will regenerate the gpg signature for
1313
a revision. (Robert Collins)
1315
* If you set check_signatures=require for a path in
1316
~/.bazaar/branches.conf then bzr will invoke your
1317
gpg_signing_command (defaults to gpg) and record a digital signature
1318
of your commit. (Robert Collins)
1320
* New sftp transport, based on Paramiko. (Robey Pointer)
1322
* 'bzr pull' now accepts '--clobber' which will discard local changes
1323
and make this branch identical to the source branch. (Robert Collins)
1325
* Just give a quieter warning if a plugin can't be loaded, and
1326
put the details in .bzr.log. (Martin Pool)
1328
* 'bzr branch' will now set the branch-name to the last component of the
1329
output directory, if one was supplied.
1331
* If the option 'post_commit' is set to one (or more) python function
1332
names (must be in the bzrlib namespace), then they will be invoked
1333
after the commit has completed, with the branch and revision_id as
1334
parameters. (Robert Collins)
1336
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1338
* --merge-type weave is now supported for file contents. Tree-shape
1339
changes are still three-way based. (Martin Pool, Aaron Bentley)
1341
* 'bzr check' allows the first revision on revision-history to have
1342
parents - something that is expected for cheap checkouts, and occurs
1343
when conversions from baz do not have all history. (Robert Collins).
1345
* 'bzr merge' can now graft unrelated trees together, if your specify
1346
0 as a base. (Aaron Bentley)
1348
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
1351
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
1353
* 'bzr merge --reprocess' minimizes conflicts
1357
* The 'bzr selftest --pattern' option for has been removed, now
1358
test specifiers on the command line can be simple strings, or
1359
regexps, or both. (Robert Collins)
1361
* Passing -v to selftest will now show the time each test took to
1362
complete, which will aid in analysing performance regressions and
1363
related questions. (Robert Collins)
1365
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
1366
is given. (Martin Pool)
1368
* There is a new method for TestCaseInTempDir, assertFileEqual, which
1369
will check that a given content is equal to the content of the named
1370
file. (Robert Collins)
1372
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
1377
* New 'testament' command and concept for making gpg-signatures
1378
of revisions that are not tied to a particular internal
1379
representation. (Martin Pool).
1381
* Per-revision properties ('revprops') as key-value associated
1382
strings on each revision created when the revision is committed.
1383
Intended mainly for the use of external tools. (Martin Pool).
1385
* Config options have moved from bzrlib.osutils to bzrlib.config.
1388
* Improved command line option definitions allowing explanations
1389
for individual options, among other things. Contributed by
1392
* Config options have moved from bzrlib.osutils to bzrlib.config.
1393
Configuration is now done via the config.Config interface:
1394
Depending on whether you have a Branch, a Location or no information
1395
available, construct a ``*Config``, and use its ``signature_checking``,
1396
``username`` and ``user_email`` methods. (Robert Collins)
1398
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
1399
they are made available for other plugins to use. You should not
1400
import other plugins during the __init__ of your plugin though, as
1401
no ordering is guaranteed, and the plugins directory is not on the
1402
python path. (Robert Collins)
1404
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
1405
no longer takes an inventory, rather it takes an option branch
1406
parameter, and if None is given will open the branch at basedir
1407
implicitly. (Robert Collins)
1409
* Cleaner exception structure and error reporting. Suggested by
1410
Scott James Remnant. (Martin Pool)
1412
* Branch.remove has been moved to WorkingTree, which has also gained
1413
lock_read, lock_write and unlock methods for convenience. (Robert
1416
* Two decorators, needs_read_lock and needs_write_lock have been added
1417
to the branch module. Use these to cause a function to run in a
1418
read or write lock respectively. (Robert Collins)
1420
* Branch.open_containing now returns a tuple (Branch, relative-path),
1421
which allows direct access to the common case of 'get me this file
1422
from its branch'. (Robert Collins)
1424
* Transports can register using register_lazy_transport, and they
1425
will be loaded when first used. (Martin Pool)
1427
* 'pull' has been factored out of the command as WorkingTree.pull().
1428
A new option to WorkingTree.pull has been added, clobber, which will
1429
ignore diverged history and pull anyway.
1432
* config.Config has a 'get_user_option' call that accepts an option name.
1433
This will be looked up in branches.conf and bazaar.conf as normal.
1434
It is intended that this be used by plugins to support options -
1435
options of built in programs should have specific methods on the config.
1438
* merge.merge_inner now has tempdir as an optional parameter. (Robert
1441
* Tree.kind is not recorded at the top level of the hierarchy, as it was
1442
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
1445
* WorkingTree.__del__ has been removed, it was non deterministic and not
1446
doing what it was intended to. See WorkingTree.__init__ for a comment
1447
about future directions. (Robert Collins/Martin Pool)
1449
* bzrlib.transport.http has been modified so that only 404 urllib errors
1450
are returned as NoSuchFile. Other exceptions will propogate as normal.
1451
This allows debuging of actual errors. (Robert Collins)
1453
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
1454
to apis like 'put', 'get' and 'has'. This is to provide consistent
1455
behaviour - it operates on url's only. (Robert Collins)
1457
* Transports can register using register_lazy_transport, and they
1458
will be loaded when first used. (Martin Pool)
1460
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
1461
is called by merge_inner. This is so that the conflict count can be
1462
retrieved (and potentially manipulated) before returning to the caller
1463
of merge_inner. Likewise 'merge' now returns the conflict count to the
1464
caller. (Robert Collins)
1466
* 'revision.revision_graph can handle having only partial history for
1467
a revision - that is no revisions in the graph with no parents.
1470
* New builtins.branch_files uses the standard file_list rules to produce
1471
a branch and a list of paths, relative to that branch (Aaron Bentley)
1473
* New TestCase.addCleanup facility.
1475
* New bzrlib.version_info tuple (similar to sys.version_info), which can
1476
be used by programs importing bzrlib.
1480
* Better handling of branches in directories with non-ascii names.
1481
(Joel Rosdahl, Panagiotis Papadakos)
1483
* Upgrades of trees with no commits will not fail due to accessing
1484
[-1] in the revision-history. (Andres Salomon)
1487
bzr 0.1.1 2005-10-12
1491
* Fix problem in pulling over http from machines that do not
1492
allow directories to be listed.
1494
* Avoid harmless warning about invalid hash cache after
1495
upgrading branch format.
1499
* Avoid some unnecessary http operations in branch and pull.
1506
* 'bzr branch' over http initially gives a very high estimate
1507
of completion time but it should fall as the first few
1508
revisions are pulled in. branch is still slow on
1509
high-latency connections.
1513
* bzr-man.py has been updated to work again. Contributed by
1516
* Locking is now done with fcntl.lockf which works with NFS
1517
file systems. Contributed by Harald Meland.
1519
* When a merge encounters a file that has been deleted on
1520
one side and modified on the other, the old contents are
1521
written out to foo.BASE and foo.SIDE, where SIDE is this
1522
or OTHER. Contributed by Aaron Bentley.
1524
* Export was choosing incorrect file paths for the content of
1525
the tarball, this has been fixed by Aaron Bentley.
1527
* Commit will no longer commit without a log message, an
1528
error is returned instead. Contributed by Jelmer Vernooij.
1530
* If you commit a specific file in a sub directory, any of its
1531
parent directories that are added but not listed will be
1532
automatically included. Suggested by Michael Ellerman.
1534
* bzr commit and upgrade did not correctly record new revisions
1535
for files with only a change to their executable status.
1536
bzr will correct this when it encounters it. Fixed by
1539
* HTTP tests now force off the use of http_proxy for the duration.
1540
Contributed by Gustavo Niemeyer.
1542
* Fix problems in merging weave-based branches that have
1543
different partial views of history.
1545
* Symlink support: working with symlinks when not in the root of a
1546
bzr tree was broken, patch from Scott James Remnant.
1550
* 'branch' now accepts a --basis parameter which will take advantage
1551
of local history when making a new branch. This allows faster
1552
branching of remote branches. Contributed by Aaron Bentley.
1554
* New tree format based on weave files, called version 5.
1555
Existing branches can be upgraded to this format using
1558
* Symlinks are now versionable. Initial patch by
1559
Erik Toubro Nielsen, updated to head by Robert Collins.
1561
* Executable bits are tracked on files. Patch from Gustavo
1564
* 'bzr status' now shows unknown files inside a selected directory.
1565
Patch from Heikki Paajanen.
1567
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1568
and 'resolve' have needed added, which list and remove those
1569
merge conflicts respectively. A conflicted tree cannot be committed
1570
in. Contributed by Aaron Bentley.
1572
* 'rm' is now an alias for 'remove'.
1574
* Stores now split out their content in a single byte prefixed hash,
1575
dropping the density of files per directory by 256. Contributed by
1578
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1579
Contributed by Robert Collins.
1581
* 'bzr log' with the default formatter will show merged revisions,
1582
indented to the right. Initial implementation contributed by Gustavo
1583
Niemeyer, made incremental by Robert Collins.
1588
* Test case failures have the exception printed after the log
1589
for your viewing pleasure.
1591
* InventoryEntry is now an abstract base class, use one of the
1592
concrete InventoryDirectory etc classes instead.
1594
* Branch raises an UnsupportedFormatError when it detects a
1595
bzr branch it cannot understand. This allows for precise
1596
handling of such circumstances.
1601
* Removed testsweet module so that tests can be run after
1602
bzr installed by 'bzr selftest'.
1604
* 'bzr selftest' command-line arguments can now be partial ids
1605
of tests to run, e.g. 'bzr selftest test_weave'
1608
bzr 0.0.9 2005-09-23
1612
* Fixed "branch -r" option.
1614
* Fix remote access to branches containing non-compressed history.
1617
* Better reliability of http server tests. (John Arbash-Meinel)
1619
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1621
* Various minor bug in windows support have been fixed, largely in the
1622
test suite. Contributed by Alexander Belchenko.
1626
* Status now accepts a -r argument to give status between chosen
1627
revisions. Contributed by Heikki Paajanen.
1629
* Revision arguments no longer use +/-/= to control ranges, instead
1630
there is a 'before' namespace, which limits the successive namespace.
1631
For example '$ bzr log -r date:yesterday..before:date:today' will
1632
select everything from yesterday and before today. Contributed by
1635
* There is now a bzr.bat file created by distutils when building on
1636
Windows. Contributed by Alexander Belchenko.
1640
* Removed uuid() as it was unused.
1642
* Improved 'fetch' code for pulling revisions from one branch into
1643
another (used by pull, merged, etc.)
1646
bzr 0.0.8 2005-09-20
1650
* Adding a file whose parent directory is not versioned will
1651
implicitly add the parent, and so on up to the root. This means
1652
you should never need to explictly add a directory, they'll just
1653
get added when you add a file in the directory. Contributed by
1656
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1659
* If you set BZR_EDITOR in the environment, it is checked in
1660
preference to EDITOR and the config file for the interactive commit
1661
editing program. Related to this is a bugfix where a missing program
1662
set in EDITOR would cause editing to fail, now the fallback program
1663
for the operating system is still tried.
1665
* Files that are not directories/symlinks/regular files will no longer
1666
cause bzr to fail, it will just ignore them by default. You cannot add
1667
them to the tree though - they are not versionable.
1672
* Refactor xml packing/unpacking.
1676
* Fixed 'bzr mv' by Ollie Rutherfurd.
1678
* Fixed strange error when trying to access a nonexistent http
1681
* Make sure that the hashcache gets written out if it can't be
1687
* Various Windows fixes from Ollie Rutherfurd.
1689
* Quieten warnings about locking; patch from Matt Lavin.
1692
bzr-0.0.7 2005-09-02
1696
* ``bzr shell-complete`` command contributed by Clint Adams to
1697
help with intelligent shell completion.
1699
* New expert command ``bzr find-merge-base`` for debugging merges.
1704
* Much better merge support.
1706
* merge3 conflicts are now reported with markers like '<<<<<<<'
1707
(seven characters) which is the same as CVS and pleases things
1713
* ``bzr upgrade`` no longer fails when trying to fix trees that
1714
mention revisions that are not present.
1716
* Fixed bugs in listing plugins from ``bzr plugins``.
1718
* Fix case of $EDITOR containing options for the editor.
1720
* Fix log -r refusing to show the last revision.
1721
(Patch from Goffredo Baroncelli.)
1726
* ``bzr log --show-ids`` shows the revision ids of all parents.
1728
* Externally provided commands on your $BZRPATH no longer need
1729
to recognize --bzr-usage to work properly, and can just handle
1735
* Changed trace messages to go through the standard logging
1736
framework, so that they can more easily be redirected by
1741
bzr-0.0.6 2005-08-18
1745
* Python plugins, automatically loaded from the directories on
1746
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1748
* New 'bzr mkdir' command.
1750
* Commit mesage is fetched from an editor if not given on the
1751
command line; patch from Torsten Marek.
1753
* ``bzr log -m FOO`` displays commits whose message matches regexp
1756
* ``bzr add`` with no arguments adds everything under the current directory.
1758
* ``bzr mv`` does move or rename depending on its arguments, like
1761
* ``bzr missing`` command shows a summary of the differences
1762
between two trees. (Merged from John Arbash-Meinel.)
1764
* An email address for commits to a particular tree can be
1765
specified by putting it into .bzr/email within a branch. (Based
1766
on a patch from Heikki Paajanen.)
1771
* Faster working tree operations.
1776
* 3rd-party modules shipped with bzr are copied within the bzrlib
1777
python package, so that they can be installed by the setup
1778
script without clashing with anything already existing on the
1779
system. (Contributed by Gustavo Niemeyer.)
1781
* Moved plugins directory to bzrlib/, so that there's a standard
1782
plugin directory which is not only installed with bzr itself but
1783
is also available when using bzr from the development tree.
1784
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1785
standard plugins directory.
1787
* When exporting to a tarball with ``bzr export --format tgz``, put
1788
everything under a top directory rather than dumping it into the
1789
current directory. This can be overridden with the ``--root``
1790
option. Patch from William Dodé and John Meinel.
1792
* New ``bzr upgrade`` command to upgrade the format of a branch,
1793
replacing ``bzr check --update``.
1795
* Files within store directories are no longer marked readonly on
1798
* Changed ``bzr log`` output to a more compact form suggested by
1799
John A Meinel. Old format is available with the ``--long`` or
1800
``-l`` option, patched by William Dodé.
1802
* By default the commit command refuses to record a revision with
1803
no changes unless the ``--unchanged`` option is given.
1805
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1806
line options must come before the command name because they
1807
affect what commands are available; all other options must come
1808
after the command name because their interpretation depends on
1811
* ``branch`` and ``clone`` added as aliases for ``branch``.
1813
* Default log format is back to the long format; the compact one
1814
is available with ``--short``.
1819
* Fix bugs in committing only selected files or within a subdirectory.
1822
bzr-0.0.5 2005-06-15
1826
* ``bzr`` with no command now shows help rather than giving an
1827
error. Suggested by Michael Ellerman.
1829
* ``bzr status`` output format changed, because svn-style output
1830
doesn't really match the model of bzr. Now files are grouped by
1831
status and can be shown with their IDs. ``bzr status --all``
1832
shows all versioned files and unknown files but not ignored files.
1834
* ``bzr log`` runs from most-recent to least-recent, the reverse
1835
of the previous order. The previous behaviour can be obtained
1836
with the ``--forward`` option.
1838
* ``bzr inventory`` by default shows only filenames, and also ids
1839
if ``--show-ids`` is given, in which case the id is the second
1845
* New 'bzr whoami --email' option shows only the email component
1846
of the user identification, from Jo Vermeulen.
1848
* New ``bzr ignore PATTERN`` command.
1850
* Nicer error message for broken pipe, interrupt and similar
1851
conditions that don't indicate an internal error.
1853
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1855
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1856
either read or write mode.
1858
* New option ``bzr log --show-ids`` shows revision and file ids.
1860
* New usage ``bzr log FILENAME`` shows only revisions that
1863
* Changed format for describing changes in ``bzr log -v``.
1865
* New option ``bzr commit --file`` to take a message from a file,
1866
suggested by LarstiQ.
1868
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1869
Oler. File may be in a branch other than the working directory.
1871
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1874
* Commands can now be defined by external programs or scripts
1875
in a directory on $BZRPATH.
1877
* New "stat cache" avoids reading the contents of files if they
1878
haven't changed since the previous time.
1880
* If the Python interpreter is too old, try to find a better one
1881
or give an error. Based on a patch from Fredrik Lundh.
1883
* New optional parameter ``bzr info [BRANCH]``.
1885
* New form ``bzr commit SELECTED`` to commit only selected files.
1887
* New form ``bzr log -r FROM:TO`` shows changes in selected
1888
range; contributed by John A Meinel.
1890
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1891
options through to an external GNU diff.
1893
* New option ``bzr add --no-recurse`` to add a directory but not
1896
* ``bzr --version`` now shows more information if bzr is being run
1902
* Fixed diff format so that added and removed files will be
1903
handled properly by patch. Fix from Lalo Martins.
1905
* Various fixes for files whose names contain spaces or other
1911
* Converted black-box test suites from Bourne shell into Python;
1912
now run using ``./testbzr``. Various structural improvements to
1915
* testbzr by default runs the version of bzr found in the same
1916
directory as the tests, or the one given as the first parameter.
1918
* testbzr also runs the internal tests, so the only command
1919
required to check is just ``./testbzr``.
1921
* testbzr requires python2.4, but can be used to test bzr running
1922
under a different version.
1924
* Tests added for many other changes in this release.
1929
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1931
* Refactor command functions into Command objects based on HCT by
1932
Scott James Remnant.
1934
* Better help messages for many commands.
1936
* Expose bzrlib.open_tracefile() to start the tracefile; until
1937
this is called trace messages are just discarded.
1939
* New internal function find_touching_revisions() and hidden
1940
command touching-revisions trace the changes to a given file.
1942
* Simpler and faster compare_inventories() function.
1944
* bzrlib.open_tracefile() takes a tracefilename parameter.
1946
* New AtomicFile class.
1948
* New developer commands ``added``, ``modified``.
1953
* Cope on Windows on python2.3 by using the weaker random seed.
1954
2.4 is now only recommended.
1957
bzr-0.0.4 2005-04-22
1961
* 'bzr diff' optionally takes a list of files to diff. Still a bit
1962
basic. Patch from QuantumG.
1964
* More default ignore patterns.
1966
* New 'bzr log --verbose' shows a list of files changed in the
1967
changeset. Patch from Sebastian Cote.
1969
* Roll over ~/.bzr.log if it gets too large.
1971
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
1974
* New 'bzr help commands' based on a patch from Denys Duchier.
1979
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
1980
or $EMAIL. All are decoded by the locale preferred encoding.
1981
If none of these are present user@hostname is used. The host's
1982
fully-qualified name is not used because that tends to fail when
1983
there are DNS problems.
1985
* New 'bzr whoami' command instead of username user-email.
1990
* Make commit safe for hardlinked bzr trees.
1992
* Some Unicode/locale fixes.
1994
* Partial workaround for difflib.unified_diff not handling
1995
trailing newlines properly.
2000
* Allow docstrings for help to be in PEP0257 format. Patch from
2003
* More tests in test.sh.
2005
* Write profile data to a temporary file not into working
2006
directory and delete it when done.
2008
* Smaller .bzr.log with process ids.
2013
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
2016
* Some improvements in handling paths on Windows, based on a patch
2020
bzr-0.0.3 2005-04-06
2024
* New "directories" internal command lists versioned directories
2027
* Can now say "bzr commit --help".
2029
* New "rename" command to rename one file to a different name
2032
* New "move" command to move one or more files into a different
2035
* New "renames" command lists files renamed since base revision.
2037
* New cat command contributed by janmar.
2041
* .bzr.log is placed in $HOME (not pwd) and is always written in
2042
UTF-8. (Probably not a completely good long-term solution, but
2047
* Workaround for difflib bug in Python 2.3 that causes an
2048
exception when comparing empty files. Reported by Erik Toubro
2053
* Refactored inventory storage to insert a root entry at the top.
2057
* Start of shell-based black-box testing in test.sh.
2064
* Win32 fixes from Steve Brown.
2067
bzr-0.0.2 "black cube" 2005-03-31
2071
* Default ignore list extended (see bzrlib/__init__.py).
2073
* Patterns in .bzrignore are now added to the default ignore list,
2074
rather than replacing it.
2076
* Ignore list isn't reread for every file.
2080
* Reinstate the 'bzr check' command to check invariants of the
2083
* New 'ignored' command lists which files are ignored and why;
2084
'deleted' lists files deleted in the current working tree.
2086
* Performance improvements.
2088
* New global --profile option.
2090
* Ignore patterns like './config.h' now correctly match files in
2091
the root directory only.
2094
bzr-0.0.1 2005-03-26
2098
* More information from info command.
2100
* Can now say "bzr help COMMAND" for more detailed help.
2102
* Less file flushing and faster performance when writing logs and
2103
committing to stores.
2105
* More useful verbose output from some commands.
2109
* Fix inverted display of 'R' and 'M' during 'commit -v'.
2113
* Include a subset of ElementTree-1.2.20040618 to make
2114
installation easier.
2116
* Fix time.localtime call to work with Python 2.3 (the minimum
2120
bzr-0.0.0.69 2005-03-22
2124
* First public release.
2126
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
