5
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
6
rather than just showing a decimal revision number for revisions on the
7
mainline. These revision numbers are not yet accepted as input into bzr
8
commands such as log, diff etc. (Robert Collins)
10
* revisions can now be specified using dotted-decimal revision numbers.
11
For instance, ``bzr diff -r 1.2.1..1.2.3. (Robert Collins)
13
* ``bzr help commands`` output is now shorter (Aaron Bentley)
15
* New connection: ``bzr+http://`` which supports tunnelling the smart
16
protocol over an HTTP connection. If writing is enabled on the bzr
17
server, then you can write over the http connection.
20
* ``bzr`` now uses lazy importing to reduce the startup time. This has
21
a moderate effect on lots of actions, especially ones that have
22
little to do. For example ``bzr rocks`` time is down to 116ms from
23
283ms. (John Arbash Meinel)
25
* New Registry class to provide name-to-object registry-like support,
26
for example for schemes where plugins can register new classes to
27
do certain tasks (e.g. log formatters). Also provides lazy registration
28
to allow modules to be loaded on request. (John Arbash Meinel, Adeodato
33
* LogFormatter subclasses show now expect the 'revno' parameter to
34
show() to be a string rather than an int. (Robert Collins)
38
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
39
can take a ``working_dir='foo'`` parameter, which will change directory
40
for the command. (John Arbash Meinel)
42
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
43
around a regex, which defers compilation until first use.
46
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
47
``--no-plugins`` parameter to ensure test reproducability, and avoid
48
problems with system-wide installed plugins. (John Arbash Meinel)
50
* Unique tree root ids are now supported. Newly created trees still
51
use the common root id for compatibility with bzr versions before 0.12.
54
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
55
pass in inventory.ROOT_ID if you want the default root id value.
56
(Robert Collins, John Arbash Meinel)
58
* New method ``WorkingTree.flush()`` which will write the current memory
59
inventory out to disk. At the same time, read_working_inventory will
60
no longer trash the current tree inventory if it has been modified within
61
the current lock, and the tree will now ``flush()`` automatically on
62
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
63
advantage of this functionality. (Robert Collins, John Arbash Meinel)
67
* Avoid circular imports by creating a deprecated function for
68
``bzrlib.tree.RevisionTree``. Callers should have been using
69
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel, #63360)
71
* Don't require ``Content-Type`` in range responses. Assume they are a
72
single range if ``Content-Type`` does not exist.
73
(John Arbash Meinel, #62473)
75
* bzr branch/pull no longer complain about progress bar cleanup when
76
interrupted during fetch. (Aaron Bentley, #54000)
78
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
79
the basis inventory, rather than going through the repository. This
80
allows us to have 1 inventory read, and 2 inventory writes when
81
committing a new tree. (John Arbash Meinel)
83
* When reverting, files that are not locally modified that do not exist
84
in the target are deleted, not just unversioned (Aaron Bentley)
86
* When trying to acquire a lock, don't fail immediately. Instead, try
87
a few times (up to 1 hour) before timing out. Also, report why the
88
lock is unavailable (John Arbash Meinel, #43521, #49556)
90
* Leave HttpTransportBase daughter classes decides how they
91
implement cloning. (Vincent Ladeuil, #61606)
93
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
97
* New test base class TestCaseWithMemoryTransport offers memory-only
98
testing facilities: its not suitable for tests that need to mutate disk
99
state, but most tests should not need that and should be converted to
100
TestCaseWithMemoryTransport. (Robert Collins)
102
* ``TestCase.make_branch_and_memory_tree`` now takes a format
103
option to set the BzrDir, Repository and Branch formats of the
104
created objects. (Robert Collins, John Arbash Meinel)
108
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
110
bzr 0.11rc2 2006-09-27
114
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
116
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
119
bzr 0.11rc1 2006-09-25
123
* Knit files now wait to create their contents until the first data is
124
added. The old code used to create an empty .knit and a .kndx with just
125
the header. However, this caused a lot of extra round trips over sftp.
126
This can change the time for ``bzr push`` to create a new remote branch
127
from 160s down to 100s. This also affects ``bzr commit`` performance when
128
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
129
down to 40s (John Arbash Meinel, #44692)
131
* When an entire subtree has been deleted, commit will now report that
132
just the top of the subtree has been deleted, rather than reporting
133
all the individual items. (Robert Collins)
135
* Commit performs one less XML parse. (Robert Collins)
137
* ``bzr checkout`` now operates on readonly branches as well
138
as readwrite branches. This fixes bug #39542. (Robert Collins)
140
* ``bzr bind`` no longer synchronises history with the master branch.
141
Binding should be followed by an update or push to synchronise the
142
two branches. This is closely related to the fix for bug #39542.
145
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
146
objects. This allows all imports to stay at the global scope, but
147
modules will not actually be imported if they are not used.
150
* Support bzr:// and bzr+ssh:// urls to work with the new RPC-based
151
transport which will be used with the upcoming high-performance smart
152
server. The new command ``bzr serve`` will invoke bzr in server mode,
153
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
156
* New command ``bzr version-info`` which can be used to get a summary
157
of the current state of the tree. This is especially useful as part
158
of a build commands. See ``doc/version_info.txt`` for more information
163
* 'bzr inventory [FILE...]' allows restricting the file list to a
164
specific set of files. (John Arbash Meinel, #3631)
166
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
168
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
169
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
170
reading a nested Stanza. (John Arbash Meinel)
172
* Transform._set_mode() needs to stat the right file.
173
(John Arbash Meinel, #56549)
175
* Raise WeaveFormatError rather than StopIteration when trying to read
176
an empty Weave file. (John Arbash Meinel, #46871)
178
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
179
(Vincent Ladeuil, #59835)
181
* Handle boundary="" lines properly to allow access through a Squid proxy.
182
(John Arbash Meinel, #57723)
184
* revert now removes newly-added directories (Aaron Bentley, #54172)
186
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
187
isn't a working tree. (David Allouche, #40679)
189
* Give nicer error messages when a user supplies an invalid --revision
190
parameter. (John Arbash Meinel, #55420)
192
* Handle when LANG is not recognized by python. Emit a warning, but
193
just revert to using 'ascii'. (John Arbash Meinel, #35392)
195
* Don't use preexec_fn on win32, as it is not supported by subprocess.
198
* Skip specific tests when the dependencies aren't met. This includes
199
some ``setup.py`` tests when ``python-dev`` is not available, and
200
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
202
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
203
the system. (Andrew Bennetts, John Arbash Meinel)
205
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
206
other branch, and will not push or pull between the two branches.
207
API users will need to perform a push or pull or update operation if they
208
require branch synchronisation to take place. (Robert Collins, #47344)
210
* When creating a tarball or zipfile export, export unicode names as utf-8
211
paths. This may not work perfectly on all platforms, but has the best
212
chance of working in the common case. (John Arbash Meinel, #56816)
214
* When committing, only files that exist in working tree or basis tree
215
may be specified (Aaron Bentley, #50793)
219
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
223
* TestCaseInTempDir now creates a separate directory for HOME, rather
224
than having HOME set to the same location as the working directory.
227
* run_bzr_subprocess() can take an optional 'env_changes={}' parameter,
228
which will update os.environ inside the spawned child. It also can
229
take a 'universal_newlines=True', which helps when checking the output
230
of the command. (John Arbash Meinel)
232
* Refactor SFTP vendors to allow easier re-use when ssh is used.
235
* Transport.list_dir() and Transport.iter_files_recursive() should always
236
return urlescaped paths. This is now tested (there were bugs in a few
237
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
239
* New utility function symbol_versioning.deprecation_string. Returns the
240
formatted string for a callable, deprecation format pair. (Robert Collins)
242
* New TestCase helper applyDeprecated. This allows you to call a callable
243
which is deprecated without it spewing to the screen, just by supplying
244
the deprecation format string issued for it. (Robert Collins)
246
* Transport.append and Transport.put have been deprecated in favor of
247
.append_bytes, .append_file, .put_bytes, and .put_file. This removes the
248
ambiguity in what type of object the functions take.
249
Transport.non_atomic_put_{bytes,file} has also been added. Which works
250
similarly to Transport.append() except for SFTP, it doesn't have a round
251
trip when opening the file. Also, it provides functionality for creating
252
a parent directory when trying to create a file, rather than raise
253
NoSuchFile and forcing the caller to repeat their request.
257
* WorkingTree has a new api ``unversion`` which allow the unversioning of
258
entries by their file id. (Robert Collins)
260
* WorkingTree.pending_merges is deprecated. Please use the get_parent_ids
261
(introduced in 0.10) method instead. (Robert Collins)
263
* WorkingTree has a new lock_tree_write method which locks the branch for
264
read rather than write. This is appropriate for actions which only need
265
the branch data for reference rather than mutation. A new decorator
266
needs_tree_write_lock is provided in the workingtree module. Like the
267
needs_read_lock and needs_write_lock decorators this allows static
268
declaration of the locking requirements of a function to ensure that
269
a lock is taken out for casual scripts. (Robert Collins, #54107)
271
* All WorkingTree methods which write to the tree, but not to the branch
272
have been converted to use ``needs_tree_write_lock`` rather than
273
``needs_write_lock``. Also converted is the revert, conflicts and tree
274
transform modules. This provides a modest performance improvement on
275
metadir style trees, due to the reduce lock-acquisition, and a more
276
significant performance improvement on lightweight checkouts from
277
remote branches, where trivial operations used to pay a significant
278
penalty. It also provides the basis for allowing readonly checkouts.
281
* Special case importing the standard library 'copy' module. This shaves
282
off 40ms of startup time, while retaining compatibility. See:
283
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
285
* WorkingTree has a new parent class MutableTree which represents the
286
specialisations of Tree which are able to be altered. (Robert Collins)
288
* New methods mkdir and put_file_bytes_non_atomic on MutableTree that
289
mutate the tree and its contents. (Robert Collins)
291
* Transport behaviour at the root of the URL is now defined and tested.
292
(Andrew Bennetts, Robert Collins)
296
* New test helper classs MemoryTree. This is typically accessed via
297
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
299
* Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to
300
continue running concurrently with a subprocess of bzr. (Andrew Bennetts,
303
* Add a new method ``Transport.get_smart_client()``. This is provided to
304
allow upgrades to a richer interface than the VFS one provided by
305
Transport. (Andrew Bennetts, Martin Pool)
309
* bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
310
will cause it to add another column to its output, which contains the
311
dotted-decimal revno for each revision, as a tuple. (Robert Collins)
313
* LogFormatter.show_merge is deprecated in favour of
314
LogFormatter.show_merge_revno. (Robert Collins)
316
bzr 0.10.0RC1 2006-08-28
320
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
321
tree. (Aaron Bentley)
323
* 'bzr add --file-ids-from' can be used to specify another path to use
324
for creating file ids, rather than generating all new ones. Internally,
325
the 'action' passed to smart_add_tree() can return file_ids that
326
will be used, rather than having bzrlib generate new ones.
327
(John Arbash Meinel, #55781)
329
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
330
This will cache some of the intermediate trees, and decrease the
331
setup time for benchmark tests. (John Arbash Meinel)
333
* Inverse forms are provided for all boolean options. For example,
334
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
336
* Serialize out Inventories directly, rather than using ElementTree.
337
Writing out a kernel sized inventory drops from 2s down to ~350ms.
338
(Robert Collins, John Arbash Meinel)
342
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
344
* Change LockDir so that if the lock directory doesn't exist when
345
lock_write() is called, an attempt will be made to create it.
346
(John Arbash Meinel, #56974)
348
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
350
* Active FTP transport now works as intended. (ghozzy, #56472)
352
* Really fix mutter() so that it won't ever raise a UnicodeError.
353
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
354
But it is a debugging log, not a real user file.
355
(John Arbash Meinel, #56947, #53880)
357
* Change Command handle to allow Unicode command and options.
358
At present we cannot register Unicode command names, so we will get
359
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
360
But that is better than a UnicodeError + a traceback.
361
(John Arbash Meinel, #57123)
363
* Handle TZ=UTC properly when reading/writing revisions.
364
(John Arbash Meinel, #55783, #56290)
366
* Use GPG_TTY to allow gpg --cl to work with gpg-agent in a pipeline,
367
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
369
* External diff does the right thing for binaries even in foreign
370
languages. (John Arbash Meinel, #56307)
372
* Testament handles more cases when content is unicode. Specific bug was
373
in handling of revision properties. (John Arbash Meinel, Holger Krekel,
376
* The bzr selftest was failing on installed versions due to a bug in a new
377
test helper. (John Arbash Meinel, Robert Collins, #58057)
381
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
382
which can be used to cache the conversion between utf8 and Unicode.
383
Especially helpful for some of the knit annotation code, which has to
384
convert revision ids to utf8 to annotate lines in storage.
387
* ``setup.py`` now searches the filesystem to find all packages which
388
need to be installed. This should help make the life of packagers
389
easier. (John Arbash Meinel)
395
* The hard-coded built-in ignore rules have been removed. There are
396
now two rulesets which are enforced. A user global one in
397
~/.bazaar/ignore which will apply to every tree, and the tree
398
specific one '.bzrignore'.
399
~/.bazaar/ignore will be created if it does not exist, but with
400
a more conservative list than the old default.
401
This fixes bugs with default rules being enforced no matter what.
402
The old list of ignore rules from bzr is available by
403
running 'bzr ignore --old-default-rules'.
404
(Robert Collins, Martin Pool, John Arbash Meinel)
406
* 'branches.conf' has been changed to 'locations.conf', since it can apply
407
to more locations than just branch locations.
412
* The revision specifier "revno:" is extended to accept the syntax
413
revno:N:branch. For example,
414
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
415
bzr.dev. (Matthieu Moy)
417
* Tests updates to ensure proper URL handling, UNICODE support, and
418
proper printing when the user's terminal encoding cannot display
419
the path of a file that has been versioned.
420
``bzr branch`` can take a target URL rather than only a local directory.
421
Branch.get_parent()/set_parent() now save a relative path if possible,
422
and normalize the parent based on root, allowing access across
423
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
424
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
427
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
428
Use terminal width for single-line logs from ``bzr log --line`` and
429
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
432
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
433
(Alexander Belchenko)
435
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
437
* Show the correct number of revisions pushed when pushing a new branch.
440
* 'bzr selftest' now shows a progress bar with the number of tests, and
441
progress made. 'make check' shows tests in -v mode, to be more useful
442
for the PQM status window. (Robert Collins).
443
When using a progress bar, failed tests are printed out, rather than
444
being overwritten by the progress bar until the suite finishes.
447
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
448
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
449
profile data for the individual profiled calls, allowing for fine
450
grained analysis of performance.
451
(Robert Collins, Martin Pool).
453
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
454
where commit can take an appreciable time. (Robert Collins)
456
* 'bzr add' is now less verbose in telling you what ignore globs were
457
matched by files being ignored. Instead it just tells you how many
458
were ignored (because you might reasonably be expecting none to be
459
ignored). 'bzr add -v' is unchanged and will report every ignored
460
file. (Robert Collins).
462
* ftp now has a test server if medusa is installed. As part of testing,
463
ftp support has been improved, including support for supplying a
464
non-standard port. (John Arbash Meinel).
466
* 'bzr log --line' shows the revision number, and uses only the
467
first line of the log message (#5162, Alexander Belchenko;
470
* 'bzr status' has had the --all option removed. The 'bzr ls' command
471
should be used to retrieve all versioned files. (Robert Collins)
473
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
474
over email, and applied on the other end, while maintaining ancestry.
475
This bundle can be applied with either 'bzr merge' or 'bzr pull',
476
the same way you would apply another branch.
477
(John Arbash Meinel, Aaron Bentley)
479
* 'bzr whoami' can now be used to set your identity from the command line,
480
for a branch or globally. (Robey Pointer)
482
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
485
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
488
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
489
Also updates things like 'http+pycurl://' if pycurl is not present.
490
(John Arbash Meinel) (Malone #47821, #52204)
492
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
493
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
494
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
496
* Improve the help text for 'bzr diff' to explain what various options do.
497
(John Arbash Meinel, #6391)
499
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
500
revision 10. This makes -r10 more in line with what other commands do.
501
'bzr uncommit' also now saves the pending merges of the revisions that
502
were removed. So it is safe to uncommit after a merge, fix something,
503
and commit again. (John Arbash Meinel, #32526, #31426)
505
* 'bzr init' now also works on remote locations.
506
(Wouter van Heyst, #48904)
508
* HTTP support has been updated. When using pycurl we now support
509
connection keep-alive, which reduces dns requests and round trips.
510
And for both urllib and pycurl we support multi-range requests,
511
which decreases the number of round-trips. Performance results for
512
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
513
http branching is now 2-3x faster, and ``bzr pull`` in an existing
514
branch is as much as 4x faster.
515
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
517
* Performance improvements for sftp. Branching and pulling are now up to
518
2x faster. Utilize paramiko.readv() support for async requests if it
519
is available (paramiko > 1.6) (John Arbash Meinel)
523
* Fix shadowed definition of TestLocationConfig that caused some
524
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
527
* Fix unnecessary requirement of sign-my-commits that it be run from
528
a working directory. (Martin Pool, Robert Collins)
530
* 'bzr push location' will only remember the push location if it succeeds
531
in connecting to the remote location. (#49742, John Arbash Meinel)
533
* 'bzr revert' no longer toggles the executable bit on win32
534
(#45010, John Arbash Meinel)
536
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
538
* sftp tests now work correctly on win32 if you have a newer paramiko
541
* Cleanup win32 test suite, and general cleanup of places where
542
file handles were being held open. (John Arbash Meinel)
544
* When specifying filenames for 'diff -r x..y', the name of the file in the
545
working directory can be used, even if its name is different in both x
548
* File-ids containing single- or double-quotes are handled correctly by
549
push. (#52227, Aaron Bentley)
551
* Normalize unicode filenames to ensure cross-platform consistency.
552
(John Arbash Meinel, #43689)
554
* The argument parser can now handle '-' as an argument. Currently
555
no code interprets it specially (it is mostly handled as a file named
556
'-'). But plugins, and future operations can use it.
557
(John Arbash meinel, #50984)
559
* Bundles can properly read binary files with a plain '\r' in them.
560
(John Arbash Meinel, #51927)
562
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
564
* Lots of win32 fixes (the test suite passes again).
565
(John Arbash Meinel, #50155)
567
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
569
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
571
* Removals are only committed if they match the filespec (or if there is
572
no filespec). (#46635, Aaron Bentley)
574
* smart-add recurses through all supplied directories
575
(John Arbash Meinel, #52578)
577
* Make the bundle reader extra lines before and after the bundle text.
578
This allows you to parse an email with the bundle inline.
579
(John Arbash Meinel, #49182)
581
* Change the file id generator to squash a little bit more. Helps when
582
working with long filenames on windows. (Also helps for unicode filenames
583
not generating hidden files). (John Arbash Meinel, #43801)
585
* Restore terminal mode on C-c while reading sftp password. (#48923,
586
Nicholas Allen, Martin Pool)
588
* Timestamps are rounded to 1ms, and revision entries can be recreated
589
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
591
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
592
use local paths, since it is user visible (John Arbash Meinel, #53653)
594
* ``bzr status foo`` when foo was unversioned used to cause a full delta
595
to be generated (John Arbash Meinel, #53638)
597
* When reading revision properties, an empty value should be considered
598
the empty string, not None (John Arbash Meinel, #47782)
600
* ``bzr diff --diff-options`` can now handle binary files being changed.
601
Also, the output is consistent when --diff-options is not supplied.
602
(John Arbash Meinel, #54651, #52930)
604
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
606
* Fix Branch.get_parent() to handle the case when the parent is not
607
accessible (John Arbash Meinel, #52976)
611
* Combine the ignore rules into a single regex rather than looping over
612
them to reduce the threshold where N^2 behaviour occurs in operations
613
like status. (Jan Hudec, Robert Collins).
615
* Appending to bzrlib.DEFAULT_IGNORE is now deprecated. Instead, use
616
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
618
* 'bzr push' should only push the ancestry of the current revision, not
619
all of the history in the repository. This is especially important for
620
shared repositories. (John Arbash Meinel)
622
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
623
rather than randomly walking the inventories. (John Arbash Meinel)
625
* Doctests are now run in temporary directories which are cleaned up when
626
they finish, rather than using special ScratchDir/ScratchBranch objects.
629
* Split ``check`` into separate methods on the branch and on the repository,
630
so that it can be specialized in ways that are useful or efficient for
631
different formats. (Martin Pool, Robert Collins)
633
* Deprecate Repository.all_revision_ids; most methods don't really need
634
the global revision graph but only that part leading up to a particular
635
revision. (Martin Pool, Robert Collins)
637
* Add a BzrDirFormat control_formats list which allows for control formats
638
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
639
(Robert Collins, Jelmer Vernooij).
641
* bzrlib.diff.external_diff can be redirected to any file-like object.
642
Uses subprocess instead of spawnvp.
643
(#4047, #48914, James Henstridge, John Arbash Meinel)
645
* New command line option '--profile-imports', which will install a custom
646
importer to log time to import modules and regex compilation time to
647
sys.stderr (John Arbash Meinel)
649
* 'EmptyTree' is now deprecated, please use repository.revision_tree(None)
650
instead. (Robert Collins)
652
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
658
* setup.py failed to install launchpad plugin. (Martin Pool)
664
* Fix failure to commit a merge in a checkout. (Martin Pool,
665
Robert Collins, Erik Bågfors, #43959)
667
* Nicer messages from 'commit' in the case of renames, and correct
668
messages when a merge has occured. (Robert Collins, Martin Pool)
670
* Separate functionality from assert statements as they are skipped in
671
optimized mode of python. Add the same check to pending merges.
672
(#44443, Olaf Conradi)
676
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
678
* Add info on standalone branches without a working tree.
679
(#44155, Olaf Conradi)
681
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
685
* Make editor invocation comply with Debian Policy. First check
686
environment variables VISUAL and EDITOR, then try editor from
687
alternatives system. If that all fails, fall back to the pre-defined
688
list of editors. (#42904, Olaf Conradi)
692
* New 'register-branch' command registers a public branch into
693
Launchpad.net, where it can be associated with bugs, etc.
694
(Martin Pool, Bjorn Tillenius, Robert Collins)
698
* New public api in InventoryEntry - 'describe_change(old, new)' which
699
provides a human description of the changes between two old and
700
new. (Robert Collins, Martin Pool)
704
* Fix test case for bzr info in upgrading a standalone branch to metadir,
705
uses bzrlib api now. (Olaf Conradi)
709
NOTES WHEN UPGRADING:
711
Release 0.8 of bzr introduces a new format for history storage, called
712
'knit', as an evolution of to the 'weave' format used in 0.7. Local
713
and remote operations are faster using knits than weaves. Several
714
operations including 'init', 'init-repo', and 'upgrade' take a
715
--format option that controls this. Branching from an existing branch
716
will keep the same format.
718
It is possible to merge, pull and push between branches of different
719
formats but this is slower than moving data between homogenous
720
branches. It is therefore recommended (but not required) that you
721
upgrade all branches for a project at the same time. Information on
722
formats is shown by 'bzr info'.
724
bzr 0.8 now allows creation of 'repositories', which hold the history
725
of files and revisions for several branches. Previously bzr kept all
726
the history for a branch within the .bzr directory at the root of the
727
branch, and this is still the default. To create a repository, use
728
the new 'bzr init-repo' command. Branches exist as directories under
729
the repository and contain just a small amount of information
730
indicating the current revision of the branch.
732
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
733
subversion. Checkouts are associated with a branch (optionally in a
734
repository), which contains all the historical information. The
735
result is that a checkout can be deleted without losing any
736
already-committed revisions. A new 'update' command is also available.
738
Repositories and checkouts are not supported with the 0.7 storage
739
format. To use them you must upgrad to either knits, or to the
740
'metaweave' format, which uses weaves but changes the .bzr directory
746
* Sftp paths can now be relative, or local, according to the lftp
747
convention. Paths now take the form:
748
sftp://user:pass@host:port/~/relative/path
750
sftp://user:pass@host:port/absolute/path
752
* The FTP transport now tries to reconnect after a temporary
753
failure. ftp put is made atomic. (Matthieu Moy)
755
* The FTP transport now maintains a pool of connections, and
756
reuses them to avoid multiple connections to the same host (like
757
sftp did). (Daniel Silverstone)
759
* The bzr_man.py file has been removed. To create the man page now,
760
use ./generate_docs.py man. The new program can also create other files.
761
Run "python generate_docs.py --help" for usage information. (Hans
762
Ulrich Niedermann & James Blackwell).
764
* Man Page now gives full help (James Blackwell). Help also updated to
765
reflect user config now being stored in .bazaar (Hans Ulrich
768
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
770
* Pull now accepts a --revision argument (Erik Bågfors)
772
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
773
line. You can now use the following command to sign all of your old commits.
774
find .bzr/revision-store// -name my@email-* \
775
| sed 's/.*\/\/..\///' \
778
* Upgrade can now upgrade over the network. (Robert Collins)
780
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
781
behaviour. By default they will cache history in the checkout, but
782
with --lightweight almost all data is kept in the master branch.
785
* 'revert' unversions newly-versioned files, instead of deleting them.
787
* 'merge' is more robust. Conflict messages have changed.
789
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
792
* Default log format can be set in configuration and plugins can register
793
their own formatters. (Erik Bågfors)
795
* New 'reconcile' command will check branch consistency and repair indexes
796
that can become out of sync in pre 0.8 formats. (Robert Collins,
799
* New 'bzr init --format' and 'bzr upgrade --format' option to control
800
what storage format is created or produced. (Robert Collins,
803
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
805
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
807
* New 'init-repository' command, plus support for repositories in 'init'
808
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
810
* Improve output of 'info' command. Show all relevant locations related to
811
working tree, branch and repository. Use kibibytes for binary quantities.
812
Fix off-by-one error in missing revisions of working tree. Make 'info'
813
work on branches, repositories and remote locations. Show locations
814
relative to the shared repository, if applicable. Show locking status
815
of locations. (Olaf Conradi)
817
* Diff and merge now safely handle binary files. (Aaron Bentley)
819
* 'pull' and 'push' now normalise the revision history, so that any two
820
branches with the same tip revision will have the same output from 'log'.
823
* 'merge' accepts --remember option to store parent location, like 'push'
824
and 'pull'. (Olaf Conradi)
826
* bzr status and diff when files given as arguments do not exist
827
in the relevant trees. (Martin Pool, #3619)
829
* Add '.hg' to the default ignore list. (Martin Pool)
831
* 'knit' is now the default disk format. This improves disk performance and
832
utilization, increases incremental pull performance, robustness with SFTP
833
and allows checkouts over SFTP to perform acceptably.
834
The initial Knit code was contributed by Johan Rydberg based on a
835
specification by Martin Pool.
836
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
838
* New tool to generate all-in-one html version of the manual. (Alexander
841
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
842
to be left in the SFTP repository. (Robert Collins, Martin Pool).
844
* New option 'diff --prefix' to control how files are named in diff
845
output, with shortcuts '-p0' and '-p1' corresponding to the options for
846
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
848
* Add --revision option to 'annotate' command. (Olaf Conradi)
850
* If bzr shows an unexpected revision-history after pulling (perhaps due
851
to a reweave) it can now be corrected by 'bzr reconcile'.
856
* Commit is now verbose by default, and shows changed filenames and the
857
new revision number. (Robert Collins, Martin Pool)
859
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
861
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
863
* Make 'pull' and 'push' remember location on failure using --remember.
866
* For compatibility, make old format for using weaves inside metadir
867
available as 'metaweave' format. Rename format 'metadir' to 'default'.
868
Clean up help for option --format in commands 'init', 'init-repo' and
869
'upgrade'. (Olaf Conradi)
873
* The internal storage of history, and logical branch identity have now
874
been split into Branch, and Repository. The common locking and file
875
management routines are now in bzrlib.lockablefiles.
876
(Aaron Bentley, Robert Collins, Martin Pool)
878
* Transports can now raise DependencyNotPresent if they need a library
879
which is not installed, and then another implementation will be
882
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
885
* Using Tree Transform for merge, revert, tree-building
887
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
888
Branch.initialize are now deprecated. Please see BzrDir.create_* for
889
replacement API's. (Robert Collins)
891
* New BzrDir class represents the .bzr control directory and manages
892
formatting issues. (Robert Collins)
894
* New repository.InterRepository class encapsulates Repository to
895
Repository actions and allows for clean selection of optimised code
896
paths. (Robert Collins)
898
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
899
please use 'branch.fetch' or 'repository.fetch' depending on your
900
needs. (Robert Collins)
902
* deprecated methods now have a 'is_deprecated' flag on them that can
903
be checked, if you need to determine whether a given callable is
904
deprecated at runtime. (Robert Collins)
906
* Progress bars are now nested - see
907
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
909
* New API call get_format_description() for each type of format.
912
* Changed branch.set_parent() to accept None to remove parent.
915
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
917
* WorkingTree.branch is now a read only property. (Robert Collins)
919
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
920
can be None or a factory that will create a progress bar. This is
921
useful for testing or for overriding the bzrlib.progress heuristic.
924
* New API method get_physical_lock_status() to query locks present on a
925
transport. (Olaf Conradi)
927
* Repository.reconcile now takes a thorough keyword parameter to allow
928
requesting an indepth reconciliation, rather than just a data-loss
929
check. (Robert Collins)
931
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
932
the user for yes/no style input. (Robert Collins)
936
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
937
for testing SFTP protocol support. (Robey Pointer)
939
* Branch formats are now tested once per implementation (see bzrlib.
940
tests.branch_implementations. This is analagous to the transport
941
interface tests, and has been followed up with working tree,
942
repository and BzrDir tests. (Robert Collins)
944
* New test base class TestCaseWithTransport provides a transport aware
945
test environment, useful for testing any transport-interface using
946
code. The test suite option --transport controls the transport used
947
by this class (when its not being used as part of implementation
948
contract testing). (Robert Collins)
950
* Close logging handler on disabling the test log. This will remove the
951
handler from the internal list inside python's logging module,
952
preventing shutdown from closing it twice. (Olaf Conradi)
954
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
956
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
957
will provide String("foo") to the command as its stdin.
963
* .bzrignore is excluded from exports, on the grounds that it's a bzr
964
internal-use file and may not be wanted. (Jamie Wilkinson)
966
* The "bzr directories" command were removed in favor of the new
967
--kind option to the "bzr inventory" command. To list all
968
versioned directories, now use "bzr inventory --kind directory".
971
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
972
by default. (John Arbash Meinel)
974
* The parent of Bzr configuration directory can be set by BZR_HOME
975
environment variable. Now the path for it is searched in BZR_HOME, then
976
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
977
points to C:\Documents and Settings\User Name\Application Data), HOME.
980
* Plugins with the same name in different directories in the bzr plugin
981
path are no longer loaded: only the first successfully loaded one is
982
used. (Robert Collins)
984
* Use systems' external ssh command to open connections if possible.
985
This gives better integration with user settings such as ProxyCommand.
988
* Permissions on files underneath .bzr/ are inherited from the .bzr
989
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
990
will mean that future file will be created with group write permissions.
992
* configure.in and config.guess are no longer in the builtin default
995
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
996
files. (John Arbash Meinel, Martin Pool)
1000
* "bzr INIT dir" now initializes the specified directory, and creates
1001
it if it does not exist. (John Arbash Meinel)
1003
* New remerge command (Aaron Bentley)
1005
* Better zsh completion script. (Steve Borho)
1007
* 'bzr diff' now returns 1 when there are changes in the working
1008
tree. (Robert Collins)
1010
* 'bzr push' now exists and can push changes to a remote location.
1011
This uses the transport infrastructure, and can store the remote
1012
location in the ~/.bazaar/branches.conf configuration file.
1015
* Test directories are only kept if the test fails and the user requests
1018
* Tweaks to short log printing
1020
* Added branch nicks, new nick command, printing them in log output.
1023
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
1024
occurs. (Martin Pool)
1026
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
1027
the same as Subversion. (Martin Pool)
1029
* New ftp transport support (on ftplib), for ftp:// and aftp://
1030
URLs. (Daniel Silverstone)
1032
* Commit editor temporary files now start with 'bzr_log.', to allow
1033
text editors to match the file name and set up appropriate modes or
1034
settings. (Magnus Therning)
1036
* Improved performance when integrating changes from a remote weave.
1037
(Goffredo Baroncelli)
1039
* Sftp will attempt to cache the connection, so it is more likely that
1040
a connection will be reused, rather than requiring multiple password
1043
* bzr revno now takes an optional argument indicating the branch whose
1044
revno should be printed. (Michael Ellerman)
1046
* bzr cat defaults to printing the last version of the file.
1047
(#3632, Matthieu Moy)
1049
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
1050
profiler. (Denys Duchier)
1052
* Faster commits by reading only the headers of affected weave files.
1055
* 'bzr add' now takes a --dry-run parameter which shows you what would be
1056
added, but doesn't actually add anything. (Michael Ellerman)
1058
* 'bzr add' now lists how many files were ignored per glob. add --verbose
1059
lists the specific files. (Aaron Bentley)
1061
* 'bzr missing' now supports displaying changes in diverged trees and can
1062
be limited to show what either end of the comparison is missing.
1063
(Aaron Bently, with a little prompting from Daniel Silverstone)
1067
* SFTP can walk up to the root path without index errors. (Robert Collins)
1069
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
1071
* Error when run with -OO
1073
* Fix bug in reporting http errors that don't have an http error code.
1076
* Handle more cases of pipe errors in display commands
1078
* Change status to 3 for all errors
1080
* Files that are added and unlinked before committing are completely
1081
ignored by diff and status
1083
* Stores with some compressed texts and some uncompressed texts are now
1084
able to be used. (John A Meinel)
1086
* Fix for bzr pull failing sometimes under windows
1088
* Fix for sftp transport under windows when using interactive auth
1090
* Show files which are both renamed and modified as such in 'bzr
1091
status' output. (#4503, Daniel Silverstone)
1093
* Make annotate cope better with revisions committed without a valid
1094
email address. (Marien Zwart)
1096
* Fix representation of tab characters in commit messages. (Harald
1099
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
1100
now parsed properly under Windows. (Alexander Belchenko)
1102
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
1104
* Keep a cached copy of the basis inventory to speed up operations
1105
that need to refer to it. (Johan Rydberg, Martin Pool)
1107
* Fix bugs in bzr status display of non-ascii characters. (Martin
1110
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
1113
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
1117
* Fix selftest asking for passwords when there are no SFTP keys.
1118
(Robey Pointer, Jelmer Vernooij)
1120
* Fix selftest run with 'python -O'. (Martin Pool)
1122
* Fix HTTP tests under Windows. (John Arbash Meinel)
1124
* Make tests work even if HOME is not set (Aaron Bentley)
1126
* Updated build_tree to use fixed line-endings for tests which read
1127
the file cotents and compare. Make some tests use this to pass under
1128
Windows. (John Arbash Meinel)
1130
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
1132
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
1133
(John Arbash Meinel)
1135
* Use terminal width to align verbose test output. (Martin Pool)
1137
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
1138
If adding a new test script please add that to
1139
bzrlib.tests.blackbox.__init__. (Robert Collins)
1141
* Much better error message if one of the test suites can't be
1142
imported. (Martin Pool)
1144
* Make check now runs the test suite twice - once with the default locale,
1145
and once with all locales forced to C, to expose bugs. This is not
1146
trivially done within python, so for now its only triggered by running
1147
Make check. Integrators and packagers who wish to check for full
1148
platform support should run 'make check' to test the source.
1151
* Tests can now run TestSkipped if they can't execute for any reason.
1152
(Martin Pool) (NB: TestSkipped should only be raised for correctable
1153
reasons - see the wiki spec ImprovingBzrTestSuite).
1155
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
1156
paths for the transport tests. Introduce blackbox remote sftp tests that
1157
test the same permutations. (Robert Collins, Robey Pointer)
1159
* Transport implementation tests are now independent of the local file
1160
system, which allows tests for esoteric transports, and for features
1161
not available in the local file system. They also repeat for variations
1162
on the URL scheme that can introduce issues in the transport code,
1163
see bzrlib.transport.TransportTestProviderAdapter() for this.
1166
* TestCase.build_tree uses the transport interface to build trees, pass
1167
in a transport parameter to give it an existing connection.
1172
* WorkingTree.pull has been split across Branch and WorkingTree,
1173
to allow Branch only pulls. (Robert Collins)
1175
* commands.display_command now returns the result of the decorated
1176
function. (Robert Collins)
1178
* LocationConfig now has a set_user_option(key, value) call to save
1179
a setting in its matching location section (a new one is created
1180
if needed). (Robert Collins)
1182
* Branch has two new methods, get_push_location and set_push_location
1183
to respectively, get and set the push location. (Robert Collins)
1185
* commands.register_command now takes an optional flag to signal that
1186
the registrant is planning to decorate an existing command. When
1187
given multiple plugins registering a command is not an error, and
1188
the original command class (whether built in or a plugin based one) is
1189
returned to the caller. There is a new error 'MustUseDecorated' for
1190
signalling when a wrapping command should switch to the original
1191
version. (Robert Collins)
1193
* Some option parsing errors will raise 'BzrOptionError', allowing
1194
granular detection for decorating commands. (Robert Collins).
1196
* Branch.read_working_inventory has moved to
1197
WorkingTree.read_working_inventory. This necessitated changes to
1198
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
1199
as well. To make it clear that a WorkingTree cannot always be obtained
1200
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
1201
be obtained. (Robert Collins)
1203
* All pending merges operations from Branch are now on WorkingTree.
1206
* The follow operations from Branch have moved to WorkingTree:
1214
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1216
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
1218
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
1221
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1222
query method. (Robert Collins)
1224
* New options to read only the table-of-contents of a weave.
1227
* Raise NoSuchFile when someone tries to add a non-existant file.
1230
* Simplify handling of DivergedBranches in cmd_pull().
1234
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
1235
is exposed as Branch().control_files. Also this has been altered with the
1236
controlfile pre/suffix replaced by simple method names like 'get' and
1237
'put'. (Aaron Bentley, Robert Collins).
1239
* Deprecated functions and methods can now be marked as such using the
1240
bzrlib.symbol_versioning module. Marked method have their docstring
1241
updated and will issue a DeprecationWarning using the warnings module
1242
when they are used. (Robert Collins)
1244
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1245
for functions that need unicode strings. (Robert Collins)
1251
* pull now takes --verbose to show you what revisions are added or removed
1254
* merge now takes a --show-base option to include the base text in
1258
* The config files are now read using ConfigObj, so '=' should be used as
1259
a separator, not ':'.
1262
* New 'bzr commit --strict' option refuses to commit if there are
1263
any unknown files in the tree. To commit, make sure all files are
1264
either ignored, added, or deleted. (Michael Ellerman)
1266
* The config directory is now ~/.bazaar, and there is a single file
1267
~/.bazaar/bazaar.conf storing email, editor and other preferences.
1270
* 'bzr add' no longer takes a --verbose option, and a --quiet option
1271
has been added that suppresses all output.
1273
* Improved zsh completion support in contrib/zsh, from Clint
1276
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
1277
Goffredo Baroncelli.
1279
* 'bzr check' now accepts -v for verbose reporting, and checks for
1280
ghosts in the branch. (Robert Collins)
1282
* New command 're-sign' which will regenerate the gpg signature for
1283
a revision. (Robert Collins)
1285
* If you set check_signatures=require for a path in
1286
~/.bazaar/branches.conf then bzr will invoke your
1287
gpg_signing_command (defaults to gpg) and record a digital signature
1288
of your commit. (Robert Collins)
1290
* New sftp transport, based on Paramiko. (Robey Pointer)
1292
* 'bzr pull' now accepts '--clobber' which will discard local changes
1293
and make this branch identical to the source branch. (Robert Collins)
1295
* Just give a quieter warning if a plugin can't be loaded, and
1296
put the details in .bzr.log. (Martin Pool)
1298
* 'bzr branch' will now set the branch-name to the last component of the
1299
output directory, if one was supplied.
1301
* If the option 'post_commit' is set to one (or more) python function
1302
names (must be in the bzrlib namespace), then they will be invoked
1303
after the commit has completed, with the branch and revision_id as
1304
parameters. (Robert Collins)
1306
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1308
* --merge-type weave is now supported for file contents. Tree-shape
1309
changes are still three-way based. (Martin Pool, Aaron Bentley)
1311
* 'bzr check' allows the first revision on revision-history to have
1312
parents - something that is expected for cheap checkouts, and occurs
1313
when conversions from baz do not have all history. (Robert Collins).
1315
* 'bzr merge' can now graft unrelated trees together, if your specify
1316
0 as a base. (Aaron Bentley)
1318
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
1321
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
1323
* 'bzr merge --reprocess' minimizes conflicts
1327
* The 'bzr selftest --pattern' option for has been removed, now
1328
test specifiers on the command line can be simple strings, or
1329
regexps, or both. (Robert Collins)
1331
* Passing -v to selftest will now show the time each test took to
1332
complete, which will aid in analysing performance regressions and
1333
related questions. (Robert Collins)
1335
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
1336
is given. (Martin Pool)
1338
* There is a new method for TestCaseInTempDir, assertFileEqual, which
1339
will check that a given content is equal to the content of the named
1340
file. (Robert Collins)
1342
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
1347
* New 'testament' command and concept for making gpg-signatures
1348
of revisions that are not tied to a particular internal
1349
representation. (Martin Pool).
1351
* Per-revision properties ('revprops') as key-value associated
1352
strings on each revision created when the revision is committed.
1353
Intended mainly for the use of external tools. (Martin Pool).
1355
* Config options have moved from bzrlib.osutils to bzrlib.config.
1358
* Improved command line option definitions allowing explanations
1359
for individual options, among other things. Contributed by
1362
* Config options have moved from bzrlib.osutils to bzrlib.config.
1363
Configuration is now done via the config.Config interface:
1364
Depending on whether you have a Branch, a Location or no information
1365
available, construct a *Config, and use its signature_checking,
1366
username and user_email methods. (Robert Collins)
1368
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
1369
they are made available for other plugins to use. You should not
1370
import other plugins during the __init__ of your plugin though, as
1371
no ordering is guaranteed, and the plugins directory is not on the
1372
python path. (Robert Collins)
1374
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
1375
no longer takes an inventory, rather it takes an option branch
1376
parameter, and if None is given will open the branch at basedir
1377
implicitly. (Robert Collins)
1379
* Cleaner exception structure and error reporting. Suggested by
1380
Scott James Remnant. (Martin Pool)
1382
* Branch.remove has been moved to WorkingTree, which has also gained
1383
lock_read, lock_write and unlock methods for convenience. (Robert
1386
* Two decorators, needs_read_lock and needs_write_lock have been added
1387
to the branch module. Use these to cause a function to run in a
1388
read or write lock respectively. (Robert Collins)
1390
* Branch.open_containing now returns a tuple (Branch, relative-path),
1391
which allows direct access to the common case of 'get me this file
1392
from its branch'. (Robert Collins)
1394
* Transports can register using register_lazy_transport, and they
1395
will be loaded when first used. (Martin Pool)
1397
* 'pull' has been factored out of the command as WorkingTree.pull().
1398
A new option to WorkingTree.pull has been added, clobber, which will
1399
ignore diverged history and pull anyway.
1402
* config.Config has a 'get_user_option' call that accepts an option name.
1403
This will be looked up in branches.conf and bazaar.conf as normal.
1404
It is intended that this be used by plugins to support options -
1405
options of built in programs should have specific methods on the config.
1408
* merge.merge_inner now has tempdir as an optional parameter. (Robert
1411
* Tree.kind is not recorded at the top level of the hierarchy, as it was
1412
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
1415
* WorkingTree.__del__ has been removed, it was non deterministic and not
1416
doing what it was intended to. See WorkingTree.__init__ for a comment
1417
about future directions. (Robert Collins/Martin Pool)
1419
* bzrlib.transport.http has been modified so that only 404 urllib errors
1420
are returned as NoSuchFile. Other exceptions will propogate as normal.
1421
This allows debuging of actual errors. (Robert Collins)
1423
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
1424
to apis like 'put', 'get' and 'has'. This is to provide consistent
1425
behaviour - it operates on url's only. (Robert Collins)
1427
* Transports can register using register_lazy_transport, and they
1428
will be loaded when first used. (Martin Pool)
1430
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
1431
is called by merge_inner. This is so that the conflict count can be
1432
retrieved (and potentially manipulated) before returning to the caller
1433
of merge_inner. Likewise 'merge' now returns the conflict count to the
1434
caller. (Robert Collins)
1436
* 'revision.revision_graph can handle having only partial history for
1437
a revision - that is no revisions in the graph with no parents.
1440
* New builtins.branch_files uses the standard file_list rules to produce
1441
a branch and a list of paths, relative to that branch (Aaron Bentley)
1443
* New TestCase.addCleanup facility.
1445
* New bzrlib.version_info tuple (similar to sys.version_info), which can
1446
be used by programs importing bzrlib.
1450
* Better handling of branches in directories with non-ascii names.
1451
(Joel Rosdahl, Panagiotis Papadakos)
1453
* Upgrades of trees with no commits will not fail due to accessing
1454
[-1] in the revision-history. (Andres Salomon)
1457
bzr 0.1.1 2005-10-12
1461
* Fix problem in pulling over http from machines that do not
1462
allow directories to be listed.
1464
* Avoid harmless warning about invalid hash cache after
1465
upgrading branch format.
1469
* Avoid some unnecessary http operations in branch and pull.
1476
* 'bzr branch' over http initially gives a very high estimate
1477
of completion time but it should fall as the first few
1478
revisions are pulled in. branch is still slow on
1479
high-latency connections.
1483
* bzr-man.py has been updated to work again. Contributed by
1486
* Locking is now done with fcntl.lockf which works with NFS
1487
file systems. Contributed by Harald Meland.
1489
* When a merge encounters a file that has been deleted on
1490
one side and modified on the other, the old contents are
1491
written out to foo.BASE and foo.SIDE, where SIDE is this
1492
or OTHER. Contributed by Aaron Bentley.
1494
* Export was choosing incorrect file paths for the content of
1495
the tarball, this has been fixed by Aaron Bentley.
1497
* Commit will no longer commit without a log message, an
1498
error is returned instead. Contributed by Jelmer Vernooij.
1500
* If you commit a specific file in a sub directory, any of its
1501
parent directories that are added but not listed will be
1502
automatically included. Suggested by Michael Ellerman.
1504
* bzr commit and upgrade did not correctly record new revisions
1505
for files with only a change to their executable status.
1506
bzr will correct this when it encounters it. Fixed by
1509
* HTTP tests now force off the use of http_proxy for the duration.
1510
Contributed by Gustavo Niemeyer.
1512
* Fix problems in merging weave-based branches that have
1513
different partial views of history.
1515
* Symlink support: working with symlinks when not in the root of a
1516
bzr tree was broken, patch from Scott James Remnant.
1520
* 'branch' now accepts a --basis parameter which will take advantage
1521
of local history when making a new branch. This allows faster
1522
branching of remote branches. Contributed by Aaron Bentley.
1524
* New tree format based on weave files, called version 5.
1525
Existing branches can be upgraded to this format using
1528
* Symlinks are now versionable. Initial patch by
1529
Erik Toubro Nielsen, updated to head by Robert Collins.
1531
* Executable bits are tracked on files. Patch from Gustavo
1534
* 'bzr status' now shows unknown files inside a selected directory.
1535
Patch from Heikki Paajanen.
1537
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1538
and 'resolve' have needed added, which list and remove those
1539
merge conflicts respectively. A conflicted tree cannot be committed
1540
in. Contributed by Aaron Bentley.
1542
* 'rm' is now an alias for 'remove'.
1544
* Stores now split out their content in a single byte prefixed hash,
1545
dropping the density of files per directory by 256. Contributed by
1548
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1549
Contributed by Robert Collins.
1551
* 'bzr log' with the default formatter will show merged revisions,
1552
indented to the right. Initial implementation contributed by Gustavo
1553
Niemeyer, made incremental by Robert Collins.
1558
* Test case failures have the exception printed after the log
1559
for your viewing pleasure.
1561
* InventoryEntry is now an abstract base class, use one of the
1562
concrete InventoryDirectory etc classes instead.
1564
* Branch raises an UnsupportedFormatError when it detects a
1565
bzr branch it cannot understand. This allows for precise
1566
handling of such circumstances.
1571
* Removed testsweet module so that tests can be run after
1572
bzr installed by 'bzr selftest'.
1574
* 'bzr selftest' command-line arguments can now be partial ids
1575
of tests to run, e.g. 'bzr selftest test_weave'
1578
bzr 0.0.9 2005-09-23
1582
* Fixed "branch -r" option.
1584
* Fix remote access to branches containing non-compressed history.
1587
* Better reliability of http server tests. (John Arbash-Meinel)
1589
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1591
* Various minor bug in windows support have been fixed, largely in the
1592
test suite. Contributed by Alexander Belchenko.
1596
* Status now accepts a -r argument to give status between chosen
1597
revisions. Contributed by Heikki Paajanen.
1599
* Revision arguments no longer use +/-/= to control ranges, instead
1600
there is a 'before' namespace, which limits the successive namespace.
1601
For example '$ bzr log -r date:yesterday..before:date:today' will
1602
select everything from yesterday and before today. Contributed by
1605
* There is now a bzr.bat file created by distutils when building on
1606
Windows. Contributed by Alexander Belchenko.
1610
* Removed uuid() as it was unused.
1612
* Improved 'fetch' code for pulling revisions from one branch into
1613
another (used by pull, merged, etc.)
1616
bzr 0.0.8 2005-09-20
1620
* Adding a file whose parent directory is not versioned will
1621
implicitly add the parent, and so on up to the root. This means
1622
you should never need to explictly add a directory, they'll just
1623
get added when you add a file in the directory. Contributed by
1626
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1629
* If you set BZR_EDITOR in the environment, it is checked in
1630
preference to EDITOR and the config file for the interactive commit
1631
editing program. Related to this is a bugfix where a missing program
1632
set in EDITOR would cause editing to fail, now the fallback program
1633
for the operating system is still tried.
1635
* Files that are not directories/symlinks/regular files will no longer
1636
cause bzr to fail, it will just ignore them by default. You cannot add
1637
them to the tree though - they are not versionable.
1642
* Refactor xml packing/unpacking.
1646
* Fixed 'bzr mv' by Ollie Rutherfurd.
1648
* Fixed strange error when trying to access a nonexistent http
1651
* Make sure that the hashcache gets written out if it can't be
1657
* Various Windows fixes from Ollie Rutherfurd.
1659
* Quieten warnings about locking; patch from Matt Lavin.
1662
bzr-0.0.7 2005-09-02
1666
* ``bzr shell-complete`` command contributed by Clint Adams to
1667
help with intelligent shell completion.
1669
* New expert command ``bzr find-merge-base`` for debugging merges.
1674
* Much better merge support.
1676
* merge3 conflicts are now reported with markers like '<<<<<<<'
1677
(seven characters) which is the same as CVS and pleases things
1683
* ``bzr upgrade`` no longer fails when trying to fix trees that
1684
mention revisions that are not present.
1686
* Fixed bugs in listing plugins from ``bzr plugins``.
1688
* Fix case of $EDITOR containing options for the editor.
1690
* Fix log -r refusing to show the last revision.
1691
(Patch from Goffredo Baroncelli.)
1696
* ``bzr log --show-ids`` shows the revision ids of all parents.
1698
* Externally provided commands on your $BZRPATH no longer need
1699
to recognize --bzr-usage to work properly, and can just handle
1705
* Changed trace messages to go through the standard logging
1706
framework, so that they can more easily be redirected by
1711
bzr-0.0.6 2005-08-18
1715
* Python plugins, automatically loaded from the directories on
1716
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1718
* New 'bzr mkdir' command.
1720
* Commit mesage is fetched from an editor if not given on the
1721
command line; patch from Torsten Marek.
1723
* ``bzr log -m FOO`` displays commits whose message matches regexp
1726
* ``bzr add`` with no arguments adds everything under the current directory.
1728
* ``bzr mv`` does move or rename depending on its arguments, like
1731
* ``bzr missing`` command shows a summary of the differences
1732
between two trees. (Merged from John Arbash-Meinel.)
1734
* An email address for commits to a particular tree can be
1735
specified by putting it into .bzr/email within a branch. (Based
1736
on a patch from Heikki Paajanen.)
1741
* Faster working tree operations.
1746
* 3rd-party modules shipped with bzr are copied within the bzrlib
1747
python package, so that they can be installed by the setup
1748
script without clashing with anything already existing on the
1749
system. (Contributed by Gustavo Niemeyer.)
1751
* Moved plugins directory to bzrlib/, so that there's a standard
1752
plugin directory which is not only installed with bzr itself but
1753
is also available when using bzr from the development tree.
1754
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1755
standard plugins directory.
1757
* When exporting to a tarball with ``bzr export --format tgz``, put
1758
everything under a top directory rather than dumping it into the
1759
current directory. This can be overridden with the ``--root``
1760
option. Patch from William Dodé and John Meinel.
1762
* New ``bzr upgrade`` command to upgrade the format of a branch,
1763
replacing ``bzr check --update``.
1765
* Files within store directories are no longer marked readonly on
1768
* Changed ``bzr log`` output to a more compact form suggested by
1769
John A Meinel. Old format is available with the ``--long`` or
1770
``-l`` option, patched by William Dodé.
1772
* By default the commit command refuses to record a revision with
1773
no changes unless the ``--unchanged`` option is given.
1775
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1776
line options must come before the command name because they
1777
affect what commands are available; all other options must come
1778
after the command name because their interpretation depends on
1781
* ``branch`` and ``clone`` added as aliases for ``branch``.
1783
* Default log format is back to the long format; the compact one
1784
is available with ``--short``.
1789
* Fix bugs in committing only selected files or within a subdirectory.
1792
bzr-0.0.5 2005-06-15
1796
* ``bzr`` with no command now shows help rather than giving an
1797
error. Suggested by Michael Ellerman.
1799
* ``bzr status`` output format changed, because svn-style output
1800
doesn't really match the model of bzr. Now files are grouped by
1801
status and can be shown with their IDs. ``bzr status --all``
1802
shows all versioned files and unknown files but not ignored files.
1804
* ``bzr log`` runs from most-recent to least-recent, the reverse
1805
of the previous order. The previous behaviour can be obtained
1806
with the ``--forward`` option.
1808
* ``bzr inventory`` by default shows only filenames, and also ids
1809
if ``--show-ids`` is given, in which case the id is the second
1815
* New 'bzr whoami --email' option shows only the email component
1816
of the user identification, from Jo Vermeulen.
1818
* New ``bzr ignore PATTERN`` command.
1820
* Nicer error message for broken pipe, interrupt and similar
1821
conditions that don't indicate an internal error.
1823
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1825
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1826
either read or write mode.
1828
* New option ``bzr log --show-ids`` shows revision and file ids.
1830
* New usage ``bzr log FILENAME`` shows only revisions that
1833
* Changed format for describing changes in ``bzr log -v``.
1835
* New option ``bzr commit --file`` to take a message from a file,
1836
suggested by LarstiQ.
1838
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1839
Oler. File may be in a branch other than the working directory.
1841
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1844
* Commands can now be defined by external programs or scripts
1845
in a directory on $BZRPATH.
1847
* New "stat cache" avoids reading the contents of files if they
1848
haven't changed since the previous time.
1850
* If the Python interpreter is too old, try to find a better one
1851
or give an error. Based on a patch from Fredrik Lundh.
1853
* New optional parameter ``bzr info [BRANCH]``.
1855
* New form ``bzr commit SELECTED`` to commit only selected files.
1857
* New form ``bzr log -r FROM:TO`` shows changes in selected
1858
range; contributed by John A Meinel.
1860
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1861
options through to an external GNU diff.
1863
* New option ``bzr add --no-recurse`` to add a directory but not
1866
* ``bzr --version`` now shows more information if bzr is being run
1872
* Fixed diff format so that added and removed files will be
1873
handled properly by patch. Fix from Lalo Martins.
1875
* Various fixes for files whose names contain spaces or other
1881
* Converted black-box test suites from Bourne shell into Python;
1882
now run using ``./testbzr``. Various structural improvements to
1885
* testbzr by default runs the version of bzr found in the same
1886
directory as the tests, or the one given as the first parameter.
1888
* testbzr also runs the internal tests, so the only command
1889
required to check is just ``./testbzr``.
1891
* testbzr requires python2.4, but can be used to test bzr running
1892
under a different version.
1894
* Tests added for many other changes in this release.
1899
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1901
* Refactor command functions into Command objects based on HCT by
1902
Scott James Remnant.
1904
* Better help messages for many commands.
1906
* Expose bzrlib.open_tracefile() to start the tracefile; until
1907
this is called trace messages are just discarded.
1909
* New internal function find_touching_revisions() and hidden
1910
command touching-revisions trace the changes to a given file.
1912
* Simpler and faster compare_inventories() function.
1914
* bzrlib.open_tracefile() takes a tracefilename parameter.
1916
* New AtomicFile class.
1918
* New developer commands ``added``, ``modified``.
1923
* Cope on Windows on python2.3 by using the weaker random seed.
1924
2.4 is now only recommended.
1927
bzr-0.0.4 2005-04-22
1931
* 'bzr diff' optionally takes a list of files to diff. Still a bit
1932
basic. Patch from QuantumG.
1934
* More default ignore patterns.
1936
* New 'bzr log --verbose' shows a list of files changed in the
1937
changeset. Patch from Sebastian Cote.
1939
* Roll over ~/.bzr.log if it gets too large.
1941
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
1944
* New 'bzr help commands' based on a patch from Denys Duchier.
1949
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
1950
or $EMAIL. All are decoded by the locale preferred encoding.
1951
If none of these are present user@hostname is used. The host's
1952
fully-qualified name is not used because that tends to fail when
1953
there are DNS problems.
1955
* New 'bzr whoami' command instead of username user-email.
1960
* Make commit safe for hardlinked bzr trees.
1962
* Some Unicode/locale fixes.
1964
* Partial workaround for difflib.unified_diff not handling
1965
trailing newlines properly.
1970
* Allow docstrings for help to be in PEP0257 format. Patch from
1973
* More tests in test.sh.
1975
* Write profile data to a temporary file not into working
1976
directory and delete it when done.
1978
* Smaller .bzr.log with process ids.
1983
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
1986
* Some improvements in handling paths on Windows, based on a patch
1990
bzr-0.0.3 2005-04-06
1994
* New "directories" internal command lists versioned directories
1997
* Can now say "bzr commit --help".
1999
* New "rename" command to rename one file to a different name
2002
* New "move" command to move one or more files into a different
2005
* New "renames" command lists files renamed since base revision.
2007
* New cat command contributed by janmar.
2011
* .bzr.log is placed in $HOME (not pwd) and is always written in
2012
UTF-8. (Probably not a completely good long-term solution, but
2017
* Workaround for difflib bug in Python 2.3 that causes an
2018
exception when comparing empty files. Reported by Erik Toubro
2023
* Refactored inventory storage to insert a root entry at the top.
2027
* Start of shell-based black-box testing in test.sh.
2034
* Win32 fixes from Steve Brown.
2037
bzr-0.0.2 "black cube" 2005-03-31
2041
* Default ignore list extended (see bzrlib/__init__.py).
2043
* Patterns in .bzrignore are now added to the default ignore list,
2044
rather than replacing it.
2046
* Ignore list isn't reread for every file.
2050
* Reinstate the 'bzr check' command to check invariants of the
2053
* New 'ignored' command lists which files are ignored and why;
2054
'deleted' lists files deleted in the current working tree.
2056
* Performance improvements.
2058
* New global --profile option.
2060
* Ignore patterns like './config.h' now correctly match files in
2061
the root directory only.
2064
bzr-0.0.1 2005-03-26
2068
* More information from info command.
2070
* Can now say "bzr help COMMAND" for more detailed help.
2072
* Less file flushing and faster performance when writing logs and
2073
committing to stores.
2075
* More useful verbose output from some commands.
2079
* Fix inverted display of 'R' and 'M' during 'commit -v'.
2083
* Include a subset of ElementTree-1.2.20040618 to make
2084
installation easier.
2086
* Fix time.localtime call to work with Python 2.3 (the minimum
2090
bzr-0.0.0.69 2005-03-22
2094
* First public release.
2096
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
