5
* ``bzr export`` allows an optional branch parameter, to export a bzr
6
tree from some other url. For example:
7
``bzr export bzr.tar.gz http://bazaar-vcs.org/bzr/bzr.dev``
10
* Added ``bzr help topics`` to the bzr help system. This gives a
11
location for general information, outside of a specific command.
12
This includes updates for ``bzr help revisionspec`` the first topic
13
included. (Goffredo Baroncelli, John Arbash Meinel, #42714)
17
* New -D option given before the command line turns on debugging output
18
for particular areas. -Derror shows tracebacks on all errors.
21
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
22
and remove benchmarks that take longer than 10min to run.
25
* Use ``time.time()`` instead of ``time.clock()`` to decide on
26
progress throttling. Because ``time.clock()`` is actually CPU time,
27
so over a high-latency connection, too many updates get throttled.
30
* ``MemoryTransport.list_dir()`` would strip the first character for
31
files or directories in root directory. (John Arbash Meinel)
35
* ``bzrlib/bzrdir.py`` was directly referencing ``bzrlib.workingtree``,
36
without importing it. This prevented ``bzr upgrade`` from working
37
unless a plugin already imported ``bzrlib.workingtree``
38
(John Arbash Meinel, #70716)
40
* _KnitIndex.add_versions() dictionary compresses revision ids as they
41
are added. This fixes bug where fetching remote revisions records
42
them as full references rather than integers. (John Arbash Meinel,
45
* ``bzr ignore`` strips trailing slashes in patterns.
46
Also ``bzr ignore`` rejects absolute paths. (Kent Gibson, #4559)
48
* ``bzr ignore`` takes multiple arguments. (Cheuksan Edward Wang, #29488)
50
* mv correctly handles paths that traverse symlinks.
51
(Aaron Bentley, #66964)
53
* Give nicer looking error messages when failing to connect over ssh.
54
(John Arbash Meinel, #49172)
56
* Pushing to a remote branch does not currently update the remote working
57
tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
58
machine now show that the working tree is out of date.
59
(Cheuksan Edward Wang #48136)
61
* Use patiencediff instead of difflib for determining deltas to insert
62
into knits. This avoids the O(N^3) behavior of difflib. Patience
63
diff should be O(N^2). (Cheuksan Edward Wang, #65714)
65
* Running ``bzr log`` on nonexistent file gives an error instead of the
66
entire log history. (Cheuksan Edward Wang #50793)
68
* ``bzr cat`` can look up contents of removed or renamed files. If the
69
pathname is ambiguous, i.e. the files in the old and new trees have
70
different id's, the default is the file in the new tree. The user can
71
use "--name-from-revision" to select the file in the old tree.
72
(Cheuksan Edward Wang, #30190)
78
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
79
and remove benchmarks that take longer than 10min to run.
82
bzr 0.12rc1 2006-10-23
86
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
87
rather than just showing a decimal revision number for revisions on the
88
mainline. These revision numbers are not yet accepted as input into bzr
89
commands such as log, diff etc. (Robert Collins)
91
* revisions can now be specified using dotted-decimal revision numbers.
92
For instance, ``bzr diff -r 1.2.1..1.2.3. (Robert Collins)
94
* ``bzr help commands`` output is now shorter (Aaron Bentley)
96
* New connection: ``bzr+http://`` which supports tunnelling the smart
97
protocol over an HTTP connection. If writing is enabled on the bzr
98
server, then you can write over the http connection.
101
* ``bzr`` now uses lazy importing to reduce the startup time. This has
102
a moderate effect on lots of actions, especially ones that have
103
little to do. For example ``bzr rocks`` time is down to 116ms from
104
283ms. (John Arbash Meinel)
106
* New Registry class to provide name-to-object registry-like support,
107
for example for schemes where plugins can register new classes to
108
do certain tasks (e.g. log formatters). Also provides lazy registration
109
to allow modules to be loaded on request. (John Arbash Meinel, Adeodato
114
* LogFormatter subclasses show now expect the 'revno' parameter to
115
show() to be a string rather than an int. (Robert Collins)
119
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
120
can take a ``working_dir='foo'`` parameter, which will change directory
121
for the command. (John Arbash Meinel)
123
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
124
around a regex, which defers compilation until first use.
127
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
128
``--no-plugins`` parameter to ensure test reproducability, and avoid
129
problems with system-wide installed plugins. (John Arbash Meinel)
131
* Unique tree root ids are now supported. Newly created trees still
132
use the common root id for compatibility with bzr versions before 0.12.
135
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
136
pass in inventory.ROOT_ID if you want the default root id value.
137
(Robert Collins, John Arbash Meinel)
139
* New method ``WorkingTree.flush()`` which will write the current memory
140
inventory out to disk. At the same time, read_working_inventory will
141
no longer trash the current tree inventory if it has been modified within
142
the current lock, and the tree will now ``flush()`` automatically on
143
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
144
advantage of this functionality. (Robert Collins, John Arbash Meinel)
146
* ``bzrlib.tsort.merge_sorted`` now accepts ``generate_revnos``. This
147
parameter will cause it to add another column to its output, which
148
contains the dotted-decimal revno for each revision, as a tuple.
151
* ``LogFormatter.show_merge`` is deprecated in favour of
152
``LogFormatter.show_merge_revno``. (Robert Collins)
156
* Avoid circular imports by creating a deprecated function for
157
``bzrlib.tree.RevisionTree``. Callers should have been using
158
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel,
161
* Don't use ``socket.MSG_WAITALL`` as it doesn't exist on all
162
platforms. (Martin Pool, #66356)
164
* Don't require ``Content-Type`` in range responses. Assume they are a
165
single range if ``Content-Type`` does not exist.
166
(John Arbash Meinel, #62473)
168
* bzr branch/pull no longer complain about progress bar cleanup when
169
interrupted during fetch. (Aaron Bentley, #54000)
171
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
172
the basis inventory, rather than going through the repository. This
173
allows us to have 1 inventory read, and 2 inventory writes when
174
committing a new tree. (John Arbash Meinel)
176
* When reverting, files that are not locally modified that do not exist
177
in the target are deleted, not just unversioned (Aaron Bentley)
179
* When trying to acquire a lock, don't fail immediately. Instead, try
180
a few times (up to 1 hour) before timing out. Also, report why the
181
lock is unavailable (John Arbash Meinel, #43521, #49556)
183
* Leave HttpTransportBase daughter classes decides how they
184
implement cloning. (Vincent Ladeuil, #61606)
186
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
188
* If a commit fails, the commit message is stored in a file at the root of
189
the tree for later commit. (Cheuksan Edward Wang, Stefan Metzmacher,
194
* New test base class TestCaseWithMemoryTransport offers memory-only
195
testing facilities: its not suitable for tests that need to mutate disk
196
state, but most tests should not need that and should be converted to
197
TestCaseWithMemoryTransport. (Robert Collins)
199
* ``TestCase.make_branch_and_memory_tree`` now takes a format
200
option to set the BzrDir, Repository and Branch formats of the
201
created objects. (Robert Collins, John Arbash Meinel)
205
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
207
bzr 0.11rc2 2006-09-27
211
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
213
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
216
bzr 0.11rc1 2006-09-25
220
* Knit files now wait to create their contents until the first data is
221
added. The old code used to create an empty .knit and a .kndx with just
222
the header. However, this caused a lot of extra round trips over sftp.
223
This can change the time for ``bzr push`` to create a new remote branch
224
from 160s down to 100s. This also affects ``bzr commit`` performance when
225
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
226
down to 40s (John Arbash Meinel, #44692)
228
* When an entire subtree has been deleted, commit will now report that
229
just the top of the subtree has been deleted, rather than reporting
230
all the individual items. (Robert Collins)
232
* Commit performs one less XML parse. (Robert Collins)
234
* ``bzr checkout`` now operates on readonly branches as well
235
as readwrite branches. This fixes bug #39542. (Robert Collins)
237
* ``bzr bind`` no longer synchronises history with the master branch.
238
Binding should be followed by an update or push to synchronise the
239
two branches. This is closely related to the fix for bug #39542.
242
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
243
objects. This allows all imports to stay at the global scope, but
244
modules will not actually be imported if they are not used.
247
* Support bzr:// and bzr+ssh:// urls to work with the new RPC-based
248
transport which will be used with the upcoming high-performance smart
249
server. The new command ``bzr serve`` will invoke bzr in server mode,
250
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
253
* New command ``bzr version-info`` which can be used to get a summary
254
of the current state of the tree. This is especially useful as part
255
of a build commands. See ``doc/version_info.txt`` for more information
260
* 'bzr inventory [FILE...]' allows restricting the file list to a
261
specific set of files. (John Arbash Meinel, #3631)
263
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
265
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
266
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
267
reading a nested Stanza. (John Arbash Meinel)
269
* Transform._set_mode() needs to stat the right file.
270
(John Arbash Meinel, #56549)
272
* Raise WeaveFormatError rather than StopIteration when trying to read
273
an empty Weave file. (John Arbash Meinel, #46871)
275
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
276
(Vincent Ladeuil, #59835)
278
* Handle boundary="" lines properly to allow access through a Squid proxy.
279
(John Arbash Meinel, #57723)
281
* revert now removes newly-added directories (Aaron Bentley, #54172)
283
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
284
isn't a working tree. (David Allouche, #40679)
286
* Give nicer error messages when a user supplies an invalid --revision
287
parameter. (John Arbash Meinel, #55420)
289
* Handle when LANG is not recognized by python. Emit a warning, but
290
just revert to using 'ascii'. (John Arbash Meinel, #35392)
292
* Don't use preexec_fn on win32, as it is not supported by subprocess.
295
* Skip specific tests when the dependencies aren't met. This includes
296
some ``setup.py`` tests when ``python-dev`` is not available, and
297
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
299
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
300
the system. (Andrew Bennetts, John Arbash Meinel)
302
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
303
other branch, and will not push or pull between the two branches.
304
API users will need to perform a push or pull or update operation if they
305
require branch synchronisation to take place. (Robert Collins, #47344)
307
* When creating a tarball or zipfile export, export unicode names as utf-8
308
paths. This may not work perfectly on all platforms, but has the best
309
chance of working in the common case. (John Arbash Meinel, #56816)
311
* When committing, only files that exist in working tree or basis tree
312
may be specified (Aaron Bentley, #50793)
316
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
320
* TestCaseInTempDir now creates a separate directory for HOME, rather
321
than having HOME set to the same location as the working directory.
324
* run_bzr_subprocess() can take an optional 'env_changes={}' parameter,
325
which will update os.environ inside the spawned child. It also can
326
take a 'universal_newlines=True', which helps when checking the output
327
of the command. (John Arbash Meinel)
329
* Refactor SFTP vendors to allow easier re-use when ssh is used.
332
* Transport.list_dir() and Transport.iter_files_recursive() should always
333
return urlescaped paths. This is now tested (there were bugs in a few
334
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
336
* New utility function symbol_versioning.deprecation_string. Returns the
337
formatted string for a callable, deprecation format pair. (Robert Collins)
339
* New TestCase helper applyDeprecated. This allows you to call a callable
340
which is deprecated without it spewing to the screen, just by supplying
341
the deprecation format string issued for it. (Robert Collins)
343
* Transport.append and Transport.put have been deprecated in favor of
344
.append_bytes, .append_file, .put_bytes, and .put_file. This removes the
345
ambiguity in what type of object the functions take.
346
Transport.non_atomic_put_{bytes,file} has also been added. Which works
347
similarly to Transport.append() except for SFTP, it doesn't have a round
348
trip when opening the file. Also, it provides functionality for creating
349
a parent directory when trying to create a file, rather than raise
350
NoSuchFile and forcing the caller to repeat their request.
353
* WorkingTree has a new api ``unversion`` which allow the unversioning of
354
entries by their file id. (Robert Collins)
356
* WorkingTree.pending_merges is deprecated. Please use the get_parent_ids
357
(introduced in 0.10) method instead. (Robert Collins)
359
* WorkingTree has a new lock_tree_write method which locks the branch for
360
read rather than write. This is appropriate for actions which only need
361
the branch data for reference rather than mutation. A new decorator
362
needs_tree_write_lock is provided in the workingtree module. Like the
363
needs_read_lock and needs_write_lock decorators this allows static
364
declaration of the locking requirements of a function to ensure that
365
a lock is taken out for casual scripts. (Robert Collins, #54107)
367
* All WorkingTree methods which write to the tree, but not to the branch
368
have been converted to use ``needs_tree_write_lock`` rather than
369
``needs_write_lock``. Also converted is the revert, conflicts and tree
370
transform modules. This provides a modest performance improvement on
371
metadir style trees, due to the reduce lock-acquisition, and a more
372
significant performance improvement on lightweight checkouts from
373
remote branches, where trivial operations used to pay a significant
374
penalty. It also provides the basis for allowing readonly checkouts.
377
* Special case importing the standard library 'copy' module. This shaves
378
off 40ms of startup time, while retaining compatibility. See:
379
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
381
* WorkingTree has a new parent class MutableTree which represents the
382
specialisations of Tree which are able to be altered. (Robert Collins)
384
* New methods mkdir and put_file_bytes_non_atomic on MutableTree that
385
mutate the tree and its contents. (Robert Collins)
387
* Transport behaviour at the root of the URL is now defined and tested.
388
(Andrew Bennetts, Robert Collins)
392
* New test helper classs MemoryTree. This is typically accessed via
393
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
395
* Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to
396
continue running concurrently with a subprocess of bzr. (Andrew Bennetts,
399
* Add a new method ``Transport.get_smart_client()``. This is provided to
400
allow upgrades to a richer interface than the VFS one provided by
401
Transport. (Andrew Bennetts, Martin Pool)
406
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
407
tree. (Aaron Bentley)
409
* 'bzr add --file-ids-from' can be used to specify another path to use
410
for creating file ids, rather than generating all new ones. Internally,
411
the 'action' passed to smart_add_tree() can return file_ids that
412
will be used, rather than having bzrlib generate new ones.
413
(John Arbash Meinel, #55781)
415
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
416
This will cache some of the intermediate trees, and decrease the
417
setup time for benchmark tests. (John Arbash Meinel)
419
* Inverse forms are provided for all boolean options. For example,
420
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
422
* Serialize out Inventories directly, rather than using ElementTree.
423
Writing out a kernel sized inventory drops from 2s down to ~350ms.
424
(Robert Collins, John Arbash Meinel)
428
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
430
* Change LockDir so that if the lock directory doesn't exist when
431
lock_write() is called, an attempt will be made to create it.
432
(John Arbash Meinel, #56974)
434
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
436
* Active FTP transport now works as intended. (ghozzy, #56472)
438
* Really fix mutter() so that it won't ever raise a UnicodeError.
439
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
440
But it is a debugging log, not a real user file.
441
(John Arbash Meinel, #56947, #53880)
443
* Change Command handle to allow Unicode command and options.
444
At present we cannot register Unicode command names, so we will get
445
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
446
But that is better than a UnicodeError + a traceback.
447
(John Arbash Meinel, #57123)
449
* Handle TZ=UTC properly when reading/writing revisions.
450
(John Arbash Meinel, #55783, #56290)
452
* Use GPG_TTY to allow gpg --cl to work with gpg-agent in a pipeline,
453
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
455
* External diff does the right thing for binaries even in foreign
456
languages. (John Arbash Meinel, #56307)
458
* Testament handles more cases when content is unicode. Specific bug was
459
in handling of revision properties. (John Arbash Meinel, Holger Krekel,
462
* The bzr selftest was failing on installed versions due to a bug in a new
463
test helper. (John Arbash Meinel, Robert Collins, #58057)
467
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
468
which can be used to cache the conversion between utf8 and Unicode.
469
Especially helpful for some of the knit annotation code, which has to
470
convert revision ids to utf8 to annotate lines in storage.
473
* ``setup.py`` now searches the filesystem to find all packages which
474
need to be installed. This should help make the life of packagers
475
easier. (John Arbash Meinel)
481
* The hard-coded built-in ignore rules have been removed. There are
482
now two rulesets which are enforced. A user global one in
483
~/.bazaar/ignore which will apply to every tree, and the tree
484
specific one '.bzrignore'.
485
~/.bazaar/ignore will be created if it does not exist, but with
486
a more conservative list than the old default.
487
This fixes bugs with default rules being enforced no matter what.
488
The old list of ignore rules from bzr is available by
489
running 'bzr ignore --old-default-rules'.
490
(Robert Collins, Martin Pool, John Arbash Meinel)
492
* 'branches.conf' has been changed to 'locations.conf', since it can apply
493
to more locations than just branch locations.
498
* The revision specifier "revno:" is extended to accept the syntax
499
revno:N:branch. For example,
500
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
501
bzr.dev. (Matthieu Moy)
503
* Tests updates to ensure proper URL handling, UNICODE support, and
504
proper printing when the user's terminal encoding cannot display
505
the path of a file that has been versioned.
506
``bzr branch`` can take a target URL rather than only a local directory.
507
Branch.get_parent()/set_parent() now save a relative path if possible,
508
and normalize the parent based on root, allowing access across
509
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
510
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
513
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
514
Use terminal width for single-line logs from ``bzr log --line`` and
515
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
518
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
519
(Alexander Belchenko)
521
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
523
* Show the correct number of revisions pushed when pushing a new branch.
526
* 'bzr selftest' now shows a progress bar with the number of tests, and
527
progress made. 'make check' shows tests in -v mode, to be more useful
528
for the PQM status window. (Robert Collins).
529
When using a progress bar, failed tests are printed out, rather than
530
being overwritten by the progress bar until the suite finishes.
533
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
534
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
535
profile data for the individual profiled calls, allowing for fine
536
grained analysis of performance.
537
(Robert Collins, Martin Pool).
539
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
540
where commit can take an appreciable time. (Robert Collins)
542
* 'bzr add' is now less verbose in telling you what ignore globs were
543
matched by files being ignored. Instead it just tells you how many
544
were ignored (because you might reasonably be expecting none to be
545
ignored). 'bzr add -v' is unchanged and will report every ignored
546
file. (Robert Collins).
548
* ftp now has a test server if medusa is installed. As part of testing,
549
ftp support has been improved, including support for supplying a
550
non-standard port. (John Arbash Meinel).
552
* 'bzr log --line' shows the revision number, and uses only the
553
first line of the log message (#5162, Alexander Belchenko;
556
* 'bzr status' has had the --all option removed. The 'bzr ls' command
557
should be used to retrieve all versioned files. (Robert Collins)
559
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
560
over email, and applied on the other end, while maintaining ancestry.
561
This bundle can be applied with either 'bzr merge' or 'bzr pull',
562
the same way you would apply another branch.
563
(John Arbash Meinel, Aaron Bentley)
565
* 'bzr whoami' can now be used to set your identity from the command line,
566
for a branch or globally. (Robey Pointer)
568
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
571
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
574
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
575
Also updates things like 'http+pycurl://' if pycurl is not present.
576
(John Arbash Meinel) (Malone #47821, #52204)
578
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
579
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
580
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
582
* Improve the help text for 'bzr diff' to explain what various options do.
583
(John Arbash Meinel, #6391)
585
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
586
revision 10. This makes -r10 more in line with what other commands do.
587
'bzr uncommit' also now saves the pending merges of the revisions that
588
were removed. So it is safe to uncommit after a merge, fix something,
589
and commit again. (John Arbash Meinel, #32526, #31426)
591
* 'bzr init' now also works on remote locations.
592
(Wouter van Heyst, #48904)
594
* HTTP support has been updated. When using pycurl we now support
595
connection keep-alive, which reduces dns requests and round trips.
596
And for both urllib and pycurl we support multi-range requests,
597
which decreases the number of round-trips. Performance results for
598
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
599
http branching is now 2-3x faster, and ``bzr pull`` in an existing
600
branch is as much as 4x faster.
601
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
603
* Performance improvements for sftp. Branching and pulling are now up to
604
2x faster. Utilize paramiko.readv() support for async requests if it
605
is available (paramiko > 1.6) (John Arbash Meinel)
609
* Fix shadowed definition of TestLocationConfig that caused some
610
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
613
* Fix unnecessary requirement of sign-my-commits that it be run from
614
a working directory. (Martin Pool, Robert Collins)
616
* 'bzr push location' will only remember the push location if it succeeds
617
in connecting to the remote location. (#49742, John Arbash Meinel)
619
* 'bzr revert' no longer toggles the executable bit on win32
620
(#45010, John Arbash Meinel)
622
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
624
* sftp tests now work correctly on win32 if you have a newer paramiko
627
* Cleanup win32 test suite, and general cleanup of places where
628
file handles were being held open. (John Arbash Meinel)
630
* When specifying filenames for 'diff -r x..y', the name of the file in the
631
working directory can be used, even if its name is different in both x
634
* File-ids containing single- or double-quotes are handled correctly by
635
push. (#52227, Aaron Bentley)
637
* Normalize unicode filenames to ensure cross-platform consistency.
638
(John Arbash Meinel, #43689)
640
* The argument parser can now handle '-' as an argument. Currently
641
no code interprets it specially (it is mostly handled as a file named
642
'-'). But plugins, and future operations can use it.
643
(John Arbash meinel, #50984)
645
* Bundles can properly read binary files with a plain '\r' in them.
646
(John Arbash Meinel, #51927)
648
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
650
* Lots of win32 fixes (the test suite passes again).
651
(John Arbash Meinel, #50155)
653
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
655
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
657
* Removals are only committed if they match the filespec (or if there is
658
no filespec). (#46635, Aaron Bentley)
660
* smart-add recurses through all supplied directories
661
(John Arbash Meinel, #52578)
663
* Make the bundle reader extra lines before and after the bundle text.
664
This allows you to parse an email with the bundle inline.
665
(John Arbash Meinel, #49182)
667
* Change the file id generator to squash a little bit more. Helps when
668
working with long filenames on windows. (Also helps for unicode filenames
669
not generating hidden files). (John Arbash Meinel, #43801)
671
* Restore terminal mode on C-c while reading sftp password. (#48923,
672
Nicholas Allen, Martin Pool)
674
* Timestamps are rounded to 1ms, and revision entries can be recreated
675
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
677
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
678
use local paths, since it is user visible (John Arbash Meinel, #53653)
680
* ``bzr status foo`` when foo was unversioned used to cause a full delta
681
to be generated (John Arbash Meinel, #53638)
683
* When reading revision properties, an empty value should be considered
684
the empty string, not None (John Arbash Meinel, #47782)
686
* ``bzr diff --diff-options`` can now handle binary files being changed.
687
Also, the output is consistent when --diff-options is not supplied.
688
(John Arbash Meinel, #54651, #52930)
690
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
692
* Fix Branch.get_parent() to handle the case when the parent is not
693
accessible (John Arbash Meinel, #52976)
697
* Combine the ignore rules into a single regex rather than looping over
698
them to reduce the threshold where N^2 behaviour occurs in operations
699
like status. (Jan Hudec, Robert Collins).
701
* Appending to bzrlib.DEFAULT_IGNORE is now deprecated. Instead, use
702
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
704
* 'bzr push' should only push the ancestry of the current revision, not
705
all of the history in the repository. This is especially important for
706
shared repositories. (John Arbash Meinel)
708
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
709
rather than randomly walking the inventories. (John Arbash Meinel)
711
* Doctests are now run in temporary directories which are cleaned up when
712
they finish, rather than using special ScratchDir/ScratchBranch objects.
715
* Split ``check`` into separate methods on the branch and on the repository,
716
so that it can be specialized in ways that are useful or efficient for
717
different formats. (Martin Pool, Robert Collins)
719
* Deprecate Repository.all_revision_ids; most methods don't really need
720
the global revision graph but only that part leading up to a particular
721
revision. (Martin Pool, Robert Collins)
723
* Add a BzrDirFormat control_formats list which allows for control formats
724
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
725
(Robert Collins, Jelmer Vernooij).
727
* bzrlib.diff.external_diff can be redirected to any file-like object.
728
Uses subprocess instead of spawnvp.
729
(#4047, #48914, James Henstridge, John Arbash Meinel)
731
* New command line option '--profile-imports', which will install a custom
732
importer to log time to import modules and regex compilation time to
733
sys.stderr (John Arbash Meinel)
735
* 'EmptyTree' is now deprecated, please use repository.revision_tree(None)
736
instead. (Robert Collins)
738
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
744
* setup.py failed to install launchpad plugin. (Martin Pool)
750
* Fix failure to commit a merge in a checkout. (Martin Pool,
751
Robert Collins, Erik Bågfors, #43959)
753
* Nicer messages from 'commit' in the case of renames, and correct
754
messages when a merge has occured. (Robert Collins, Martin Pool)
756
* Separate functionality from assert statements as they are skipped in
757
optimized mode of python. Add the same check to pending merges.
758
(#44443, Olaf Conradi)
762
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
764
* Add info on standalone branches without a working tree.
765
(#44155, Olaf Conradi)
767
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
771
* Make editor invocation comply with Debian Policy. First check
772
environment variables VISUAL and EDITOR, then try editor from
773
alternatives system. If that all fails, fall back to the pre-defined
774
list of editors. (#42904, Olaf Conradi)
778
* New 'register-branch' command registers a public branch into
779
Launchpad.net, where it can be associated with bugs, etc.
780
(Martin Pool, Bjorn Tillenius, Robert Collins)
784
* New public api in InventoryEntry - 'describe_change(old, new)' which
785
provides a human description of the changes between two old and
786
new. (Robert Collins, Martin Pool)
790
* Fix test case for bzr info in upgrading a standalone branch to metadir,
791
uses bzrlib api now. (Olaf Conradi)
795
NOTES WHEN UPGRADING:
797
Release 0.8 of bzr introduces a new format for history storage, called
798
'knit', as an evolution of to the 'weave' format used in 0.7. Local
799
and remote operations are faster using knits than weaves. Several
800
operations including 'init', 'init-repo', and 'upgrade' take a
801
--format option that controls this. Branching from an existing branch
802
will keep the same format.
804
It is possible to merge, pull and push between branches of different
805
formats but this is slower than moving data between homogenous
806
branches. It is therefore recommended (but not required) that you
807
upgrade all branches for a project at the same time. Information on
808
formats is shown by 'bzr info'.
810
bzr 0.8 now allows creation of 'repositories', which hold the history
811
of files and revisions for several branches. Previously bzr kept all
812
the history for a branch within the .bzr directory at the root of the
813
branch, and this is still the default. To create a repository, use
814
the new 'bzr init-repo' command. Branches exist as directories under
815
the repository and contain just a small amount of information
816
indicating the current revision of the branch.
818
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
819
subversion. Checkouts are associated with a branch (optionally in a
820
repository), which contains all the historical information. The
821
result is that a checkout can be deleted without losing any
822
already-committed revisions. A new 'update' command is also available.
824
Repositories and checkouts are not supported with the 0.7 storage
825
format. To use them you must upgrad to either knits, or to the
826
'metaweave' format, which uses weaves but changes the .bzr directory
832
* Sftp paths can now be relative, or local, according to the lftp
833
convention. Paths now take the form:
834
sftp://user:pass@host:port/~/relative/path
836
sftp://user:pass@host:port/absolute/path
838
* The FTP transport now tries to reconnect after a temporary
839
failure. ftp put is made atomic. (Matthieu Moy)
841
* The FTP transport now maintains a pool of connections, and
842
reuses them to avoid multiple connections to the same host (like
843
sftp did). (Daniel Silverstone)
845
* The bzr_man.py file has been removed. To create the man page now,
846
use ./generate_docs.py man. The new program can also create other files.
847
Run "python generate_docs.py --help" for usage information. (Hans
848
Ulrich Niedermann & James Blackwell).
850
* Man Page now gives full help (James Blackwell). Help also updated to
851
reflect user config now being stored in .bazaar (Hans Ulrich
854
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
856
* Pull now accepts a --revision argument (Erik Bågfors)
858
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
859
line. You can now use the following command to sign all of your old commits.
860
find .bzr/revision-store// -name my@email-* \
861
| sed 's/.*\/\/..\///' \
864
* Upgrade can now upgrade over the network. (Robert Collins)
866
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
867
behaviour. By default they will cache history in the checkout, but
868
with --lightweight almost all data is kept in the master branch.
871
* 'revert' unversions newly-versioned files, instead of deleting them.
873
* 'merge' is more robust. Conflict messages have changed.
875
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
878
* Default log format can be set in configuration and plugins can register
879
their own formatters. (Erik Bågfors)
881
* New 'reconcile' command will check branch consistency and repair indexes
882
that can become out of sync in pre 0.8 formats. (Robert Collins,
885
* New 'bzr init --format' and 'bzr upgrade --format' option to control
886
what storage format is created or produced. (Robert Collins,
889
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
891
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
893
* New 'init-repository' command, plus support for repositories in 'init'
894
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
896
* Improve output of 'info' command. Show all relevant locations related to
897
working tree, branch and repository. Use kibibytes for binary quantities.
898
Fix off-by-one error in missing revisions of working tree. Make 'info'
899
work on branches, repositories and remote locations. Show locations
900
relative to the shared repository, if applicable. Show locking status
901
of locations. (Olaf Conradi)
903
* Diff and merge now safely handle binary files. (Aaron Bentley)
905
* 'pull' and 'push' now normalise the revision history, so that any two
906
branches with the same tip revision will have the same output from 'log'.
909
* 'merge' accepts --remember option to store parent location, like 'push'
910
and 'pull'. (Olaf Conradi)
912
* bzr status and diff when files given as arguments do not exist
913
in the relevant trees. (Martin Pool, #3619)
915
* Add '.hg' to the default ignore list. (Martin Pool)
917
* 'knit' is now the default disk format. This improves disk performance and
918
utilization, increases incremental pull performance, robustness with SFTP
919
and allows checkouts over SFTP to perform acceptably.
920
The initial Knit code was contributed by Johan Rydberg based on a
921
specification by Martin Pool.
922
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
924
* New tool to generate all-in-one html version of the manual. (Alexander
927
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
928
to be left in the SFTP repository. (Robert Collins, Martin Pool).
930
* New option 'diff --prefix' to control how files are named in diff
931
output, with shortcuts '-p0' and '-p1' corresponding to the options for
932
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
934
* Add --revision option to 'annotate' command. (Olaf Conradi)
936
* If bzr shows an unexpected revision-history after pulling (perhaps due
937
to a reweave) it can now be corrected by 'bzr reconcile'.
942
* Commit is now verbose by default, and shows changed filenames and the
943
new revision number. (Robert Collins, Martin Pool)
945
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
947
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
949
* Make 'pull' and 'push' remember location on failure using --remember.
952
* For compatibility, make old format for using weaves inside metadir
953
available as 'metaweave' format. Rename format 'metadir' to 'default'.
954
Clean up help for option --format in commands 'init', 'init-repo' and
955
'upgrade'. (Olaf Conradi)
959
* The internal storage of history, and logical branch identity have now
960
been split into Branch, and Repository. The common locking and file
961
management routines are now in bzrlib.lockablefiles.
962
(Aaron Bentley, Robert Collins, Martin Pool)
964
* Transports can now raise DependencyNotPresent if they need a library
965
which is not installed, and then another implementation will be
968
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
971
* Using Tree Transform for merge, revert, tree-building
973
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
974
Branch.initialize are now deprecated. Please see BzrDir.create_* for
975
replacement API's. (Robert Collins)
977
* New BzrDir class represents the .bzr control directory and manages
978
formatting issues. (Robert Collins)
980
* New repository.InterRepository class encapsulates Repository to
981
Repository actions and allows for clean selection of optimised code
982
paths. (Robert Collins)
984
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
985
please use 'branch.fetch' or 'repository.fetch' depending on your
986
needs. (Robert Collins)
988
* deprecated methods now have a 'is_deprecated' flag on them that can
989
be checked, if you need to determine whether a given callable is
990
deprecated at runtime. (Robert Collins)
992
* Progress bars are now nested - see
993
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
995
* New API call get_format_description() for each type of format.
998
* Changed branch.set_parent() to accept None to remove parent.
1001
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
1003
* WorkingTree.branch is now a read only property. (Robert Collins)
1005
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
1006
can be None or a factory that will create a progress bar. This is
1007
useful for testing or for overriding the bzrlib.progress heuristic.
1010
* New API method get_physical_lock_status() to query locks present on a
1011
transport. (Olaf Conradi)
1013
* Repository.reconcile now takes a thorough keyword parameter to allow
1014
requesting an indepth reconciliation, rather than just a data-loss
1015
check. (Robert Collins)
1017
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
1018
the user for yes/no style input. (Robert Collins)
1022
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
1023
for testing SFTP protocol support. (Robey Pointer)
1025
* Branch formats are now tested once per implementation (see bzrlib.
1026
tests.branch_implementations. This is analagous to the transport
1027
interface tests, and has been followed up with working tree,
1028
repository and BzrDir tests. (Robert Collins)
1030
* New test base class TestCaseWithTransport provides a transport aware
1031
test environment, useful for testing any transport-interface using
1032
code. The test suite option --transport controls the transport used
1033
by this class (when its not being used as part of implementation
1034
contract testing). (Robert Collins)
1036
* Close logging handler on disabling the test log. This will remove the
1037
handler from the internal list inside python's logging module,
1038
preventing shutdown from closing it twice. (Olaf Conradi)
1040
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
1042
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
1043
will provide String("foo") to the command as its stdin.
1049
* .bzrignore is excluded from exports, on the grounds that it's a bzr
1050
internal-use file and may not be wanted. (Jamie Wilkinson)
1052
* The "bzr directories" command were removed in favor of the new
1053
--kind option to the "bzr inventory" command. To list all
1054
versioned directories, now use "bzr inventory --kind directory".
1057
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
1058
by default. (John Arbash Meinel)
1060
* The parent of Bzr configuration directory can be set by BZR_HOME
1061
environment variable. Now the path for it is searched in BZR_HOME, then
1062
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
1063
points to C:\Documents and Settings\User Name\Application Data), HOME.
1064
(John Arbash Meinel)
1066
* Plugins with the same name in different directories in the bzr plugin
1067
path are no longer loaded: only the first successfully loaded one is
1068
used. (Robert Collins)
1070
* Use systems' external ssh command to open connections if possible.
1071
This gives better integration with user settings such as ProxyCommand.
1074
* Permissions on files underneath .bzr/ are inherited from the .bzr
1075
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
1076
will mean that future file will be created with group write permissions.
1078
* configure.in and config.guess are no longer in the builtin default
1081
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
1082
files. (John Arbash Meinel, Martin Pool)
1086
* "bzr INIT dir" now initializes the specified directory, and creates
1087
it if it does not exist. (John Arbash Meinel)
1089
* New remerge command (Aaron Bentley)
1091
* Better zsh completion script. (Steve Borho)
1093
* 'bzr diff' now returns 1 when there are changes in the working
1094
tree. (Robert Collins)
1096
* 'bzr push' now exists and can push changes to a remote location.
1097
This uses the transport infrastructure, and can store the remote
1098
location in the ~/.bazaar/branches.conf configuration file.
1101
* Test directories are only kept if the test fails and the user requests
1104
* Tweaks to short log printing
1106
* Added branch nicks, new nick command, printing them in log output.
1109
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
1110
occurs. (Martin Pool)
1112
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
1113
the same as Subversion. (Martin Pool)
1115
* New ftp transport support (on ftplib), for ftp:// and aftp://
1116
URLs. (Daniel Silverstone)
1118
* Commit editor temporary files now start with 'bzr_log.', to allow
1119
text editors to match the file name and set up appropriate modes or
1120
settings. (Magnus Therning)
1122
* Improved performance when integrating changes from a remote weave.
1123
(Goffredo Baroncelli)
1125
* Sftp will attempt to cache the connection, so it is more likely that
1126
a connection will be reused, rather than requiring multiple password
1129
* bzr revno now takes an optional argument indicating the branch whose
1130
revno should be printed. (Michael Ellerman)
1132
* bzr cat defaults to printing the last version of the file.
1133
(#3632, Matthieu Moy)
1135
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
1136
profiler. (Denys Duchier)
1138
* Faster commits by reading only the headers of affected weave files.
1141
* 'bzr add' now takes a --dry-run parameter which shows you what would be
1142
added, but doesn't actually add anything. (Michael Ellerman)
1144
* 'bzr add' now lists how many files were ignored per glob. add --verbose
1145
lists the specific files. (Aaron Bentley)
1147
* 'bzr missing' now supports displaying changes in diverged trees and can
1148
be limited to show what either end of the comparison is missing.
1149
(Aaron Bently, with a little prompting from Daniel Silverstone)
1153
* SFTP can walk up to the root path without index errors. (Robert Collins)
1155
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
1157
* Error when run with -OO
1159
* Fix bug in reporting http errors that don't have an http error code.
1162
* Handle more cases of pipe errors in display commands
1164
* Change status to 3 for all errors
1166
* Files that are added and unlinked before committing are completely
1167
ignored by diff and status
1169
* Stores with some compressed texts and some uncompressed texts are now
1170
able to be used. (John A Meinel)
1172
* Fix for bzr pull failing sometimes under windows
1174
* Fix for sftp transport under windows when using interactive auth
1176
* Show files which are both renamed and modified as such in 'bzr
1177
status' output. (#4503, Daniel Silverstone)
1179
* Make annotate cope better with revisions committed without a valid
1180
email address. (Marien Zwart)
1182
* Fix representation of tab characters in commit messages. (Harald
1185
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
1186
now parsed properly under Windows. (Alexander Belchenko)
1188
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
1190
* Keep a cached copy of the basis inventory to speed up operations
1191
that need to refer to it. (Johan Rydberg, Martin Pool)
1193
* Fix bugs in bzr status display of non-ascii characters. (Martin
1196
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
1199
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
1203
* Fix selftest asking for passwords when there are no SFTP keys.
1204
(Robey Pointer, Jelmer Vernooij)
1206
* Fix selftest run with 'python -O'. (Martin Pool)
1208
* Fix HTTP tests under Windows. (John Arbash Meinel)
1210
* Make tests work even if HOME is not set (Aaron Bentley)
1212
* Updated build_tree to use fixed line-endings for tests which read
1213
the file cotents and compare. Make some tests use this to pass under
1214
Windows. (John Arbash Meinel)
1216
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
1218
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
1219
(John Arbash Meinel)
1221
* Use terminal width to align verbose test output. (Martin Pool)
1223
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
1224
If adding a new test script please add that to
1225
bzrlib.tests.blackbox.__init__. (Robert Collins)
1227
* Much better error message if one of the test suites can't be
1228
imported. (Martin Pool)
1230
* Make check now runs the test suite twice - once with the default locale,
1231
and once with all locales forced to C, to expose bugs. This is not
1232
trivially done within python, so for now its only triggered by running
1233
Make check. Integrators and packagers who wish to check for full
1234
platform support should run 'make check' to test the source.
1237
* Tests can now run TestSkipped if they can't execute for any reason.
1238
(Martin Pool) (NB: TestSkipped should only be raised for correctable
1239
reasons - see the wiki spec ImprovingBzrTestSuite).
1241
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
1242
paths for the transport tests. Introduce blackbox remote sftp tests that
1243
test the same permutations. (Robert Collins, Robey Pointer)
1245
* Transport implementation tests are now independent of the local file
1246
system, which allows tests for esoteric transports, and for features
1247
not available in the local file system. They also repeat for variations
1248
on the URL scheme that can introduce issues in the transport code,
1249
see bzrlib.transport.TransportTestProviderAdapter() for this.
1252
* TestCase.build_tree uses the transport interface to build trees, pass
1253
in a transport parameter to give it an existing connection.
1258
* WorkingTree.pull has been split across Branch and WorkingTree,
1259
to allow Branch only pulls. (Robert Collins)
1261
* commands.display_command now returns the result of the decorated
1262
function. (Robert Collins)
1264
* LocationConfig now has a set_user_option(key, value) call to save
1265
a setting in its matching location section (a new one is created
1266
if needed). (Robert Collins)
1268
* Branch has two new methods, get_push_location and set_push_location
1269
to respectively, get and set the push location. (Robert Collins)
1271
* commands.register_command now takes an optional flag to signal that
1272
the registrant is planning to decorate an existing command. When
1273
given multiple plugins registering a command is not an error, and
1274
the original command class (whether built in or a plugin based one) is
1275
returned to the caller. There is a new error 'MustUseDecorated' for
1276
signalling when a wrapping command should switch to the original
1277
version. (Robert Collins)
1279
* Some option parsing errors will raise 'BzrOptionError', allowing
1280
granular detection for decorating commands. (Robert Collins).
1282
* Branch.read_working_inventory has moved to
1283
WorkingTree.read_working_inventory. This necessitated changes to
1284
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
1285
as well. To make it clear that a WorkingTree cannot always be obtained
1286
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
1287
be obtained. (Robert Collins)
1289
* All pending merges operations from Branch are now on WorkingTree.
1292
* The follow operations from Branch have moved to WorkingTree:
1300
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1302
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
1304
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
1307
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1308
query method. (Robert Collins)
1310
* New options to read only the table-of-contents of a weave.
1313
* Raise NoSuchFile when someone tries to add a non-existant file.
1316
* Simplify handling of DivergedBranches in cmd_pull().
1320
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
1321
is exposed as Branch().control_files. Also this has been altered with the
1322
controlfile pre/suffix replaced by simple method names like 'get' and
1323
'put'. (Aaron Bentley, Robert Collins).
1325
* Deprecated functions and methods can now be marked as such using the
1326
bzrlib.symbol_versioning module. Marked method have their docstring
1327
updated and will issue a DeprecationWarning using the warnings module
1328
when they are used. (Robert Collins)
1330
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1331
for functions that need unicode strings. (Robert Collins)
1337
* pull now takes --verbose to show you what revisions are added or removed
1340
* merge now takes a --show-base option to include the base text in
1344
* The config files are now read using ConfigObj, so '=' should be used as
1345
a separator, not ':'.
1348
* New 'bzr commit --strict' option refuses to commit if there are
1349
any unknown files in the tree. To commit, make sure all files are
1350
either ignored, added, or deleted. (Michael Ellerman)
1352
* The config directory is now ~/.bazaar, and there is a single file
1353
~/.bazaar/bazaar.conf storing email, editor and other preferences.
1356
* 'bzr add' no longer takes a --verbose option, and a --quiet option
1357
has been added that suppresses all output.
1359
* Improved zsh completion support in contrib/zsh, from Clint
1362
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
1363
Goffredo Baroncelli.
1365
* 'bzr check' now accepts -v for verbose reporting, and checks for
1366
ghosts in the branch. (Robert Collins)
1368
* New command 're-sign' which will regenerate the gpg signature for
1369
a revision. (Robert Collins)
1371
* If you set check_signatures=require for a path in
1372
~/.bazaar/branches.conf then bzr will invoke your
1373
gpg_signing_command (defaults to gpg) and record a digital signature
1374
of your commit. (Robert Collins)
1376
* New sftp transport, based on Paramiko. (Robey Pointer)
1378
* 'bzr pull' now accepts '--clobber' which will discard local changes
1379
and make this branch identical to the source branch. (Robert Collins)
1381
* Just give a quieter warning if a plugin can't be loaded, and
1382
put the details in .bzr.log. (Martin Pool)
1384
* 'bzr branch' will now set the branch-name to the last component of the
1385
output directory, if one was supplied.
1387
* If the option 'post_commit' is set to one (or more) python function
1388
names (must be in the bzrlib namespace), then they will be invoked
1389
after the commit has completed, with the branch and revision_id as
1390
parameters. (Robert Collins)
1392
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1394
* --merge-type weave is now supported for file contents. Tree-shape
1395
changes are still three-way based. (Martin Pool, Aaron Bentley)
1397
* 'bzr check' allows the first revision on revision-history to have
1398
parents - something that is expected for cheap checkouts, and occurs
1399
when conversions from baz do not have all history. (Robert Collins).
1401
* 'bzr merge' can now graft unrelated trees together, if your specify
1402
0 as a base. (Aaron Bentley)
1404
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
1407
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
1409
* 'bzr merge --reprocess' minimizes conflicts
1413
* The 'bzr selftest --pattern' option for has been removed, now
1414
test specifiers on the command line can be simple strings, or
1415
regexps, or both. (Robert Collins)
1417
* Passing -v to selftest will now show the time each test took to
1418
complete, which will aid in analysing performance regressions and
1419
related questions. (Robert Collins)
1421
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
1422
is given. (Martin Pool)
1424
* There is a new method for TestCaseInTempDir, assertFileEqual, which
1425
will check that a given content is equal to the content of the named
1426
file. (Robert Collins)
1428
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
1433
* New 'testament' command and concept for making gpg-signatures
1434
of revisions that are not tied to a particular internal
1435
representation. (Martin Pool).
1437
* Per-revision properties ('revprops') as key-value associated
1438
strings on each revision created when the revision is committed.
1439
Intended mainly for the use of external tools. (Martin Pool).
1441
* Config options have moved from bzrlib.osutils to bzrlib.config.
1444
* Improved command line option definitions allowing explanations
1445
for individual options, among other things. Contributed by
1448
* Config options have moved from bzrlib.osutils to bzrlib.config.
1449
Configuration is now done via the config.Config interface:
1450
Depending on whether you have a Branch, a Location or no information
1451
available, construct a ``*Config``, and use its ``signature_checking``,
1452
``username`` and ``user_email`` methods. (Robert Collins)
1454
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
1455
they are made available for other plugins to use. You should not
1456
import other plugins during the __init__ of your plugin though, as
1457
no ordering is guaranteed, and the plugins directory is not on the
1458
python path. (Robert Collins)
1460
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
1461
no longer takes an inventory, rather it takes an option branch
1462
parameter, and if None is given will open the branch at basedir
1463
implicitly. (Robert Collins)
1465
* Cleaner exception structure and error reporting. Suggested by
1466
Scott James Remnant. (Martin Pool)
1468
* Branch.remove has been moved to WorkingTree, which has also gained
1469
lock_read, lock_write and unlock methods for convenience. (Robert
1472
* Two decorators, needs_read_lock and needs_write_lock have been added
1473
to the branch module. Use these to cause a function to run in a
1474
read or write lock respectively. (Robert Collins)
1476
* Branch.open_containing now returns a tuple (Branch, relative-path),
1477
which allows direct access to the common case of 'get me this file
1478
from its branch'. (Robert Collins)
1480
* Transports can register using register_lazy_transport, and they
1481
will be loaded when first used. (Martin Pool)
1483
* 'pull' has been factored out of the command as WorkingTree.pull().
1484
A new option to WorkingTree.pull has been added, clobber, which will
1485
ignore diverged history and pull anyway.
1488
* config.Config has a 'get_user_option' call that accepts an option name.
1489
This will be looked up in branches.conf and bazaar.conf as normal.
1490
It is intended that this be used by plugins to support options -
1491
options of built in programs should have specific methods on the config.
1494
* merge.merge_inner now has tempdir as an optional parameter. (Robert
1497
* Tree.kind is not recorded at the top level of the hierarchy, as it was
1498
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
1501
* WorkingTree.__del__ has been removed, it was non deterministic and not
1502
doing what it was intended to. See WorkingTree.__init__ for a comment
1503
about future directions. (Robert Collins/Martin Pool)
1505
* bzrlib.transport.http has been modified so that only 404 urllib errors
1506
are returned as NoSuchFile. Other exceptions will propogate as normal.
1507
This allows debuging of actual errors. (Robert Collins)
1509
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
1510
to apis like 'put', 'get' and 'has'. This is to provide consistent
1511
behaviour - it operates on url's only. (Robert Collins)
1513
* Transports can register using register_lazy_transport, and they
1514
will be loaded when first used. (Martin Pool)
1516
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
1517
is called by merge_inner. This is so that the conflict count can be
1518
retrieved (and potentially manipulated) before returning to the caller
1519
of merge_inner. Likewise 'merge' now returns the conflict count to the
1520
caller. (Robert Collins)
1522
* 'revision.revision_graph can handle having only partial history for
1523
a revision - that is no revisions in the graph with no parents.
1526
* New builtins.branch_files uses the standard file_list rules to produce
1527
a branch and a list of paths, relative to that branch (Aaron Bentley)
1529
* New TestCase.addCleanup facility.
1531
* New bzrlib.version_info tuple (similar to sys.version_info), which can
1532
be used by programs importing bzrlib.
1536
* Better handling of branches in directories with non-ascii names.
1537
(Joel Rosdahl, Panagiotis Papadakos)
1539
* Upgrades of trees with no commits will not fail due to accessing
1540
[-1] in the revision-history. (Andres Salomon)
1543
bzr 0.1.1 2005-10-12
1547
* Fix problem in pulling over http from machines that do not
1548
allow directories to be listed.
1550
* Avoid harmless warning about invalid hash cache after
1551
upgrading branch format.
1555
* Avoid some unnecessary http operations in branch and pull.
1562
* 'bzr branch' over http initially gives a very high estimate
1563
of completion time but it should fall as the first few
1564
revisions are pulled in. branch is still slow on
1565
high-latency connections.
1569
* bzr-man.py has been updated to work again. Contributed by
1572
* Locking is now done with fcntl.lockf which works with NFS
1573
file systems. Contributed by Harald Meland.
1575
* When a merge encounters a file that has been deleted on
1576
one side and modified on the other, the old contents are
1577
written out to foo.BASE and foo.SIDE, where SIDE is this
1578
or OTHER. Contributed by Aaron Bentley.
1580
* Export was choosing incorrect file paths for the content of
1581
the tarball, this has been fixed by Aaron Bentley.
1583
* Commit will no longer commit without a log message, an
1584
error is returned instead. Contributed by Jelmer Vernooij.
1586
* If you commit a specific file in a sub directory, any of its
1587
parent directories that are added but not listed will be
1588
automatically included. Suggested by Michael Ellerman.
1590
* bzr commit and upgrade did not correctly record new revisions
1591
for files with only a change to their executable status.
1592
bzr will correct this when it encounters it. Fixed by
1595
* HTTP tests now force off the use of http_proxy for the duration.
1596
Contributed by Gustavo Niemeyer.
1598
* Fix problems in merging weave-based branches that have
1599
different partial views of history.
1601
* Symlink support: working with symlinks when not in the root of a
1602
bzr tree was broken, patch from Scott James Remnant.
1606
* 'branch' now accepts a --basis parameter which will take advantage
1607
of local history when making a new branch. This allows faster
1608
branching of remote branches. Contributed by Aaron Bentley.
1610
* New tree format based on weave files, called version 5.
1611
Existing branches can be upgraded to this format using
1614
* Symlinks are now versionable. Initial patch by
1615
Erik Toubro Nielsen, updated to head by Robert Collins.
1617
* Executable bits are tracked on files. Patch from Gustavo
1620
* 'bzr status' now shows unknown files inside a selected directory.
1621
Patch from Heikki Paajanen.
1623
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1624
and 'resolve' have needed added, which list and remove those
1625
merge conflicts respectively. A conflicted tree cannot be committed
1626
in. Contributed by Aaron Bentley.
1628
* 'rm' is now an alias for 'remove'.
1630
* Stores now split out their content in a single byte prefixed hash,
1631
dropping the density of files per directory by 256. Contributed by
1634
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1635
Contributed by Robert Collins.
1637
* 'bzr log' with the default formatter will show merged revisions,
1638
indented to the right. Initial implementation contributed by Gustavo
1639
Niemeyer, made incremental by Robert Collins.
1644
* Test case failures have the exception printed after the log
1645
for your viewing pleasure.
1647
* InventoryEntry is now an abstract base class, use one of the
1648
concrete InventoryDirectory etc classes instead.
1650
* Branch raises an UnsupportedFormatError when it detects a
1651
bzr branch it cannot understand. This allows for precise
1652
handling of such circumstances.
1657
* Removed testsweet module so that tests can be run after
1658
bzr installed by 'bzr selftest'.
1660
* 'bzr selftest' command-line arguments can now be partial ids
1661
of tests to run, e.g. 'bzr selftest test_weave'
1664
bzr 0.0.9 2005-09-23
1668
* Fixed "branch -r" option.
1670
* Fix remote access to branches containing non-compressed history.
1673
* Better reliability of http server tests. (John Arbash-Meinel)
1675
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1677
* Various minor bug in windows support have been fixed, largely in the
1678
test suite. Contributed by Alexander Belchenko.
1682
* Status now accepts a -r argument to give status between chosen
1683
revisions. Contributed by Heikki Paajanen.
1685
* Revision arguments no longer use +/-/= to control ranges, instead
1686
there is a 'before' namespace, which limits the successive namespace.
1687
For example '$ bzr log -r date:yesterday..before:date:today' will
1688
select everything from yesterday and before today. Contributed by
1691
* There is now a bzr.bat file created by distutils when building on
1692
Windows. Contributed by Alexander Belchenko.
1696
* Removed uuid() as it was unused.
1698
* Improved 'fetch' code for pulling revisions from one branch into
1699
another (used by pull, merged, etc.)
1702
bzr 0.0.8 2005-09-20
1706
* Adding a file whose parent directory is not versioned will
1707
implicitly add the parent, and so on up to the root. This means
1708
you should never need to explictly add a directory, they'll just
1709
get added when you add a file in the directory. Contributed by
1712
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1715
* If you set BZR_EDITOR in the environment, it is checked in
1716
preference to EDITOR and the config file for the interactive commit
1717
editing program. Related to this is a bugfix where a missing program
1718
set in EDITOR would cause editing to fail, now the fallback program
1719
for the operating system is still tried.
1721
* Files that are not directories/symlinks/regular files will no longer
1722
cause bzr to fail, it will just ignore them by default. You cannot add
1723
them to the tree though - they are not versionable.
1728
* Refactor xml packing/unpacking.
1732
* Fixed 'bzr mv' by Ollie Rutherfurd.
1734
* Fixed strange error when trying to access a nonexistent http
1737
* Make sure that the hashcache gets written out if it can't be
1743
* Various Windows fixes from Ollie Rutherfurd.
1745
* Quieten warnings about locking; patch from Matt Lavin.
1748
bzr-0.0.7 2005-09-02
1752
* ``bzr shell-complete`` command contributed by Clint Adams to
1753
help with intelligent shell completion.
1755
* New expert command ``bzr find-merge-base`` for debugging merges.
1760
* Much better merge support.
1762
* merge3 conflicts are now reported with markers like '<<<<<<<'
1763
(seven characters) which is the same as CVS and pleases things
1769
* ``bzr upgrade`` no longer fails when trying to fix trees that
1770
mention revisions that are not present.
1772
* Fixed bugs in listing plugins from ``bzr plugins``.
1774
* Fix case of $EDITOR containing options for the editor.
1776
* Fix log -r refusing to show the last revision.
1777
(Patch from Goffredo Baroncelli.)
1782
* ``bzr log --show-ids`` shows the revision ids of all parents.
1784
* Externally provided commands on your $BZRPATH no longer need
1785
to recognize --bzr-usage to work properly, and can just handle
1791
* Changed trace messages to go through the standard logging
1792
framework, so that they can more easily be redirected by
1797
bzr-0.0.6 2005-08-18
1801
* Python plugins, automatically loaded from the directories on
1802
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1804
* New 'bzr mkdir' command.
1806
* Commit mesage is fetched from an editor if not given on the
1807
command line; patch from Torsten Marek.
1809
* ``bzr log -m FOO`` displays commits whose message matches regexp
1812
* ``bzr add`` with no arguments adds everything under the current directory.
1814
* ``bzr mv`` does move or rename depending on its arguments, like
1817
* ``bzr missing`` command shows a summary of the differences
1818
between two trees. (Merged from John Arbash-Meinel.)
1820
* An email address for commits to a particular tree can be
1821
specified by putting it into .bzr/email within a branch. (Based
1822
on a patch from Heikki Paajanen.)
1827
* Faster working tree operations.
1832
* 3rd-party modules shipped with bzr are copied within the bzrlib
1833
python package, so that they can be installed by the setup
1834
script without clashing with anything already existing on the
1835
system. (Contributed by Gustavo Niemeyer.)
1837
* Moved plugins directory to bzrlib/, so that there's a standard
1838
plugin directory which is not only installed with bzr itself but
1839
is also available when using bzr from the development tree.
1840
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1841
standard plugins directory.
1843
* When exporting to a tarball with ``bzr export --format tgz``, put
1844
everything under a top directory rather than dumping it into the
1845
current directory. This can be overridden with the ``--root``
1846
option. Patch from William Dodé and John Meinel.
1848
* New ``bzr upgrade`` command to upgrade the format of a branch,
1849
replacing ``bzr check --update``.
1851
* Files within store directories are no longer marked readonly on
1854
* Changed ``bzr log`` output to a more compact form suggested by
1855
John A Meinel. Old format is available with the ``--long`` or
1856
``-l`` option, patched by William Dodé.
1858
* By default the commit command refuses to record a revision with
1859
no changes unless the ``--unchanged`` option is given.
1861
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1862
line options must come before the command name because they
1863
affect what commands are available; all other options must come
1864
after the command name because their interpretation depends on
1867
* ``branch`` and ``clone`` added as aliases for ``branch``.
1869
* Default log format is back to the long format; the compact one
1870
is available with ``--short``.
1875
* Fix bugs in committing only selected files or within a subdirectory.
1878
bzr-0.0.5 2005-06-15
1882
* ``bzr`` with no command now shows help rather than giving an
1883
error. Suggested by Michael Ellerman.
1885
* ``bzr status`` output format changed, because svn-style output
1886
doesn't really match the model of bzr. Now files are grouped by
1887
status and can be shown with their IDs. ``bzr status --all``
1888
shows all versioned files and unknown files but not ignored files.
1890
* ``bzr log`` runs from most-recent to least-recent, the reverse
1891
of the previous order. The previous behaviour can be obtained
1892
with the ``--forward`` option.
1894
* ``bzr inventory`` by default shows only filenames, and also ids
1895
if ``--show-ids`` is given, in which case the id is the second
1901
* New 'bzr whoami --email' option shows only the email component
1902
of the user identification, from Jo Vermeulen.
1904
* New ``bzr ignore PATTERN`` command.
1906
* Nicer error message for broken pipe, interrupt and similar
1907
conditions that don't indicate an internal error.
1909
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1911
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1912
either read or write mode.
1914
* New option ``bzr log --show-ids`` shows revision and file ids.
1916
* New usage ``bzr log FILENAME`` shows only revisions that
1919
* Changed format for describing changes in ``bzr log -v``.
1921
* New option ``bzr commit --file`` to take a message from a file,
1922
suggested by LarstiQ.
1924
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1925
Oler. File may be in a branch other than the working directory.
1927
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1930
* Commands can now be defined by external programs or scripts
1931
in a directory on $BZRPATH.
1933
* New "stat cache" avoids reading the contents of files if they
1934
haven't changed since the previous time.
1936
* If the Python interpreter is too old, try to find a better one
1937
or give an error. Based on a patch from Fredrik Lundh.
1939
* New optional parameter ``bzr info [BRANCH]``.
1941
* New form ``bzr commit SELECTED`` to commit only selected files.
1943
* New form ``bzr log -r FROM:TO`` shows changes in selected
1944
range; contributed by John A Meinel.
1946
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1947
options through to an external GNU diff.
1949
* New option ``bzr add --no-recurse`` to add a directory but not
1952
* ``bzr --version`` now shows more information if bzr is being run
1958
* Fixed diff format so that added and removed files will be
1959
handled properly by patch. Fix from Lalo Martins.
1961
* Various fixes for files whose names contain spaces or other
1967
* Converted black-box test suites from Bourne shell into Python;
1968
now run using ``./testbzr``. Various structural improvements to
1971
* testbzr by default runs the version of bzr found in the same
1972
directory as the tests, or the one given as the first parameter.
1974
* testbzr also runs the internal tests, so the only command
1975
required to check is just ``./testbzr``.
1977
* testbzr requires python2.4, but can be used to test bzr running
1978
under a different version.
1980
* Tests added for many other changes in this release.
1985
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1987
* Refactor command functions into Command objects based on HCT by
1988
Scott James Remnant.
1990
* Better help messages for many commands.
1992
* Expose bzrlib.open_tracefile() to start the tracefile; until
1993
this is called trace messages are just discarded.
1995
* New internal function find_touching_revisions() and hidden
1996
command touching-revisions trace the changes to a given file.
1998
* Simpler and faster compare_inventories() function.
2000
* bzrlib.open_tracefile() takes a tracefilename parameter.
2002
* New AtomicFile class.
2004
* New developer commands ``added``, ``modified``.
2009
* Cope on Windows on python2.3 by using the weaker random seed.
2010
2.4 is now only recommended.
2013
bzr-0.0.4 2005-04-22
2017
* 'bzr diff' optionally takes a list of files to diff. Still a bit
2018
basic. Patch from QuantumG.
2020
* More default ignore patterns.
2022
* New 'bzr log --verbose' shows a list of files changed in the
2023
changeset. Patch from Sebastian Cote.
2025
* Roll over ~/.bzr.log if it gets too large.
2027
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
2030
* New 'bzr help commands' based on a patch from Denys Duchier.
2035
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
2036
or $EMAIL. All are decoded by the locale preferred encoding.
2037
If none of these are present user@hostname is used. The host's
2038
fully-qualified name is not used because that tends to fail when
2039
there are DNS problems.
2041
* New 'bzr whoami' command instead of username user-email.
2046
* Make commit safe for hardlinked bzr trees.
2048
* Some Unicode/locale fixes.
2050
* Partial workaround for difflib.unified_diff not handling
2051
trailing newlines properly.
2056
* Allow docstrings for help to be in PEP0257 format. Patch from
2059
* More tests in test.sh.
2061
* Write profile data to a temporary file not into working
2062
directory and delete it when done.
2064
* Smaller .bzr.log with process ids.
2069
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
2072
* Some improvements in handling paths on Windows, based on a patch
2076
bzr-0.0.3 2005-04-06
2080
* New "directories" internal command lists versioned directories
2083
* Can now say "bzr commit --help".
2085
* New "rename" command to rename one file to a different name
2088
* New "move" command to move one or more files into a different
2091
* New "renames" command lists files renamed since base revision.
2093
* New cat command contributed by janmar.
2097
* .bzr.log is placed in $HOME (not pwd) and is always written in
2098
UTF-8. (Probably not a completely good long-term solution, but
2103
* Workaround for difflib bug in Python 2.3 that causes an
2104
exception when comparing empty files. Reported by Erik Toubro
2109
* Refactored inventory storage to insert a root entry at the top.
2113
* Start of shell-based black-box testing in test.sh.
2120
* Win32 fixes from Steve Brown.
2123
bzr-0.0.2 "black cube" 2005-03-31
2127
* Default ignore list extended (see bzrlib/__init__.py).
2129
* Patterns in .bzrignore are now added to the default ignore list,
2130
rather than replacing it.
2132
* Ignore list isn't reread for every file.
2136
* Reinstate the 'bzr check' command to check invariants of the
2139
* New 'ignored' command lists which files are ignored and why;
2140
'deleted' lists files deleted in the current working tree.
2142
* Performance improvements.
2144
* New global --profile option.
2146
* Ignore patterns like './config.h' now correctly match files in
2147
the root directory only.
2150
bzr-0.0.1 2005-03-26
2154
* More information from info command.
2156
* Can now say "bzr help COMMAND" for more detailed help.
2158
* Less file flushing and faster performance when writing logs and
2159
committing to stores.
2161
* More useful verbose output from some commands.
2165
* Fix inverted display of 'R' and 'M' during 'commit -v'.
2169
* Include a subset of ElementTree-1.2.20040618 to make
2170
installation easier.
2172
* Fix time.localtime call to work with Python 2.3 (the minimum
2176
bzr-0.0.0.69 2005-03-22
2180
* First public release.
2182
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
