« back to all changes in this revision
Viewing changes to NEWS
- browse files at revision 821
- compare with another revision
- download diff
- download tarball
- view history from revision 821
- Committer: Martin Pool
- Date: 2005-07-04 13:08:55 UTC
- Revision ID: mbp@sourcefrog.net-20050704130854-7fbef398256b8cab
- start code for built-in diff3-style resolve
- test cases for this
- test cases for this
- files added:
- build-api
- notes
- patches
- plugins/changeset
- plugins/rsync
- urlgrabber
- files removed:
- BRANCH.TODO
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/bundle
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins/launchpad
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/commands
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/intertree_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/inventory_implementations
- bzrlib/tests/per_lock
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/test_patches_data
- bzrlib/tests/tree_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/tests
- bzrlib/version_info_formats
- contrib/emacs
- doc/developers
- doc/en
- doc/en/developer-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/user-guide
- doc/en/user-reference
- man1
- tools
- tools/doc_generate
- tools/win32
- files renamed:
- tools/doc_generate/autodoc_man.py => bzr-man.py
- bzrlib/bundle/__init__.py => bzrlib/changeset.py
- contrib/newinventory.py => bzrlib/newinventory.py
- bzrlib/tests/ => bzrlib/selftest/
- bzrlib/tests/blackbox/test_too_much.py => bzrlib/selftest/blackbox.py
- bzrlib/tests/test_merge3.py => bzrlib/selftest/merge3.py
- bzrlib/tests/test_plugins.py => bzrlib/selftest/plugins.py
- bzrlib/tests/blackbox/test_versioning.py => bzrlib/selftest/versioning.py
- bzrlib/tests/test_whitebox.py => bzrlib/selftest/whitebox.py
- bzrlib/store/__init__.py => bzrlib/store.py
- bzrlib/xml_serializer.py => bzrlib/xml.py
- bzrlib/util/effbot/ => effbot/
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/plugins/ => plugins/
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
NEWS
1
====================
2
Bazaar Release Notes
3
====================
4
5
.. contents::
6
7
IN DEVELOPMENT
8
==============
9
10
NOTES WHEN UPGRADING:
11
12
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
13
repository index errors that occured as a result of the Weave disk format.
14
Instead the ``reconcile`` command needs to be run to correct those
15
problems if they exist (and it has been able to fix most such problems
16
since bzr 0.8). Some new problems have been identified during this release
17
and you should run ``bzr check`` once on every repository to see if you
18
need to reconcile. If you cannot ``pull`` or ``merge`` from a remote
19
repository due to mismatched parent errors - a symptom of index errors -
20
you should simply take a full copy of that remote repository to a clean
21
directory outside any local repositories, then run reconcile on it, and
22
finally pull from it locally. (And naturally email the repositories owner
23
to ask them to upgrade and run reconcile).
24
(Robert Collins)
25
26
FEATURES:
27
28
* New ``reconfigure`` command (Aaron Bentley)
29
30
PERFORMANCE:
31
32
* Commit in quiet mode is now slightly faster as the information to
33
output is no longer calculated. (Ian Clatworthy)
34
35
* Commit no longer checks for new text keys during insertion when the
36
revision id was deterministically unique. (Robert Collins)
37
38
* Committing a change which is not a merge and does not change the number of
39
files in the tree is faster by utilising the data about whether files are
40
changed to determine if the tree is unchanged rather than recalculating
41
it at the end of the commit process. (Robert Collins)
42
43
* Inventory serialisation no longer double-sha's the content.
44
(Robert Collins)
45
46
* Partial commits are now approximately 40% faster by walking over the
47
unselected current tree more efficiently. (Robert Collins)
48
49
* XML inventory serialisation takes 20% less time while being stricter about
50
the contents. (Robert Collins)
51
52
IMPROVEMENTS:
53
54
* Mutt is now a supported mail client; set ``mail_client=mutt`` in your
55
bazaar.conf and ``send`` will use mutt. (Keir Mierle)
56
57
* Show encodings, locale and list of plugins in the traceback message.
58
(Martin Pool, #63894)
59
60
BUG FIXES:
61
62
* The basename, not the full path, is now used when checking whether
63
the profiling dump file begins with ``callgrind.out`` or not. This
64
fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
65
66
* Commands reporting exceptions can now be profiled and still have their
67
data correctly dumped to a file. For example, a ``bzr commit`` with
68
no changes still reports the operation as pointless but doing so no
69
longer throws away the profiling data if this command is run with
70
``--lsprof-file callgrind.out.ci`` say. (Ian Clatworthy)
71
72
* HttpServer and FtpServer need to be closed properly or a listening socket
73
will remain opened.
74
(Vincent Ladeuil, #140055)
75
76
* Fix commit ordering in corner case (Aaron Bentley, #94975)
77
78
* Fallback to ftp when paramiko is not installed and sftp can't be used for
79
``tests/commands`` so that the test suite is still usable without
80
paramiko.
81
(Vincent Ladeuil, #59150)
82
83
* Fix selftest semi-random noise during http related tests.
84
(Vincent Ladeuil, #140614)
85
86
* Trivial fix for invoking command ``reconfigure`` without arguments.
87
(Rob Weir, #141629)
88
89
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
90
new path causes bzr to be unable to access the file. (Robert Collins)
91
92
API BREAKS:
93
94
* ``KnitVersionedFile.add*`` will no longer cache added records even when
95
enable_cache() has been called - the caching feature is now exclusively for
96
reading existing data. (Robert Collins)
97
98
* The ``VersionedFile`` interface now allows content checks to be bypassed
99
by supplying check_content=False. This saves nearly 30% of the minimum
100
cost to store a version of a file. (Robert Collins)
101
102
* Tree's with bad state such as files with no length or sha will no longer
103
be silently accepted by the repository XML serialiser. To serialise
104
inventories without such data, pass working=True to write_inventory.
105
(Robert Collins)
106
107
* ``VersionedFile.fix_parents`` has been removed as a harmful API.
108
``VersionedFile.join`` will no longer accept different parents on either
109
side of a join - it will either ignore them, or error, depending on the
110
implementation. See notes when upgrading for more information.
111
(Robert Collins)
112
113
INTERNALS:
114
115
* New method ``bzrlib.osutils.minimum_path_selection`` useful for removing
116
duplication from user input, when a user mentions both a path and an item
117
contained within that path. (Robert Collins)
118
119
* New method on xml serialisers, write_inventory_to_lines, which matches the
120
API used by knits for adding content. (Robert Collins)
121
122
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
123
and returns a gzipped version of the same. This is used to avoid a bunch
124
of api friction during adding of knit hunks. (Robert Collins)
125
126
* New parameter yield_parents on ``Inventory.iter_entries_by_dir`` which
127
causes the parents of a selected id to be returned recursively, so all the
128
paths from the root down to each element of selected_file_ids are
129
returned. (Robert Collins)
130
131
TESTING:
132
133
134
bzr 0.91rc2 2007-09-11
135
======================
136
137
* Replaced incorrect tarball for previous release; a debug statement was left
138
in bzrlib/remote.py.
139
140
bzr 0.91rc1 2007-09-11
141
======================
142
143
CHANGES:
144
145
* The default branch and repository format has changed to
146
``dirstate-tags``, so tag commands are active by default.
147
This format is compatible with Bazaar 0.15 and later.
148
This incidentally fixes bug #126141.
149
(Martin Pool)
150
151
* ``--quiet`` or ``-q`` is no longer a global option. If present, it
152
must now appear after the command name. Scripts doing things like
153
``bzr -q missing`` need to be rewritten as ``bzr missing -q``.
154
(Ian Clatworthy)
155
156
FEATURES:
157
158
* New option ``--author`` in ``bzr commit`` to specify the author of the
159
change, if it's different from the committer. ``bzr log`` and
160
``bzr annotate`` display the author instead of the committer.
161
(Lukáš Lalinský)
162
163
* In addition to global options and command specific options, a set of
164
standard options are now supported. Standard options are legal for
165
all commands. The initial set of standard options are:
166
167
* ``--help`` or ``-h`` - display help message
168
* ``--verbose`` or ``-v`` - display additional information
169
* ``--quiet`` or ``-q`` - only output warnings and errors.
170
171
Unlike global options, standard options can be used in aliases and
172
may have command-specific help. (Ian Clatworthy)
173
174
* Verbosity level processing has now been unified. If ``--verbose``
175
or ``-v`` is specified on the command line multiple times, the
176
verbosity level is made positive the first time then increased.
177
If ``--quiet`` or ``-q`` is specified on the command line
178
multiple times, the verbosity level is made negative the first
179
time then decreased. To get the default verbosity level of zero,
180
either specify none of the above , ``--no-verbose`` or ``--no-quiet``.
181
Note that most commands currently ignore the magnitude of the
182
verbosity level but do respect *quiet vs normal vs verbose* when
183
generating output. (Ian Clatworthy)
184
185
* ``Branch.hooks`` now supports ``pre_commit`` hook. The hook's signature
186
is documented in BranchHooks constructor. (Nam T. Nguyen, #102747)
187
188
BUG FIXES:
189
190
* ``bzr plugins`` now lists the version number for each plugin in square
191
brackets after the path. (Robert Collins, #125421)
192
193
* Pushing, pulling and branching branches with subtree references was not
194
copying the subtree weave, preventing the file graph from being accessed
195
and causing errors in commits in clones. (Robert Collins)
196
197
* Suppress warning "integer argument expected, got float" from Paramiko,
198
which sometimes caused false test failures. (Martin Pool)
199
200
* Fix bug in bundle 4 that could cause attempts to write data to wrong
201
versionedfile. (Aaron Bentley)
202
203
* Diffs generated using "diff -p" no longer break the patch parser.
204
(Aaron Bentley)
205
206
* get_transport treats an empty possible_transports list the same as a non-
207
empty one. (Aaron Bentley)
208
209
* patch verification for merge directives is reactivated, and works with
210
CRLF and CR files. (Aaron Bentley)
211
212
* Accept ..\ as a path in revision specifiers. This fixes for example
213
"-r branch:..\other-branch" on Windows. (Lukáš Lalinský)
214
215
* ``BZR_PLUGIN_PATH`` may now contain trailing slashes.
216
(Blake Winton, #129299)
217
218
* man page no longer lists hidden options (#131667, Aaron Bentley)
219
220
* ``uncommit --help`` now explains the -r option adequately. (Daniel
221
Watkins, #106726)
222
223
* Error messages are now better formatted with parameters (such as
224
filenames) quoted when necessary. This avoids confusion when directory
225
names ending in a '.' at the end of messages were confused with a
226
full stop that may or not have been there. (Daniel Watkins, #129791)
227
228
* Fix ``status FILE -r X..Y``. (Lukáš Lalinský)
229
230
* If a particular command is an alias, ``help`` will show the alias
231
instead of claiming there is no help for said alias. (Daniel Watkins,
232
#133548)
233
234
* TreeTransform-based operations, like pull, merge, revert, and branch,
235
now roll back if they encounter an error. (Aaron Bentley, #67699)
236
237
* ``bzr commit`` now exits cleanly if a character unsupported by the
238
current encoding is used in the commit message. (Daniel Watkins,
239
#116143)
240
241
* bzr send uses default values for ranges when only half of an elipsis
242
is specified ("-r..5" or "-r5.."). (#61685, Aaron Bentley)
243
244
* Avoid trouble when Windows ssh calls itself 'plink' but no plink
245
binary is present. (Martin Albisetti, #107155)
246
247
* ``bzr remove`` should remove clean subtrees. Now it will remove (without
248
needing ``--force``) subtrees that contain no files with text changes or
249
modified files. With ``--force`` it removes the subtree regardless of
250
text changes or unknown files. Directories with renames in or out (but
251
not changed otherwise) will now be removed without needing ``--force``.
252
Unknown ignored files will be deleted without needing ``--force``.
253
(Marius Kruger, #111665)
254
255
* When two plugins conflict, the source of both the losing and now the
256
winning definition is shown. (Konstantin Mikhaylov, #5454)
257
258
* When committing to a branch, the location being committed to is
259
displayed. (Daniel Watkins, #52479)
260
261
* ``bzr --version`` takes care about encoding of stdout, especially
262
when output is redirected. (Alexander Belchenko, #131100)
263
264
* Prompt for an ftp password if none is provided.
265
(Vincent Ladeuil, #137044)
266
267
* Reuse bound branch associated transport to avoid multiple
268
connections.
269
(Vincent Ladeuil, #128076, #131396)
270
271
* Overwrite conflicting tags by ``push`` and ``pull`` if the
272
``--overwrite`` option is specified. (Lukáš Lalinský, #93947)
273
274
* In checkouts, tags are copied into the master branch when created,
275
changed or deleted, and are copied into the checkout when it is
276
updated. (Martin Pool, #93856, #93860)
277
278
IMPROVEMENTS:
279
280
* Add the option "--show-diff" to the commit command in order to display
281
the diff during the commit log creation. (Goffredo Baroncelli)
282
283
* ``pull`` and ``merge`` are much faster at installing bundle format 4.
284
(Aaron Bentley)
285
286
* ``pull -v`` no longer includes deltas, making it much faster.
287
(Aaron Bentley)
288
289
* ``send`` now sends the directive as an attachment by default.
290
(Aaron Bentley, Lukáš Lalinský, Alexander Belchenko)
291
292
* Documentation updates (Martin Albisetti)
293
294
* Help on debug flags is now included in ``help global-options``.
295
(Daniel Watkins, #124853)
296
297
* Parameters passed on the command line are checked to ensure they are
298
supported by the encoding in use. (Daniel Watkins)
299
300
* The compression used within the bzr repository has changed from zlib
301
level 9 to the zlib default level. This improves commit performance with
302
only a small increase in space used (and in some cases a reduction in
303
space). (Robert Collins)
304
305
* Initial commit no longer SHAs files twice and now reuses the path
306
rather than looking it up again, making it faster.
307
(Ian Clatworthy)
308
309
* New option ``-c``/``--change`` for ``diff`` and ``status`` to show
310
changes in one revision. (Lukáš Lalinský)
311
312
* If versioned files match a given ignore pattern, a warning is now
313
given. (Daniel Watkins, #48623)
314
315
* ``bzr status`` now has -S as a short name for --short and -V as a
316
short name for --versioned. These have been added to assist users
317
migrating from Subversion: ``bzr status -SV`` is now like
318
``svn status -q``. (Daniel Watkins, #115990)
319
320
* Added C implementation of ``PatienceSequenceMatcher``, which is about
321
10x faster than the Python version. This speeds up commands that
322
need file diffing, such as ``bzr commit`` or ``bzr diff``.
323
(Lukáš Lalinský)
324
325
* HACKING has been extended with a large section on core developer tasks.
326
(Ian Clatworthy)
327
328
* Add ``branches`` and ``standalone-trees`` as online help topics and
329
include them as Concepts within the User Reference.
330
(Paul Moore, Ian Clatworthy)
331
332
API BREAKS:
333
334
* ``Branch.append_revision`` is removed altogether; please use
335
``Branch.set_last_revision_info`` instead. (Martin Pool)
336
337
* CommitBuilder now advertises itself as requiring the root entry to be
338
supplied. This only affects foreign repository implementations which reuse
339
CommitBuilder directly and have changed record_entry_contents to require
340
that the root not be supplied. This should be precisely zero plugins
341
affected. (Robert Collins)
342
343
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
344
its return value to include the sha1 and length of the inserted text. This
345
allows the avoidance of double-sha1 calculations during commit.
346
(Robert Collins)
347
348
* ``Transport.should_cache`` has been removed. It was not called in the
349
previous release. (Martin Pool)
350
351
TESTING:
352
353
* Tests may now raise TestNotApplicable to indicate they shouldn't be
354
run in a particular scenario. (Martin Pool)
355
356
* New function multiply_tests_from_modules to give a simpler interface
357
to test parameterization. (Martin Pool, Robert Collins)
358
359
* ``Transport.should_cache`` has been removed. It was not called in the
360
previous release. (Martin Pool)
361
362
* NULL_REVISION is returned to indicate the null revision, not None.
363
(Aaron Bentley)
364
365
* Use UTF-8 encoded StringIO for log tests to avoid failures on
366
non-ASCII committer names. (Lukáš Lalinský)
367
368
INTERNALS:
369
370
* ``bzrlib.plugin.all_plugins`` has been deprecated in favour of
371
``bzrlib.plugin.plugins()`` which returns PlugIn objects that provide
372
useful functionality for determining the path of a plugin, its tests, and
373
its version information. (Robert Collins)
374
375
* Add the option user_encoding to the function 'show_diff_trees()'
376
in order to move the user encoding at the UI level. (Goffredo Baroncelli)
377
378
* Add the function make_commit_message_template_encoded() and the function
379
edit_commit_message_encoded() which handle encoded strings.
380
This is done in order to mix the commit messages (which is a unicode
381
string), and the diff which is a raw string. (Goffredo Baroncelli)
382
383
* CommitBuilder now defaults to using add_lines_with_ghosts, reducing
384
overhead on non-weave repositories which don't require all parents to be
385
present. (Robert Collins)
386
387
* Deprecated method ``find_previous_heads`` on
388
``bzrlib.inventory.InventoryEntry``. This has been superseded by the use
389
of ``parent_candidates`` and a separate heads check via the repository
390
API. (Robert Collins)
391
392
* New trace function ``mutter_callsite`` will print out a subset of the
393
stack to the log, which can be useful for gathering debug details.
394
(Robert Collins)
395
396
* ``bzrlib.pack.ContainerWriter`` now tracks how many records have been
397
added via a public attribute records_written. (Robert Collins)
398
399
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
400
This provides a hint to users of transports as to the reasonable
401
minimum data to read. In principle this can take latency and
402
bandwidth into account on a per-connection basis, but for now it
403
just has hard coded values based on the url. (e.g. http:// has a large
404
page size, file:// has a small one.) (Robert Collins)
405
406
* New method on ``bzrlib.transport.Transport`` ``open_write_stream`` allows
407
incremental addition of data to a file without requiring that all the
408
data be buffered in memory. (Robert Collins)
409
410
* New methods on ``bzrlib.knit.KnitVersionedFile``:
411
``get_data_stream(versions)``, ``insert_data_stream(stream)`` and
412
``get_format_signature()``. These provide some infrastructure for
413
efficiently streaming the knit data for a set of versions over the smart
414
protocol.
415
416
* Knits with no annotation cache still produce correct annotations.
417
(Aaron Bentley)
418
419
* Three new methods have been added to ``bzrlib.trace``:
420
``set_verbosity_level``, ``get_verbosity_level`` and ``is_verbose``.
421
``set_verbosity_level`` expects a numeric value: negative for quiet,
422
zero for normal, positive for verbose. The size of the number can be
423
used to determine just how quiet or verbose the application should be.
424
The existing ``be_quiet`` and ``is_quiet`` routines have been
425
integrated into this new scheme. (Ian Clatworthy)
426
427
* Options can now be delcared with a ``custom_callback`` parameter. If
428
set, this routine is called after the option is processed. This feature
429
is now used by the standard options ``verbose`` and ``quiet`` so that
430
setting one implicitly resets the other. (Ian Clatworthy)
431
432
* Rather than declaring a new option from scratch in order to provide
433
custom help, a centrally registered option can be decorated using the
434
new ``bzrlib.Option.custom_help`` routine. In particular, this routine
435
is useful when declaring better help for the ``verbose`` and ``quiet``
436
standard options as the base definition of these is now more complex
437
than before thanks to their use of a custom callback. (Ian Clatworthy)
438
439
* Tree._iter_changes(specific_file=[]) now iterates through no files,
440
instead of iterating through all files. None is used to iterate through
441
all files. (Aaron Bentley)
442
443
* WorkingTree.revert() now accepts None to revert all files. The use of
444
[] to revert all files is deprecated. (Aaron Bentley)
445
446
447
bzr 0.90 2007-08-28
448
===================
449
450
IMPROVEMENTS:
451
452
* Documentation is now organized into multiple directories with a level
453
added for different languages or locales. Added the Mini Tutorial
454
and Quick Start Summary (en) documents from the Wiki, improving the
455
content and readability of the former. Formatted NEWS as Release Notes
456
complete with a Table of Conents, one heading per release. Moved the
457
Developer Guide into the main document catalog and provided a link
458
from the developer document catalog back to the main one.
459
(Ian Clatworthy, Sabin Iacob, Alexander Belchenko)
460
461
462
API CHANGES:
463
464
* The static convenience method ``BzrDir.create_repository``
465
is deprecated. Callers should instead create a ``BzrDir`` instance
466
and call ``create_repository`` on that. (Martin Pool)
467
468
469
bzr 0.90rc1 2007-08-14
470
======================
471
472
BUGFIXES:
473
474
* ``bzr init`` should connect to the remote location one time only. We
475
have been connecting several times because we forget to pass around the
476
Transport object. This modifies ``BzrDir.create_branch_convenience``,
477
so that we can give it the Transport we already have.
478
(John Arbash Meinel, Vincent Ladeuil, #111702)
479
480
* Get rid of sftp connection cache (get rid of the FTP one too).
481
(Vincent Ladeuil, #43731)
482
483
* bzr branch {local|remote} remote don't try to create a working tree
484
anymore.
485
(Vincent Ladeuil, #112173)
486
487
* All identified multiple connections for a single bzr command have been
488
fixed. See bzrlib/tests/commands directory.
489
(Vincent Ladeuil)
490
491
* ``bzr rm`` now does not insist on ``--force`` to delete files that
492
have been renamed but not otherwise modified. (Marius Kruger,
493
#111664)
494
495
* ``bzr selftest --bench`` no longer emits deprecation warnings
496
(Lukáš Lalinský)
497
498
* ``bzr status`` now honours FILE parameters for conflict lists
499
(Aaron Bentley, #127606)
500
501
* ``bzr checkout`` now honours -r when reconstituting a working tree.
502
It also honours -r 0. (Aaron Bentley, #127708)
503
504
* ``bzr add *`` no more fails on Windows if working tree contains
505
non-ascii file names. (Kuno Meyer, #127361)
506
507
* allow ``easy_install bzr`` runs without fatal errors.
508
(Alexander Belchenko, #125521)
509
510
* Graph._filter_candidate_lca does not raise KeyError if a candidate
511
is eliminated just before it would normally be examined. (Aaron Bentley)
512
513
* SMTP connection failures produce a nice message, not a traceback.
514
(Aaron Bentley)
515
516
IMPROVEMENTS:
517
518
* Don't show "dots" progress indicators when run non-interactively, such
519
as from cron. (Martin Pool)
520
521
* ``info`` now formats locations more nicely and lists "submit" and
522
"public" branches (Aaron Bentley)
523
524
* New ``pack`` command that will trigger database compression within
525
the repository (Robert Collins)
526
527
* Implement ``_KnitIndex._load_data`` in a pyrex extension. The pyrex
528
version is approximately 2-3x faster at parsing a ``.kndx`` file.
529
Which yields a measurable improvement for commands which have to
530
read from the repository, such as a 1s => 0.75s improvement in
531
``bzr diff`` when there are changes to be shown. (John Arbash Meinel)
532
533
* Merge is now faster. Depending on the scenario, it can be more than 2x
534
faster. (Aaron Bentley)
535
536
* Give a clearer warning, and allow ``python setup.py install`` to
537
succeed even if pyrex is not available.
538
(John Arbash Meinel)
539
540
* ``DirState._read_dirblocks`` now has an optional Pyrex
541
implementation. This improves the speed of any command that has to
542
read the entire DirState. (``diff``, ``status``, etc, improve by
543
about 10%).
544
``bisect_dirblocks`` has also been improved, which helps all
545
``_get_entry`` type calls (whenever we are searching for a
546
particular entry in the in-memory DirState).
547
(John Arbash Meinel)
548
549
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the
550
branch revision history for ui display unless -v is supplied.
551
(Robert Collins)
552
553
* ``bzr log -rA..B`` output shifted to the left margin if the log only
554
contains merge revisions. (Kent Gibson)
555
556
* The ``plugins`` command is now public with improved help.
557
(Ian Clatworthy)
558
559
* New bundle and merge directive formats are faster to generate, and
560
561
* Annotate merge now works when there are local changes. (Aaron Bentley)
562
563
* Commit now only shows the progress in terms of directories instead of
564
entries. (Ian Clatworthy)
565
566
* Fix ``KnitRepository.get_revision_graph`` to not request the graph 2
567
times. This makes ``get_revision_graph`` 2x faster. (John Arbash
568
Meinel)
569
570
* Fix ``VersionedFile.get_graph()`` to avoid using
571
``set.difference_update(other)``, which has bad scaling when
572
``other`` is large. This improves ``VF.get_graph([version_id])`` for
573
a 12.5k graph from 2.9s down to 200ms. (John Arbash Meinel)
574
575
* The ``--lsprof-file`` option now generates output for KCacheGrind if
576
the file starts with ``callgrind.out``. This matches the default file
577
filtering done by KCacheGrind's Open Dialog. (Ian Clatworthy)
578
579
* Fix ``bzr update`` to avoid an unnecessary
580
``branch.get_master_branch`` call, which avoids 1 extra connection
581
to the remote server. (Partial fix for #128076, John Arbash Meinel)
582
583
* Log errors from the smart server in the trace file, to make debugging
584
test failures (and live failures!) easier. (Andrew Bennetts)
585
586
* The HTML version of the man page has been superceded by a more
587
comprehensive manual called the Bazaar User Reference. This manual
588
is completed generated from the online help topics. As part of this
589
change, limited reStructuredText is now explicitly supported in help
590
topics and command help with 'unnatural' markup being removed prior
591
to display by the online help or inclusion in the man page.
592
(Ian Clatworthy)
593
594
* HTML documentation now use files extension ``*.html``
595
(Alexander Belchenko)
596
597
* The cache of ignore definitions is now cleared in WorkingTree.unlock()
598
so that changes to .bzrignore aren't missed. (#129694, Daniel Watkins)
599
600
* ``bzr selftest --strict`` fails if there are any missing features or
601
expected test failures. (Daniel Watkins, #111914)
602
603
* Link to registration survey added to README. (Ian Clatworthy)
604
605
* Windows standalone installer show link to registration survey
606
when installation finished. (Alexander Belchenko)
607
608
LIBRARY API BREAKS:
609
610
* Deprecated dictionary ``bzrlib.option.SHORT_OPTIONS`` removed.
611
Options are now required to provide a help string and it must
612
comply with the style guide by being one or more sentences with an
613
initial capital and final period. (Martin Pool)
614
615
* KnitIndex.get_parents now returns tuples. (Robert Collins)
616
617
* Ancient unused ``Repository.text_store`` attribute has been removed.
618
(Robert Collins)
619
620
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
621
rather than just bytestrings, making it easier to represent multiple
622
element names. As this interface was not used by any internal facilities
623
since it was introduced in 0.18 no API compatibility is being preserved.
624
The serialised form of these packs is identical with 0.18 when a single
625
element tuple is in use. (Robert Collins)
626
627
INTERNALS:
628
629
* merge now uses ``iter_changes`` to calculate changes, which makes room for
630
future performance increases. It is also more consistent with other
631
operations that perform comparisons, and reduces reliance on
632
Tree.inventory. (Aaron Bentley)
633
634
* Refactoring of transport classes connected to a remote server.
635
ConnectedTransport is a new class that serves as a basis for all
636
transports needing to connect to a remote server. transport.split_url
637
have been deprecated, use the static method on the object instead. URL
638
tests have been refactored too.
639
(Vincent Ladeuil)
640
641
* Better connection sharing for ConnectedTransport objects.
642
transport.get_transport() now accepts a 'possible_transports' parameter.
643
If a newly requested transport can share a connection with one of the
644
list, it will.
645
(Vincent Ladeuil)
646
647
* Most functions now accept ``bzrlib.revision.NULL_REVISION`` to indicate
648
the null revision, and consider using ``None`` for this purpose
649
deprecated. (Aaron Bentley)
650
651
* New ``index`` module with abstract index functionality. This will be
652
used during the planned changes in the repository layer. Currently the
653
index layer provides a graph aware immutable index, a builder for the
654
same index type to allow creating them, and finally a composer for
655
such indices to allow the use of many indices in a single query. The
656
index performance is not optimised, however the API is stable to allow
657
development on top of the index. (Robert Collins)
658
659
* ``bzrlib.dirstate.cmp_by_dirs`` can be used to compare two paths by
660
their directory sections. This is equivalent to comparing
661
``path.split('/')``, only without having to split the paths.
662
This has a Pyrex implementation available.
663
(John Arbash Meinel)
664
665
* New transport decorator 'unlistable+' which disables the list_dir
666
functionality for testing.
667
668
* Deprecated ``change_entry`` in transform.py. (Ian Clatworthy)
669
670
* RevisionTree.get_weave is now deprecated. Tree.plan_merge is now used
671
for performing annotate-merge. (Aaron Bentley)
672
673
* New EmailMessage class to create email messages. (Adeodato Simó)
674
675
* Unused functions on the private interface KnitIndex have been removed.
676
(Robert Collins)
677
678
* New ``knit.KnitGraphIndex`` which provides a ``KnitIndex`` layered on top
679
of a ``index.GraphIndex``. (Robert Collins)
680
681
* New ``knit.KnitVersionedFile.iter_parents`` method that allows querying
682
the parents of many knit nodes at once, reducing round trips to the
683
underlying index. (Robert Collins)
684
685
* Graph now has an is_ancestor method, various bits use it.
686
(Aaron Bentley)
687
688
* The ``-Dhpss`` flag now includes timing information. As well as
689
logging when a new connection is opened. (John Arbash Meinel)
690
691
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
692
callers when inserting data, allowing generation of readv style access
693
during pack creation, without needing a separate pass across the output
694
pack to gather such details. (Robert Collins)
695
696
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
697
files that are stored on a transport. (Robert Collins)
698
699
* New ``Repository.has_same_location`` method that reports if two
700
repository objects refer to the same repository (although with some risk
701
of false negatives). (Andrew Bennetts)
702
703
* InterTree.compare now passes require_versioned on correctly.
704
(Marius Kruger)
705
706
* New methods on Repository - ``start_write_group``,
707
``commit_write_group``, ``abort_write_group`` and ``is_in_write_group`` -
708
which provide a clean hook point for transactional Repositories - ones
709
where all the data for a fetch or commit needs to be made atomically
710
available in one step. This allows the write lock to remain while making
711
a series of data insertions. (e.g. data conversion). (Robert Collins)
712
713
* In ``bzrlib.knit`` the internal interface has been altered to use
714
3-tuples (index, pos, length) rather than two-tuples (pos, length) to
715
describe where data in a knit is, allowing knits to be split into
716
many files. (Robert Collins)
717
718
* ``bzrlib.knit._KnitData`` split into cache management and physical access
719
with two access classes - ``_PackAccess`` and ``_KnitAccess`` defined.
720
The former provides access into a .pack file, and the latter provides the
721
current production repository form of .knit files. (Robert Collins)
722
723
TESTING:
724
725
* Remove selftest ``--clean-output``, ``--numbered-dirs`` and
726
``--keep-output`` options, which are obsolete now that tests
727
are done within directories in $TMPDIR. (Martin Pool)
728
729
* The SSH_AUTH_SOCK environment variable is now reset to avoid
730
interaction with any running ssh agents. (Jelmer Vernooij, #125955)
731
732
* run_bzr_subprocess handles parameters the same way as run_bzr:
733
either a string or a list of strings should be passed as the first
734
parameter. Varargs-style parameters are deprecated. (Aaron Bentley)
735
736
737
bzr 0.18 2007-07-17
738
====================
739
740
BUGFIXES:
741
742
* Fix 'bzr add' crash under Win32 (Kuno Meyer)
743
744
745
bzr 0.18rc1 2007-07-10
746
=======================
747
748
BUGFIXES:
749
750
* Do not suppress pipe errors, etc. in non-display commands
751
(Alexander Belchenko, #87178)
752
753
* Display a useful error message when the user requests to annotate
754
a file that is not present in the specified revision.
755
(James Westby, #122656)
756
757
* Commands that use status flags now have a reference to 'help
758
status-flags'. (Daniel Watkins, #113436)
759
760
* Work around python-2.4.1 inhability to correctly parse the
761
authentication header.
762
(Vincent Ladeuil, #121889)
763
764
* Use exact encoding for merge directives. (Adeodato Simó, #120591)
765
766
* Fix tempfile permissions error in smart server tar bundling under
767
Windows. (Martin _, #119330)
768
769
* Fix detection of directory entries in the inventory. (James Westby)
770
771
* Fix handling of http code 400: Bad Request When issuing too many ranges.
772
(Vincent Ladeuil, #115209)
773
774
* Issue a CONNECT request when connecting to an https server
775
via a proxy to enable SSL tunneling.
776
(Vincent Ladeuil, #120678)
777
778
* Fix ``bzr log -r`` to support selecting merge revisions, both
779
individually and as part of revision ranges.
780
(Kent Gibson, #4663)
781
782
* Don't leave cruft behind when failing to acquire a lockdir.
783
(Martin Pool, #109169)
784
785
* Don't use the '-f' strace option during tests.
786
(Vincent Ladeuil, #102019).
787
788
* Warn when setting ``push_location`` to a value that will be masked by
789
locations.conf. (Aaron Bentley, #122286)
790
791
* Fix commit ordering in corner case (Aaron Bentley, #94975)
792
793
* Make annotate behave in a non-ASCII world (Adeodato Simó).
794
795
IMPROVEMENTS:
796
797
* The --lsprof-file option now dumps a text rendering of the profiling
798
information if the filename ends in ".txt". It will also convert the
799
profiling information to a format suitable for KCacheGrind if the
800
output filename ends in ".callgrind". Fixes to the lsprofcalltree
801
conversion process by Jean Paul Calderone and Itamar were also merged.
802
See http://ddaa.net/blog/python/lsprof-calltree. (Ian Clatworthy)
803
804
* ``info`` now defaults to non-verbose mode, displaying only paths and
805
abbreviated format info. ``info -v`` displays all the information
806
formerly displayed by ``info``. (Aaron Bentley, Adeodato Simó)
807
808
* ``bzr missing`` now has better option names ``--this`` and ``--other``.
809
(Elliot Murphy)
810
811
* The internal ``weave-list`` command has become ``versionedfile-list``,
812
and now lists knits as well as weaves. (Aaron Bentley)
813
814
* Automatic merge base selection uses a faster algorithm that chooses
815
better bases in criss-cross merge situations (Aaron Bentley)
816
817
* Progress reporting in ``commit`` has been improved. The various logical
818
stages are now reported on as follows, namely:
819
820
* Collecting changes [Entry x/y] - Stage n/m
821
* Saving data locally - Stage n/m
822
* Uploading data to master branch - Stage n/m
823
* Updating the working tree - Stage n/m
824
* Running post commit hooks - Stage n/m
825
826
If there is no master branch, the 3rd stage is omitted and the total
827
number of stages is adjusted accordingly.
828
829
Each hook that is run after commit is listed with a name (as hooks
830
can be slow it is useful feedback).
831
(Ian Clatworthy, Robert Collins)
832
833
* Various operations that are now faster due to avoiding unnecessary
834
topological sorts. (Aaron Bentley)
835
836
* Make merge directives robust against broken bundles. (Aaron Bentley)
837
838
* The lsprof filename note is emitted via trace.note(), not standard
839
output. (Aaron Bentley)
840
841
* ``bzrlib`` now exports explicit API compatibility information to assist
842
library users and plugins. See the ``bzrlib.api`` module for details.
843
(Robert Collins)
844
845
* Remove unnecessary lock probes when acquiring a lockdir.
846
(Martin Pool)
847
848
* ``bzr --version`` now shows the location of the bzr log file, which
849
is especially useful on Windows. (Martin Pool)
850
851
* -D now supports hooks to get debug tracing of hooks (though its currently
852
minimal in nature). (Robert Collins)
853
854
* Long log format reports deltas on merge revisions.
855
(John Arbash Meinel, Kent Gibson)
856
857
* Make initial push over ftp more resilient. (John Arbash Meinel)
858
859
* Print a summary of changes for update just like pull does.
860
(Daniel Watkins, #113990)
861
862
* Add a -Dhpss option to trace smart protocol requests and responses.
863
(Andrew Bennetts)
864
865
LIBRARY API BREAKS:
866
867
* Testing cleanups -
868
``bzrlib.repository.RepositoryTestProviderAdapter`` has been moved
869
to ``bzrlib.tests.repository_implementations``;
870
``bzrlib.repository.InterRepositoryTestProviderAdapter`` has been moved
871
to ``bzrlib.tests.interrepository_implementations``;
872
``bzrlib.transport.TransportTestProviderAdapter`` has moved to
873
``bzrlib.tests.test_transport_implementations``.
874
``bzrlib.branch.BranchTestProviderAdapter`` has moved to
875
``bzrlib.tests.branch_implementations``.
876
``bzrlib.bzrdir.BzrDirTestProviderAdapter`` has moved to
877
``bzrlib.tests.bzrdir_implementations``.
878
``bzrlib.versionedfile.InterVersionedFileTestProviderAdapter`` has moved
879
to ``bzrlib.tests.interversionedfile_implementations``.
880
``bzrlib.store.revision.RevisionStoreTestProviderAdapter`` has moved to
881
``bzrlib.tests.revisionstore_implementations``.
882
``bzrlib.workingtree.WorkingTreeTestProviderAdapter`` has moved to
883
``bzrlib.tests.workingtree_implementations``.
884
These changes are an API break in the testing infrastructure only.
885
(Robert Collins)
886
887
* Relocate TestCaseWithRepository to be more central. (Robert Collins)
888
889
* ``bzrlib.add.smart_add_tree`` will no longer perform glob expansion on
890
win32. Callers of the function should do this and use the new
891
``MutableTree.smart_add`` method instead. (Robert Collins)
892
893
* ``bzrlib.add.glob_expand_for_win32`` is now
894
``bzrlib.win32utils.glob_expand``. (Robert Collins)
895
896
* ``bzrlib.add.FastPath`` is now private and moved to
897
``bzrlib.mutabletree._FastPath``. (Robert Collins, Martin Pool)
898
899
* ``LockDir.wait`` removed. (Martin Pool)
900
901
* The ``SmartServer`` hooks API has changed for the ``server_started`` and
902
``server_stopped`` hooks. The first parameter is now an iterable of
903
backing URLs rather than a single URL. This is to reflect that many
904
URLs may map to the external URL of the server. E.g. the server interally
905
may have a chrooted URL but also the local file:// URL will be at the
906
same location. (Robert Collins)
907
908
INTERNALS:
909
910
* New SMTPConnection class to unify email handling. (Adeodato Simó)
911
912
* Fix documentation of BzrError. (Adeodato Simó)
913
914
* Make BzrBadParameter an internal error. (Adeodato Simó)
915
916
* Remove use of 'assert False' to raise an exception unconditionally.
917
(Martin Pool)
918
919
* Give a cleaner error when failing to decode knit index entry.
920
(Martin Pool)
921
922
* TreeConfig would mistakenly search the top level when asked for options
923
from a section. It now respects the section argument and only
924
searches the specified section. (James Westby)
925
926
* Improve ``make api-docs`` output. (John Arbash Meinel)
927
928
* Use os.lstat rather than os.stat for osutils.make_readonly and
929
osutils.make_writeable. This makes the difftools plugin more
930
robust when dangling symlinks are found. (Elliot Murphy)
931
932
* New ``-Dlock`` option to log (to ~/.bzr.log) information on when
933
lockdirs are taken or released. (Martin Pool)
934
935
* ``bzrlib`` Hooks are now nameable using ``Hooks.name_hook``. This
936
allows a nicer UI when hooks are running as the current hook can
937
be displayed. (Robert Collins)
938
939
* ``Transport.get`` has had its interface made more clear for ease of use.
940
Retrieval of a directory must now fail with either 'PathError' at open
941
time, or raise 'ReadError' on a read. (Robert Collins)
942
943
* New method ``_maybe_expand_globs`` on the ``Command`` class for
944
dealing with unexpanded glob lists - e.g. on the win32 platform. This
945
was moved from ``bzrlib.add._prepare_file_list``. (Robert Collins)
946
947
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
948
deprecated in favour of ``MutableTree.smart_add``. (Robert Collins,
949
Martin Pool)
950
951
* New method ``external_url`` on Transport for obtaining the url to
952
hand to external processes. (Robert Collins)
953
954
* Teach windows installers to build pyrex/C extensions.
955
(Alexander Belchenko)
956
957
TESTING:
958
959
* Removed the ``--keep-output`` option from selftest and clean up test
960
directories as they're used. This reduces the IO load from
961
running the test suite and cuts the time by about half.
962
(Andrew Bennetts, Martin Pool)
963
964
* Add scenarios as a public attribute on the TestAdapter classes to allow
965
modification of the generated scenarios before adaption and easier
966
testing. (Robert Collins)
967
968
* New testing support class ``TestScenarioApplier`` which multiplies
969
out a single teste by a list of supplied scenarios. (RobertCollins)
970
971
* Setting ``repository_to_test_repository`` on a repository_implementations
972
test will cause it to be called during repository creation, allowing the
973
testing of repository classes which are not based around the Format
974
concept. For example a repository adapter can be tested in this manner,
975
by altering the repository scenarios to include a scenario that sets this
976
attribute during the test parameterisation in
977
``bzrlib.tests.repository.repository_implementations``. (Robert Collins)
978
979
* Clean up many of the APIs for blackbox testing of Bazaar. The standard
980
interface is now self.run_bzr. The command to run can be passed as
981
either a list of parameters, a string containing the command line, or
982
(deprecated) varargs parameters. (Martin Pool)
983
984
* The base TestCase now isolates tests from -D parameters by clearing
985
``debug.debug_flags`` and restores it afterwards. (Robert Collins)
986
987
* Add a relpath parameter to get_transport methods in test framework to
988
avoid useless cloning.
989
(Vincent Ladeuil, #110448)
990
991
992
bzr 0.17 2007-06-18
993
====================
994
995
BUGFIXES:
996
997
* Fix crash of commit due to wrong lookup of filesystem encoding.
998
(Colin Watson, #120647)
999
1000
* Revert logging just to stderr in commit as broke unicode filenames.
1001
(Aaron Bentley, Ian Clatworthy, #120930)
1002
1003
1004
bzr 0.17rc1 2007-06-12
1005
=======================
1006
1007
NOTES WHEN UPGRADING:
1008
1009
* The kind() and is_executable() APIs on the WorkingTree interface no
1010
longer implicitly (read) locks and unlocks the tree. This *might*
1011
impact some plug-ins and tools using this part of the API. If you find
1012
an issue that may be caused by this change, please let us know,
1013
particularly the plug-in/tool maintainer. If encountered, the API
1014
fix is to surround kind() and is_executable() calls with lock_read()
1015
and unlock() like so::
1016
1017
work_tree.lock_read()
1018
try:
1019
kind = work_tree.kind(...)
1020
finally:
1021
work_tree.unlock()
1022
1023
INTERNALS:
1024
* Rework of LogFormatter API to provide beginning/end of log hooks and to
1025
encapsulate the details of the revision to be logged in a LogRevision
1026
object.
1027
In long log formats, merge revision ids are only shown when --show-ids
1028
is specified, and are labelled "revision-id:", as per mainline
1029
revisions, instead of "merged:". (Kent Gibson)
1030
1031
* New ``BranchBuilder`` API which allows the construction of particular
1032
histories quickly. Useful for testing and potentially other applications
1033
too. (Robert Collins)
1034
1035
IMPROVEMENTS:
1036
1037
* There are two new help topics, working-trees and repositories that
1038
attempt to explain these concepts. (James Westby, John Arbash Meinel,
1039
Aaron Bentley)
1040
1041
* Added ``bzr log --limit`` to report a limited number of revisions.
1042
(Kent Gibson, #3659)
1043
1044
* Revert does not try to preserve file contents that were originally
1045
produced by reverting to a historical revision. (Aaron Bentley)
1046
1047
* ``bzr log --short`` now includes ``[merge]`` for revisions which
1048
have more than one parent. This is a small improvement to help
1049
understanding what changes have occurred
1050
(John Arbash Meinel, #83887)
1051
1052
* TreeTransform avoids many renames when contructing large trees,
1053
improving speed. 3.25x speedups have been observed for construction of
1054
kernel-sized-trees, and checkouts are 1.28x faster. (Aaron Bentley)
1055
1056
* Commit on large trees is now faster. In my environment, a commit of
1057
a small change to the Mozilla tree (55k files) has dropped from
1058
66 seconds to 32 seconds. For a small tree of 600 files, commit of a
1059
small change is 33% faster. (Ian Clatworthy)
1060
1061
* New --create-prefix option to bzr init, like for push. (Daniel Watkins,
1062
#56322)
1063
1064
BUGFIXES:
1065
1066
* ``bzr push`` should only connect to the remote location one time.
1067
We have been connecting 3 times because we forget to pass around
1068
the Transport object. This adds ``BzrDir.clone_on_transport()``, so
1069
that we can pass in the Transport that we already have.
1070
(John Arbash Meinel, #75721)
1071
1072
* ``DirState.set_state_from_inventory()`` needs to properly order
1073
based on split paths, not just string paths.
1074
(John Arbash Meinel, #115947)
1075
1076
* Let TestUIFactoy encode the password prompt with its own stdout.
1077
(Vincent Ladeuil, #110204)
1078
1079
* pycurl should take use the range header that takes the range hint
1080
into account.
1081
(Vincent Ladeuil, #112719)
1082
1083
* WorkingTree4.get_file_sha1 no longer raises an exception when invoked
1084
on a missing file. (Aaron Bentley, #118186)
1085
1086
* WorkingTree.remove works correctly with tree references, and when pwd is
1087
not the tree root. (Aaron Bentley)
1088
1089
* Merge no longer fails when a file is renamed in one tree and deleted
1090
in the other. (Aaron Bentley, #110279)
1091
1092
* ``revision-info`` now accepts dotted revnos, doesn't require a tree,
1093
and defaults to the last revision (Matthew Fuller, #90048)
1094
1095
* Tests no longer fail when BZR_REMOTE_PATH is set in the environment.
1096
(Daniel Watkins, #111958)
1097
1098
* ``bzr branch -r revid:foo`` can be used to branch any revision in
1099
your repository. (Previously Branch6 only supported revisions in your
1100
mainline). (John Arbash Meinel, #115343)
1101
1102
bzr 0.16 2007-05-07
1103
====================
1104
1105
BUGFIXES:
1106
1107
* Handle when you have 2 directories with similar names, but one has a
1108
hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes
1109
iterator was using direct comparison and ``'abc/a'`` sorts after
1110
``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
1111
(John Arbash Meinel, #111227)
1112
1113
* Handle when someone renames a file on disk without telling bzr.
1114
Previously we would report the first file as missing, but not show
1115
the new unknown file. (John Arbash Meinel, #111288)
1116
1117
* Avoid error when running hooks after pulling into or pushing from
1118
a branch bound to a smartserver branch. (Martin Pool, #111968)
1119
1120
IMPROVEMENTS:
1121
1122
* Move developer documentation to doc/developers/. This reduces clutter in
1123
the root of the source tree and allows HACKING to be split into multiple
1124
files. (Robert Collins, Alexander Belchenko)
1125
1126
* Clean up the ``WorkingTree4._iter_changes()`` internal loops as well as
1127
``DirState.update_entry()``. This optimizes the core logic for ``bzr
1128
diff`` and ``bzr status`` significantly improving the speed of
1129
both. (John Arbash Meinel)
1130
1131
bzr 0.16rc2 2007-04-30
1132
=======================
1133
1134
BUGFIXES:
1135
1136
* Handle the case when you delete a file, and then rename another file
1137
on top of it. Also handle the case of ``bzr rm --keep foo``. ``bzr
1138
status`` should show the removed file and an unknown file in its
1139
place. (John Arbash Meinel, #109993)
1140
1141
* Bundles properly read and write revision properties that have an
1142
empty value. And when the value is not ASCII.
1143
(John Arbash Meinel, #109613)
1144
1145
* Fix the bzr commit message to be in text mode.
1146
(Alexander Belchenko, #110901)
1147
1148
* Also handle when you rename a file and create a file where it used
1149
to be. (John Arbash Meinel, #110256)
1150
1151
* ``WorkingTree4._iter_changes`` should not descend into unversioned
1152
directories. (John Arbash Meinel, #110399)
1153
1154
bzr 0.16rc1 2007-04-26
1155
=======================
1156
1157
NOTES WHEN UPGRADING:
1158
1159
* ``bzr remove`` and ``bzr rm`` will now remove the working file, if
1160
it could be recovered again.
1161
This has been done for consistency with svn and the unix rm command.
1162
The old ``remove`` behaviour has been retained in the new option
1163
``bzr remove --keep``, which will just stop versioning the file,
1164
but not delete it.
1165
``bzr remove --force`` have been added which will always delete the
1166
files.
1167
``bzr remove`` is also more verbose.
1168
(Marius Kruger, #82602)
1169
1170
IMPROVEMENTS:
1171
1172
* Merge directives can now be supplied as input to `merge` and `pull`,
1173
like bundles can. (Aaron Bentley)
1174
1175
* Sending the SIGQUIT signal to bzr, which can be done on Unix by
1176
pressing Control-Backslash, drops bzr into a debugger. Type ``'c'``
1177
to continue. This can be disabled by setting the environment variable
1178
``BZR_SIGQUIT_PDB=0``. (Martin Pool)
1179
1180
* selftest now supports --list-only to list tests instead of running
1181
them. (Ian Clatworthy)
1182
1183
* selftest now supports --exclude PATTERN (or -x PATTERN) to exclude
1184
tests with names that match that regular expression.
1185
(Ian Clatworthy, #102679)
1186
1187
* selftest now supports --randomize SEED to run tests in a random order.
1188
SEED is typically the value 'now' meaning 'use the current time'.
1189
(Ian Clatworthy, #102686)
1190
1191
* New option ``--fixes`` to commit, which stores bug fixing annotations as
1192
revision properties. Built-in support for Launchpad, Debian, Trac and
1193
Bugzilla bug trackers. (Jonathan Lange, James Henstridge, Robert Collins)
1194
1195
* New API, ``bzrlib.bugtracker.tracker_registry``, for adding support for
1196
other bug trackers to ``fixes``. (Jonathan Lange, James Henstridge,
1197
Robert Collins)
1198
1199
* ``selftest`` has new short options ``-f`` and ``-1``. (Martin
1200
Pool)
1201
1202
* ``bzrlib.tsort.MergeSorter`` optimizations. Change the inner loop
1203
into using local variables instead of going through ``self._var``.
1204
Improves the time to ``merge_sort`` a 10k revision graph by
1205
approximately 40% (~700->400ms). (John Arbash Meinel)
1206
1207
* ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
1208
(Robert Collins)
1209
1210
* ``bzr help`` now provides cross references to other help topics using
1211
the _see_also facility on command classes. Likewise the bzr_man
1212
documentation, and the bzr.1 man page also include this information.
1213
(Robert Collins)
1214
1215
* Tags are now included in logs, that use the long log formatter.
1216
(Erik Bågfors, Alexander Belchenko)
1217
1218
* ``bzr help`` provides a clearer message when a help topic cannot be
1219
found. (Robert Collins, #107656)
1220
1221
* ``bzr help`` now accepts optional prefixes for command help. The help
1222
for all commands can now be found at ``bzr help commands/COMMANDNAME``
1223
as well as ``bzr help COMMANDNAME`` (which only works for commands
1224
where the name is not the same as a more general help topic).
1225
(Robert Collins)
1226
1227
* ``bzr help PLUGINNAME`` will now return the module docstring from the
1228
plugin PLUGINNAME. (Robert Collins, #50408)
1229
1230
* New help topic ``urlspec`` which lists the availables transports.
1231
(Goffredo Baroncelli)
1232
1233
* doc/server.txt updated to document the default bzr:// port
1234
and also update the blurb about the hpss' current status.
1235
(Robert Collins, #107125).
1236
1237
* ``bzr serve`` now listens on interface 0.0.0.0 by default, making it
1238
serve out to the local LAN (and anyone in the world that can reach the
1239
machine running ``bzr serve``. (Robert Collins, #98918)
1240
1241
* A new smart server protocol version has been added. It prefixes requests
1242
and responses with an explicit version identifier so that future protocol
1243
revisions can be dealt with gracefully. (Andrew Bennetts, Robert Collins)
1244
1245
* The bzr protocol version 2 indicates success or failure in every response
1246
without depending on particular commands encoding that consistently,
1247
allowing future client refactorings to be much more robust about error
1248
handling. (Robert Collins, Martin Pool, Andrew Bennetts)
1249
1250
* The smart protocol over HTTP client has been changed to always post to the
1251
same ``.bzr/smart`` URL under the original location when it can. This allows
1252
HTTP servers to only have to pass URLs ending in .bzr/smart to the smart
1253
server handler, and not arbitrary ``.bzr/*/smart`` URLs. (Andrew Bennetts)
1254
1255
* digest authentication is now supported for proxies and HTTP by the urllib
1256
based http implementation. Tested against Apache 2.0.55 and Squid
1257
2.6.5. Basic and digest authentication are handled coherently for HTTP
1258
and proxy: if the user is provided in the url (bzr command line for HTTP,
1259
proxy environment variables for proxies), the password is prompted for
1260
(only once). If the password is provided, it is taken into account. Once
1261
the first authentication is successful, all further authentication
1262
roundtrips are avoided by preventively setting the right authentication
1263
header(s).
1264
(Vincent Ladeuil).
1265
1266
INTERNALS:
1267
1268
* bzrlib API compatability with 0.8 has been dropped, cleaning up some
1269
code paths. (Robert Collins)
1270
1271
* Change the format of chroot urls so that they can be safely manipulated
1272
by generic url utilities without causing the resulting urls to have
1273
escaped the chroot. A side effect of this is that creating a chroot
1274
requires an explicit action using a ChrootServer.
1275
(Robert Collins, Andrew Bennetts)
1276
1277
* Deprecate ``Branch.get_root_id()`` because branches don't have root ids,
1278
rather than fixing bug #96847. (Aaron Bentley)
1279
1280
* ``WorkingTree.apply_inventory_delta`` provides a better alternative to
1281
``WorkingTree._write_inventory``. (Aaron Bentley)
1282
1283
* Convenience method ``TestCase.expectFailure`` ensures that known failures
1284
do not silently pass. (Aaron Bentley)
1285
1286
* ``Transport.local_abspath`` now raises ``NotLocalUrl`` rather than
1287
``TransportNotPossible``. (Martin Pool, Ian Clatworthy)
1288
1289
* New SmartServer hooks facility. There are two initial hooks documented
1290
in ``bzrlib.transport.smart.SmartServerHooks``. The two initial hooks allow
1291
plugins to execute code upon server startup and shutdown.
1292
(Robert Collins).
1293
1294
* SmartServer in standalone mode will now close its listening socket
1295
when it stops, rather than waiting for garbage collection. This primarily
1296
fixes test suite hangs when a test tries to connect to a shutdown server.
1297
It may also help improve behaviour when dealing with a server running
1298
on a specific port (rather than dynamically assigned ports).
1299
(Robert Collins)
1300
1301
* Move most SmartServer code into a new package, bzrlib/smart.
1302
bzrlib/transport/remote.py contains just the Transport classes that used
1303
to be in bzrlib/transport/smart.py. (Andrew Bennetts)
1304
1305
* urllib http implementation avoid roundtrips associated with
1306
401 (and 407) errors once the authentication succeeds.
1307
(Vincent Ladeuil).
1308
1309
* urlib http now supports querying the user for a proxy password if
1310
needed. Realm is shown in the prompt for both HTTP and proxy
1311
authentication when the user is required to type a password.
1312
(Vincent Ladeuil).
1313
1314
* Renamed SmartTransport (and subclasses like SmartTCPTransport) to
1315
RemoteTransport (and subclasses to RemoteTCPTransport, etc). This is more
1316
consistent with its new home in ``bzrlib/transport/remote.py``, and because
1317
it's not really a "smart" transport, just one that does file operations
1318
via remote procedure calls. (Andrew Bennetts)
1319
1320
* The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
1321
``Branch`` now accept a ``token`` keyword argument, so that separate
1322
instances of those objects can share a lock if it has the right token.
1323
(Andrew Bennetts, Robert Collins)
1324
1325
* New method ``get_branch_reference`` on ``BzrDir`` allows the detection of
1326
branch references - which the smart server component needs.
1327
1328
* The Repository API ``make_working_trees`` is now permitted to return
1329
False when ``set_make_working_trees`` is not implemented - previously
1330
an unimplemented ``set_make_working_trees`` implied the result True
1331
from ``make_working_trees``. This has been changed to accomodate the
1332
smart server, where it does not make sense (at this point) to ever
1333
make working trees by default. (Robert Collins)
1334
1335
* Command objects can now declare related help topics by having _see_also
1336
set to a list of related topic. (Robert Collins)
1337
1338
* ``bzrlib.help`` now delegates to the Command class for Command specific
1339
help. (Robert Collins)
1340
1341
* New class ``TransportListRegistry``, derived from the Registry class, which
1342
simplifies tracking the available Transports. (Goffredo Baroncelli)
1343
1344
* New function ``Branch.get_revision_id_to_revno_map`` which will
1345
return a dictionary mapping revision ids to dotted revnos. Since
1346
dotted revnos are defined in the context of the branch tip, it makes
1347
sense to generate them from a ``Branch`` object.
1348
(John Arbash Meinel)
1349
1350
* Fix the 'Unprintable error' message display to use the repr of the
1351
exception that prevented printing the error because the str value
1352
for it is often not useful in debugging (e.g. KeyError('foo') has a
1353
str() of 'foo' but a repr of 'KeyError('foo')' which is much more
1354
useful. (Robert Collins)
1355
1356
* ``urlutils.normalize_url`` now unescapes unreserved characters, such as "~".
1357
(Andrew Bennetts)
1358
1359
BUGFIXES:
1360
1361
* Don't fail bundle selftest if email has 'two' embedded.
1362
(Ian Clatworthy, #98510)
1363
1364
* Remove ``--verbose`` from ``bzr bundle``. It didn't work anyway.
1365
(Robert Widhopf-Fenk, #98591)
1366
1367
* Remove ``--basis`` from the checkout/branch commands - it didn't work
1368
properly and is no longer beneficial.
1369
(Robert Collins, #53675, #43486)
1370
1371
* Don't produce encoding error when adding duplicate files.
1372
(Aaron Bentley)
1373
1374
* Fix ``bzr log <file>`` so it only logs the revisions that changed
1375
the file, and does it faster.
1376
(Kent Gibson, John Arbash Meinel, #51980, #69477)
1377
1378
* Fix ``InterDirstateTre._iter_changes`` to handle when we come across
1379
an empty versioned directory, which now has files in it.
1380
(John Arbash Meinel, #104257)
1381
1382
* Teach ``common_ancestor`` to shortcut when the tip of one branch is
1383
inside the ancestry of the other. Saves a lot of graph processing
1384
(with an ancestry of 16k revisions, ``bzr merge ../already-merged``
1385
changes from 2m10s to 13s). (John Arbash Meinel, #103757)
1386
1387
* Fix ``show_diff_trees`` to handle the case when a file is modified,
1388
and the containing directory is renamed. (The file path is different
1389
in this versus base, but it isn't marked as a rename).
1390
(John Arbash Meinel, #103870)
1391
1392
* FTP now works even when the FTP server does not support atomic rename.
1393
(Aaron Bentley, #89436)
1394
1395
* Correct handling in bundles and merge directives of timezones with
1396
that are not an integer number of hours offset from UTC. Always
1397
represent the epoch time in UTC to avoid problems with formatting
1398
earlier times on win32. (Martin Pool, Alexander Belchenko, John
1399
Arbash Meinel)
1400
1401
* Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
1402
1403
* "dirstate" and "dirstate-tags" formats now produce branches compatible
1404
with old versions of bzr. (Aaron Bentley, #107168))
1405
1406
* Handle moving a directory when children have been added, removed,
1407
and renamed. (John Arbash Meinel, #105479)
1408
1409
* Don't preventively use basic authentication for proxy before receiving a
1410
407 error. Otherwise people willing to use other authentication schemes
1411
may expose their password in the clear (or nearly). This add one
1412
roundtrip in case basic authentication should be used, but plug the
1413
security hole.
1414
(Vincent Ladeuil)
1415
1416
* Handle http and proxy digest authentication.
1417
(Vincent Ladeuil, #94034).
1418
1419
TESTING:
1420
1421
* Added ``bzrlib.strace.strace`` which will strace a single callable and
1422
return a StraceResult object which contains just the syscalls involved
1423
in running it. (Robert Collins)
1424
1425
* New test method ``reduceLockdirTimeout`` to drop the default (ui-centric)
1426
default time down to one suitable for tests. (Andrew Bennetts)
1427
1428
* Add new ``vfs_transport_factory`` attribute on tests which provides the
1429
common vfs backing for both the readonly and readwrite transports.
1430
This allows the RemoteObject tests to back onto local disk or memory,
1431
and use the existing ``transport_server`` attribute all tests know about
1432
to be the smart server transport. This in turn allows tests to
1433
differentiate between 'transport to access the branch', and
1434
'transport which is a VFS' - which matters in Remote* tests.
1435
(Robert Collins, Andrew Bennetts)
1436
1437
* The ``make_branch_and_tree`` method for tests will now create a
1438
lightweight checkout for the tree if the ``vfs_transport_factory`` is not
1439
a LocalURLServer. (Robert Collins, Andrew Bennetts)
1440
1441
* Branch implementation tests have been audited to ensure that all urls
1442
passed to Branch APIs use proper urls, except when local-disk paths
1443
are intended. This is so that tests correctly access the test transport
1444
which is often not equivalent to local disk in Remote* tests. As part
1445
of this many tests were adjusted to remove dependencies on local disk
1446
access.
1447
(Robert Collins, Andrew Bennetts)
1448
1449
* Mark bzrlib.tests and bzrlib.tests.TestUtil as providing assertFOO helper
1450
functions by adding a ``__unittest`` global attribute. (Robert Collins,
1451
Andrew Bennetts, Martin Pool, Jonathan Lange)
1452
1453
* Refactored proxy and authentication handling to simplify the
1454
implementation of new auth schemes for both http and proxy.
1455
(Vincent Ladeuil)
1456
1457
bzr 0.15 2007-04-01
1458
===================
1459
1460
BUGFIXES:
1461
1462
* Handle incompatible repositories as a user issue when fetching.
1463
(Aaron Bentley)
1464
1465
* Don't give a recommendation to upgrade when branching or
1466
checking out a branch that contains an old-format working tree.
1467
(Martin Pool)
1468
1469
bzr 0.15rc3 2007-03-26
1470
=======================
1471
1472
CHANGES:
1473
1474
* A warning is now displayed when opening working trees in older
1475
formats, to encourage people to upgrade to WorkingTreeFormat4.
1476
(Martin Pool)
1477
1478
IMPROVEMENTS:
1479
1480
* HTTP redirections are now taken into account when a branch (or a
1481
bundle) is accessed for the first time. A message is issued at each
1482
redirection to inform the user. In the past, http redirections were
1483
silently followed for each request which significantly degraded the
1484
performances. The http redirections are not followed anymore by
1485
default, instead a RedirectRequested exception is raised. For bzrlib
1486
users needing to follow http redirections anyway,
1487
``bzrlib.transport.do_catching_redirections`` provide an easy transition
1488
path. (vila)
1489
1490
INTERNALS:
1491
1492
* Added ``ReadLock.temporary_write_lock()`` to allow upgrading an OS read
1493
lock to an OS write lock. Linux can do this without unlocking, Win32
1494
needs to unlock in between. (John Arbash Meinel)
1495
1496
* New parameter ``recommend_upgrade`` to ``BzrDir.open_workingtree``
1497
to silence (when false) warnings about opening old formats.
1498
(Martin Pool)
1499
1500
* Fix minor performance regression with bzr-0.15 on pre-dirstate
1501
trees. (We were reading the working inventory too many times).
1502
(John Arbash Meinel)
1503
1504
* Remove ``Branch.get_transaction()`` in favour of a simple cache of
1505
``revision_history``. Branch subclasses should override
1506
``_gen_revision_history`` rather than ``revision_history`` to make use of
1507
this cache, and call ``_clear_revision_history_cache`` and
1508
``_cache_revision_history`` at appropriate times. (Andrew Bennetts)
1509
1510
BUGFIXES:
1511
1512
* Take ``smtp_server`` from user config into account.
1513
(vila, #92195)
1514
1515
* Restore Unicode filename handling for versioned and unversioned files.
1516
(John Arbash Meinel, #92608)
1517
1518
* Don't fail during ``bzr commit`` if a file is marked removed, and
1519
the containing directory is auto-removed. (John Arbash Meinel, #93681)
1520
1521
* ``bzr status FILENAME`` failed on Windows because of an uncommon
1522
errno. (``ERROR_DIRECTORY == 267 != ENOTDIR``).
1523
(Wouter van Heyst, John Arbash Meinel, #90819)
1524
1525
* ``bzr checkout source`` should create a local branch in the same
1526
format as source. (John Arbash Meinel, #93854)
1527
1528
* ``bzr commit`` with a kind change was failing to update the
1529
last-changed-revision for directories. The
1530
InventoryDirectory._unchanged only looked at the ``parent_id`` and name,
1531
ignoring the fact that the kind could have changed, too.
1532
(John Arbash Meinel, #90111)
1533
1534
* ``bzr mv dir/subdir other`` was incorrectly updating files inside
1535
the directory. So that there was a chance it would break commit,
1536
etc. (John Arbash Meinel, #94037)
1537
1538
* Correctly handles mutiple permanent http redirections.
1539
(vila, #88780)
1540
1541
bzr 0.15rc2 2007-03-14
1542
=======================
1543
1544
NOTES WHEN UPGRADING:
1545
1546
* Release 0.15rc2 of bzr changes the ``bzr init-repo`` command to
1547
default to ``--trees`` instead of ``--no-trees``.
1548
Existing shared repositories are not affected.
1549
1550
IMPROVEMENTS:
1551
1552
* New ``merge-directive`` command to generate machine- and human-readable
1553
merge requests. (Aaron Bentley)
1554
1555
* New ``submit:`` revision specifier makes it easy to diff against the
1556
common ancestor with the submit location (Aaron Bentley)
1557
1558
* Added support for Putty's SSH implementation. (Dmitry Vasiliev)
1559
1560
* Added ``bzr status --versioned`` to report only versioned files,
1561
not unknowns. (Kent Gibson)
1562
1563
* Merge now autodetects the correct line-ending style for its conflict
1564
markers. (Aaron Bentley)
1565
1566
INTERNALS:
1567
1568
* Refactored SSH vendor registration into SSHVendorManager class.
1569
(Dmitry Vasiliev)
1570
1571
BUGFIXES:
1572
1573
* New ``--numbered-dirs`` option to ``bzr selftest`` to use
1574
numbered dirs for TestCaseInTempDir. This is default behavior
1575
on Windows. Anyone can force named dirs on Windows
1576
with ``--no-numbered-dirs``. (Alexander Belchenko)
1577
1578
* Fix ``RevisionSpec_revid`` to handle the Unicode strings passed in
1579
from the command line. (Marien Zwart, #90501)
1580
1581
* Fix ``TreeTransform._iter_changes`` when both the source and
1582
destination are missing. (Aaron Bentley, #88842)
1583
1584
* Fix commit of merges with symlinks in dirstate trees.
1585
(Marien Zwart)
1586
1587
* Switch the ``bzr init-repo`` default from --no-trees to --trees.
1588
(Wouter van Heyst, #53483)
1589
1590
1591
bzr 0.15rc1 2007-03-07
1592
=======================
1593
1594
SURPRISES:
1595
1596
* The default disk format has changed. Please run 'bzr upgrade' in your
1597
working trees to upgrade. This new default is compatible for network
1598
operations, but not for local operations. That is, if you have two
1599
versions of bzr installed locally, after upgrading you can only use the
1600
bzr 0.15 version. This new default does not enable tags or nested-trees
1601
as they are incompatible with bzr versions before 0.15 over the network.
1602
1603
* For users of bzrlib: Two major changes have been made to the working tree
1604
api in bzrlib. The first is that many methods and attributes, including
1605
the inventory attribute, are no longer valid for use until one of
1606
``lock_read``/``lock_write``/``lock_tree_write`` has been called,
1607
and become invalid again after unlock is called. This has been done
1608
to improve performance and correctness as part of the dirstate
1609
development.
1610
(Robert Collins, John A Meinel, Martin Pool, and others).
1611
1612
* For users of bzrlib: The attribute 'tree.inventory' should be considered
1613
readonly. Previously it was possible to directly alter this attribute, or
1614
its contents, and have the tree notice this. This has been made
1615
unsupported - it may work in some tree formats, but in the newer dirstate
1616
format such actions will have no effect and will be ignored, or even
1617
cause assertions. All operations possible can still be carried out by a
1618
combination of the tree API, and the bzrlib.transform API. (Robert
1619
Collins, John A Meinel, Martin Pool, and others).
1620
1621
IMPROVEMENTS:
1622
1623
* Support for OS Windows 98. Also .bzr.log on any windows system
1624
saved in My Documents folder. (Alexander Belchenko)
1625
1626
* ``bzr mv`` enhanced to support already moved files.
1627
In the past the mv command would have failed if the source file doesn't
1628
exist. In this situation ``bzr mv`` would now detect that the file has
1629
already moved and update the repository accordingly, if the target file
1630
does exist.
1631
A new option ``--after`` has been added so that if two files already
1632
exist, you could notify Bazaar that you have moved a (versioned) file
1633
and replaced it with another. Thus in this case ``bzr move --after``
1634
will only update the Bazaar identifier.
1635
(Steffen Eichenberg, Marius Kruger)
1636
1637
* ``ls`` now works on treeless branches and remote branches.
1638
(Aaron Bentley)
1639
1640
* ``bzr help global-options`` describes the global options.
1641
(Aaron Bentley)
1642
1643
* ``bzr pull --overwrite`` will now correctly overwrite checkouts.
1644
(Robert Collins)
1645
1646
* Files are now allowed to change kind (e.g. from file to symlink).
1647
Supported by ``commit``, ``revert`` and ``status``
1648
(Aaron Bentley)
1649
1650
* ``inventory`` and ``unknowns`` hidden in favour of ``ls``
1651
(Aaron Bentley)
1652
1653
* ``bzr help checkouts`` descibes what checkouts are and some possible
1654
uses of them. (James Westby, Aaron Bentley)
1655
1656
* A new ``-d`` option to push, pull and merge overrides the default
1657
directory. (Martin Pool)
1658
1659
* Branch format 6: smaller, and potentially faster than format 5. Supports
1660
``append_history_only`` mode, where the log view and revnos do not change,
1661
except by being added to. Stores policy settings in
1662
".bzr/branch/branch.conf".
1663
1664
* ``append_only`` branches: Format 6 branches may be configured so that log
1665
view and revnos are always consistent. Either create the branch using
1666
"bzr init --append-revisions-only" or edit the config file as descriped
1667
in docs/configuration.txt.
1668
1669
* rebind: Format 6 branches retain the last-used bind location, so if you
1670
"bzr unbind", you can "bzr bind" to bind to the previously-selected
1671
bind location.
1672
1673
* Builtin tags support, created and deleted by the ``tag`` command and
1674
stored in the branch. Tags can be accessed with the revisionspec
1675
``-rtag:``, and listed with ``bzr tags``. Tags are not versioned
1676
at present. Tags require a network incompatible upgrade. To perform this
1677
upgrade, run ``bzr upgrade --dirstate-tags`` in your branch and
1678
repositories. (Martin Pool)
1679
1680
* The ``bzr://`` transport now has a well-known port number, 4155,
1681
which it will use by default. (Andrew Bennetts, Martin Pool)
1682
1683
* Bazaar now looks for user-installed plugins before looking for site-wide
1684
plugins. (Jonathan Lange)
1685
1686
* ``bzr resolve`` now detects and marks resolved text conflicts.
1687
(Aaron Bentley)
1688
1689
INTERNALS:
1690
1691
* Internally revision ids and file ids are now passed around as utf-8
1692
bytestrings, rather than treating them as Unicode strings. This has
1693
performance benefits for Knits, since we no longer need to decode the
1694
revision id for each line of content, nor for each entry in the index.
1695
This will also help with the future dirstate format.
1696
(John Arbash Meinel)
1697
1698
* Reserved ids (any revision-id ending in a colon) are rejected by
1699
versionedfiles, repositories, branches, and working trees
1700
(Aaron Bentley)
1701
1702
* Minor performance improvement by not creating a ProgressBar for
1703
every KnitIndex we create. (about 90ms for a bzr.dev tree)
1704
(John Arbash Meinel)
1705
1706
* New easier to use Branch hooks facility. There are five initial hooks,
1707
all documented in bzrlib.branch.BranchHooks.__init__ - ``'set_rh'``,
1708
``'post_push'``, ``'post_pull'``, ``'post_commit'``,
1709
``'post_uncommit'``. These hooks fire after the matching operation
1710
on a branch has taken place, and were originally added for the
1711
branchrss plugin. (Robert Collins)
1712
1713
* New method ``Branch.push()`` which should be used when pushing from a
1714
branch as it makes performance and policy decisions to match the UI
1715
level command ``push``. (Robert Collins).
1716
1717
* Add a new method ``Tree.revision_tree`` which allows access to cached
1718
trees for arbitrary revisions. This allows the in development dirstate
1719
tree format to provide access to the callers to cached copies of
1720
inventory data which are cheaper to access than inventories from the
1721
repository.
1722
(Robert Collins, Martin Pool)
1723
1724
* New ``Branch.last_revision_info`` method, this is being done to allow
1725
optimization of requests for both the number of revisions and the last
1726
revision of a branch with smartservers and potentially future branch
1727
formats. (Wouter van Heyst, Robert Collins)
1728
1729
* Allow ``'import bzrlib.plugins.NAME'`` to work when the plugin NAME has not
1730
yet been loaded by ``load_plugins()``. This allows plugins to depend on each
1731
other for code reuse without requiring users to perform file-renaming
1732
gymnastics. (Robert Collins)
1733
1734
* New Repository method ``'gather_stats'`` for statistic data collection.
1735
This is expected to grow to cover a number of related uses mainly
1736
related to bzr info. (Robert Collins)
1737
1738
* Log formatters are now managed with a registry.
1739
``log.register_formatter`` continues to work, but callers accessing
1740
the FORMATTERS dictionary directly will not.
1741
1742
* Allow a start message to be passed to the ``edit_commit_message``
1743
function. This will be placed in the message offered to the user
1744
for editing above the separator. It allows a template commit message
1745
to be used more easily. (James Westby)
1746
1747
* ``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
1748
you pass a Unicode string rather than an 8-bit string. Callers need
1749
to be updated to encode first. (John Arbash Meinel)
1750
1751
* Branch.push, pull, merge now return Result objects with information
1752
about what happened, rather than a scattering of various methods. These
1753
are also passed to the post hooks. (Martin Pool)
1754
1755
* File formats and architecture is in place for managing a forest of trees
1756
in bzr, and splitting up existing trees into smaller subtrees, and
1757
finally joining trees to make a larger tree. This is the first iteration
1758
of this support, and the user-facing aspects still require substantial
1759
work. If you wish to experiment with it, use ``bzr upgrade
1760
--dirstate-with-subtree`` in your working trees and repositories.
1761
You can use the hidden commands ``split`` and ``join`` and to create
1762
and manipulate nested trees, but please consider using the nested-trees
1763
branch, which contains substantial UI improvements, instead.
1764
http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/
1765
(Aaron Bentley, Martin Pool, Robert Collins).
1766
1767
BUGFIXES:
1768
1769
* ``bzr annotate`` now uses dotted revnos from the viewpoint of the
1770
branch, rather than the last changed revision of the file.
1771
(John Arbash Meinel, #82158)
1772
1773
* Lock operations no longer hang if they encounter a permission problem.
1774
(Aaron Bentley)
1775
1776
* ``bzr push`` can resume a push that was canceled before it finished.
1777
Also, it can push even if the target directory exists if you supply
1778
the ``--use-existing-dir`` flag.
1779
(John Arbash Meinel, #30576, #45504)
1780
1781
* Fix http proxy authentication when user and an optional
1782
password appears in the ``*_proxy`` vars. (Vincent Ladeuil,
1783
#83954).
1784
1785
* ``bzr log branch/file`` works for local treeless branches
1786
(Aaron Bentley, #84247)
1787
1788
* Fix problem with UNC paths on Windows 98. (Alexander Belchenko, #84728)
1789
1790
* Searching location of CA bundle for PyCurl in env variable
1791
(``CURL_CA_BUNDLE``), and on win32 along the PATH.
1792
(Alexander Belchenko, #82086)
1793
1794
* ``bzr init`` works with unicode argument LOCATION.
1795
(Alexander Belchenko, #85599)
1796
1797
* Raise ``DependencyNotPresent`` if pycurl do not support https.
1798
(Vincent Ladeuil, #85305)
1799
1800
* Invalid proxy env variables should not cause a traceback.
1801
(Vincent Ladeuil, #87765)
1802
1803
* Ignore patterns normalised to use '/' path separator.
1804
(Kent Gibson, #86451)
1805
1806
* bzr rocks. It sure does! Fix case. (Vincent Ladeuil, #78026)
1807
1808
* Fix bzrtools shelve command for removed lines beginning with "--"
1809
(Johan Dahlberg, #75577)
1810
1811
TESTING:
1812
1813
* New ``--first`` option to ``bzr selftest`` to run specified tests
1814
before the rest of the suite. (Martin Pool)
1815
1816
1817
bzr 0.14 2007-01-23
1818
====================
1819
1820
IMPROVEMENTS:
1821
1822
* ``bzr help global-options`` describes the global options. (Aaron Bentley)
1823
1824
BUG FIXES:
1825
1826
* Skip documentation generation tests if the tools to do so are not
1827
available. Fixes running selftest for installled copies of bzr.
1828
(John Arbash Meinel, #80330)
1829
1830
* Fix the code that discovers whether bzr is being run from it's
1831
working tree to handle the case when it isn't but the directory
1832
it is in is below a repository. (James Westby, #77306)
1833
1834
1835
bzr 0.14rc1 2007-01-16
1836
=======================
1837
1838
IMPROVEMENTS:
1839
1840
* New connection: ``bzr+http://`` which supports tunnelling the smart
1841
protocol over an HTTP connection. If writing is enabled on the bzr
1842
server, then you can write over the http connection.
1843
(Andrew Bennetts, John Arbash Meinel)
1844
1845
* Aliases now support quotation marks, so they can contain whitespace
1846
(Marius Kruger)
1847
1848
* PyCurlTransport now use a single curl object. By specifying explicitly
1849
the 'Range' header, we avoid the need to use two different curl objects
1850
(and two connections to the same server). (Vincent Ladeuil)
1851
1852
* ``bzr commit`` does not prompt for a message until it is very likely to
1853
succeed. (Aaron Bentley)
1854
1855
* ``bzr conflicts`` now takes --text to list pathnames of text conflicts
1856
(Aaron Bentley)
1857
1858
* Fix ``iter_lines_added_or_present_in_versions`` to use a set instead
1859
of a list while checking if a revision id was requested. Takes 10s
1860
off of the ``fileids_affected_by_revision_ids`` time, which is 10s
1861
of the ``bzr branch`` time. Also improve ``fileids_...`` time by
1862
filtering lines with a regex rather than multiple ``str.find()``
1863
calls. (saves another 300ms) (John Arbash Meinel)
1864
1865
* Policy can be set for each configuration key. This allows keys to be
1866
inherited properly across configuration entries. For example, this
1867
should enable you to do::
1868
1869
[/home/user/project]
1870
push_location = sftp://host/srv/project/
1871
push_location:policy = appendpath
1872
1873
And then a branch like ``/home/user/project/mybranch`` should get an
1874
automatic push location of ``sftp://host/srv/project/mybranch``.
1875
(James Henstridge)
1876
1877
* Added ``bzr status --short`` to make status report svn style flags
1878
for each file. For example::
1879
1880
$ bzr status --short
1881
A foo
1882
A bar
1883
D baz
1884
? wooley
1885
1886
* 'bzr selftest --clean-output' allows easily clean temporary tests
1887
directories without running tests. (Alexander Belchenko)
1888
1889
* ``bzr help hidden-commands`` lists all hidden commands. (Aaron Bentley)
1890
1891
* ``bzr merge`` now has an option ``--pull`` to fall back to pull if
1892
local is fully merged into remote. (Jan Hudec)
1893
1894
* ``bzr help formats`` describes available directory formats. (Aaron Bentley)
1895
1896
INTERNALS:
1897
1898
* A few tweaks directly to ``fileids_affected_by_revision_ids`` to
1899
help speed up processing, as well allowing to extract unannotated
1900
lines. Between the two ``fileids_affected_by_revision_ids`` is
1901
improved by approx 10%. (John Arbash Meinel)
1902
1903
* Change Revision serialization to only write out millisecond
1904
resolution. Rather than expecting floating point serialization to
1905
preserve more resolution than we need. (Henri Weichers, Martin Pool)
1906
1907
* Test suite ends cleanly on Windows. (Vincent Ladeuil)
1908
1909
* When ``encoding_type`` attribute of class Command is equal to 'exact',
1910
force sys.stdout to be a binary stream on Windows, and therefore
1911
keep exact line-endings (without LF -> CRLF conversion).
1912
(Alexander Belchenko)
1913
1914
* Single-letter short options are no longer globally declared. (Martin
1915
Pool)
1916
1917
* Before using detected user/terminal encoding bzr should check
1918
that Python has corresponding codec. (Alexander Belchenko)
1919
1920
* Formats for end-user selection are provided via a FormatRegistry (Aaron Bentley)
1921
1922
BUG FIXES:
1923
1924
* ``bzr missing --verbose`` was showing adds/removals in the wrong
1925
direction. (John Arbash Meinel)
1926
1927
* ``bzr annotate`` now defaults to showing dotted revnos for merged
1928
revisions. It cuts them off at a depth of 12 characters, but you can
1929
supply ``--long`` to see the full number. You can also use
1930
``--show-ids`` to display the original revision ids, rather than
1931
revision numbers and committer names. (John Arbash Meinel, #75637)
1932
1933
* bzr now supports Win32 UNC path (e.g. ``\HOST\path``.
1934
(Alexander Belchenko, #57869)
1935
1936
* Win32-specific: output of cat, bundle and diff commands don't mangle
1937
line-endings (Alexander Belchenko, #55276)
1938
1939
* Replace broken fnmatch based ignore pattern matching with custom pattern
1940
matcher.
1941
(Kent Gibson, Jan Hudec #57637)
1942
1943
* pycurl and urllib can detect short reads at different places. Update
1944
the test suite to test more cases. Also detect http error code 416
1945
which was raised for that specific bug. Also enhance the urllib
1946
robustness by detecting invalid ranges (and pycurl's one by detecting
1947
short reads during the initial GET). (Vincent Ladeuil, #73948)
1948
1949
* The urllib connection sharing interacts badly with urllib2
1950
proxy setting (the connections didn't go thru the proxy
1951
anymore). Defining a proper ProxyHandler solves the
1952
problem. (Vincent Ladeuil, #74759)
1953
1954
* Use urlutils to generate relative URLs, not osutils
1955
(Aaron Bentley, #76229)
1956
1957
* ``bzr status`` in a readonly directory should work without giving
1958
lots of errors. (John Arbash Meinel, #76299)
1959
1960
* Mention the revisionspec topic for the revision option help.
1961
(Wouter van Heyst, #31663)
1962
1963
* Allow plugins import from zip archives.
1964
(Alexander Belchenko, #68124)
1965
1966
1967
bzr 0.13 2006-12-05
1968
====================
1969
1970
No changes from 0.13rc1
1971
1972
bzr 0.13rc1 2006-11-27
1973
=======================
1974
1975
IMPROVEMENTS:
1976
1977
* New command ``bzr remove-tree`` allows the removal of the working
1978
tree from a branch.
1979
(Daniel Silverstone)
1980
1981
* urllib uses shared keep-alive connections, so http
1982
operations are substantially faster.
1983
(Vincent Ladeuil, #53654)
1984
1985
* ``bzr export`` allows an optional branch parameter, to export a bzr
1986
tree from some other url. For example:
1987
``bzr export bzr.tar.gz http://bazaar-vcs.org/bzr/bzr.dev``
1988
(Daniel Silverstone)
1989
1990
* Added ``bzr help topics`` to the bzr help system. This gives a
1991
location for general information, outside of a specific command.
1992
This includes updates for ``bzr help revisionspec`` the first topic
1993
included. (Goffredo Baroncelli, John Arbash Meinel, #42714)
1994
1995
* WSGI-compatible HTTP smart server. See ``doc/http_smart_server.txt``.
1996
(Andrew Bennetts)
1997
1998
* Knit files will now cache full texts only when the size of the
1999
deltas is as large as the size of the fulltext. (Or after 200
2000
deltas, whichever comes first). This has the most benefit on large
2001
files with small changes, such as the inventory for a large project.
2002
(eg For a project with 2500 files, and 7500 revisions, it changes
2003
the size of inventory.knit from 11MB to 5.4MB) (John Arbash Meinel)
2004
2005
INTERNALS:
2006
2007
* New -D option given before the command line turns on debugging output
2008
for particular areas. -Derror shows tracebacks on all errors.
2009
(Martin Pool)
2010
2011
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
2012
and remove benchmarks that take longer than 10min to run.
2013
(John Arbash Meinel)
2014
2015
* Use ``time.time()`` instead of ``time.clock()`` to decide on
2016
progress throttling. Because ``time.clock()`` is actually CPU time,
2017
so over a high-latency connection, too many updates get throttled.
2018
(John Arbash Meinel)
2019
2020
* ``MemoryTransport.list_dir()`` would strip the first character for
2021
files or directories in root directory. (John Arbash Meinel)
2022
2023
* New method ``get_branch_reference`` on 'BzrDir' allows the detection of
2024
branch references - which the smart server component needs.
2025
2026
* New ``ChrootTransportDecorator``, accessible via the ``chroot+`` url
2027
prefix. It disallows any access to locations above a set URL. (Andrew
2028
Bennetts)
2029
2030
BUG FIXES:
2031
2032
* Now ``_KnitIndex`` properly decode revision ids when loading index data.
2033
And optimize the knit index parsing code.
2034
(Dmitry Vasiliev, John Arbash Meinel)
2035
2036
* ``bzrlib/bzrdir.py`` was directly referencing ``bzrlib.workingtree``,
2037
without importing it. This prevented ``bzr upgrade`` from working
2038
unless a plugin already imported ``bzrlib.workingtree``
2039
(John Arbash Meinel, #70716)
2040
2041
* Suppress the traceback on invalid URLs (Vincent Ladeuil, #70803).
2042
2043
* Give nicer error message when an http server returns a 403
2044
error code. (Vincent Ladeuil, #57644).
2045
2046
* When a multi-range http GET request fails, try a single
2047
range one. If it fails too, forget about ranges. Remember that until
2048
the death of the transport and propagates that to the clones.
2049
(Vincent Ladeuil, #62276, #62029).
2050
2051
* Handles user/passwords supplied in url from command
2052
line (for the urllib implementation). Don't request already
2053
known passwords (Vincent Ladeuil, #42383, #44647, #48527)
2054
2055
* ``_KnitIndex.add_versions()`` dictionary compresses revision ids as they
2056
are added. This fixes bug where fetching remote revisions records
2057
them as full references rather than integers.
2058
(John Arbash Meinel, #64789)
2059
2060
* ``bzr ignore`` strips trailing slashes in patterns.
2061
Also ``bzr ignore`` rejects absolute paths. (Kent Gibson, #4559)
2062
2063
* ``bzr ignore`` takes multiple arguments. (Cheuksan Edward Wang, #29488)
2064
2065
* mv correctly handles paths that traverse symlinks.
2066
(Aaron Bentley, #66964)
2067
2068
* Give nicer looking error messages when failing to connect over ssh.
2069
(John Arbash Meinel, #49172)
2070
2071
* Pushing to a remote branch does not currently update the remote working
2072
tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
2073
machine now show that the working tree is out of date.
2074
(Cheuksan Edward Wang #48136)
2075
2076
* Use patiencediff instead of difflib for determining deltas to insert
2077
into knits. This avoids the O(N^3) behavior of difflib. Patience
2078
diff should be O(N^2). (Cheuksan Edward Wang, #65714)
2079
2080
* Running ``bzr log`` on nonexistent file gives an error instead of the
2081
entire log history. (Cheuksan Edward Wang #50793)
2082
2083
* ``bzr cat`` can look up contents of removed or renamed files. If the
2084
pathname is ambiguous, i.e. the files in the old and new trees have
2085
different id's, the default is the file in the new tree. The user can
2086
use "--name-from-revision" to select the file in the old tree.
2087
(Cheuksan Edward Wang, #30190)
2088
2089
TESTING:
2090
2091
* TestingHTTPRequestHandler really handles the Range header
2092
(previously it was ignoring it and returning the whole file,).
2093
2094
bzr 0.12 2006-10-30
2095
====================
2096
2097
INTERNALS:
2098
2099
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
2100
and remove benchmarks that take longer than 10min to run.
2101
(John Arbash Meinel)
2102
2103
bzr 0.12rc1 2006-10-23
2104
=======================
2105
2106
IMPROVEMENTS:
2107
2108
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
2109
rather than just showing a decimal revision number for revisions on the
2110
mainline. These revision numbers are not yet accepted as input into bzr
2111
commands such as log, diff etc. (Robert Collins)
2112
2113
* revisions can now be specified using dotted-decimal revision numbers.
2114
For instance, ``bzr diff -r 1.2.1..1.2.3``. (Robert Collins)
2115
2116
* ``bzr help commands`` output is now shorter (Aaron Bentley)
2117
2118
* ``bzr`` now uses lazy importing to reduce the startup time. This has
2119
a moderate effect on lots of actions, especially ones that have
2120
little to do. For example ``bzr rocks`` time is down to 116ms from
2121
283ms. (John Arbash Meinel)
2122
2123
* New Registry class to provide name-to-object registry-like support,
2124
for example for schemes where plugins can register new classes to
2125
do certain tasks (e.g. log formatters). Also provides lazy registration
2126
to allow modules to be loaded on request.
2127
(John Arbash Meinel, Adeodato Simó)
2128
2129
API INCOMPATABILITY:
2130
2131
* LogFormatter subclasses show now expect the 'revno' parameter to
2132
show() to be a string rather than an int. (Robert Collins)
2133
2134
INTERNALS:
2135
2136
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
2137
can take a ``working_dir='foo'`` parameter, which will change directory
2138
for the command. (John Arbash Meinel)
2139
2140
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
2141
around a regex, which defers compilation until first use.
2142
(John Arbash Meinel)
2143
2144
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
2145
``--no-plugins`` parameter to ensure test reproducability, and avoid
2146
problems with system-wide installed plugins. (John Arbash Meinel)
2147
2148
* Unique tree root ids are now supported. Newly created trees still
2149
use the common root id for compatibility with bzr versions before 0.12.
2150
(Aaron Bentley)
2151
2152
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
2153
pass in ``inventory.ROOT_ID`` if you want the default root id value.
2154
(Robert Collins, John Arbash Meinel)
2155
2156
* New method ``WorkingTree.flush()`` which will write the current memory
2157
inventory out to disk. At the same time, ``read_working_inventory`` will
2158
no longer trash the current tree inventory if it has been modified within
2159
the current lock, and the tree will now ``flush()`` automatically on
2160
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
2161
advantage of this functionality. (Robert Collins, John Arbash Meinel)
2162
2163
* ``bzrlib.tsort.merge_sorted`` now accepts ``generate_revnos``. This
2164
parameter will cause it to add another column to its output, which
2165
contains the dotted-decimal revno for each revision, as a tuple.
2166
(Robert Collins)
2167
2168
* ``LogFormatter.show_merge`` is deprecated in favour of
2169
``LogFormatter.show_merge_revno``. (Robert Collins)
2170
2171
BUG FIXES:
2172
2173
* Avoid circular imports by creating a deprecated function for
2174
``bzrlib.tree.RevisionTree``. Callers should have been using
2175
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel,
2176
#63360, #66349)
2177
2178
* Don't use ``socket.MSG_WAITALL`` as it doesn't exist on all
2179
platforms. (Martin Pool, #66356)
2180
2181
* Don't require ``Content-Type`` in range responses. Assume they are a
2182
single range if ``Content-Type`` does not exist.
2183
(John Arbash Meinel, #62473)
2184
2185
* bzr branch/pull no longer complain about progress bar cleanup when
2186
interrupted during fetch. (Aaron Bentley, #54000)
2187
2188
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
2189
the basis inventory, rather than going through the repository. This
2190
allows us to have 1 inventory read, and 2 inventory writes when
2191
committing a new tree. (John Arbash Meinel)
2192
2193
* When reverting, files that are not locally modified that do not exist
2194
in the target are deleted, not just unversioned (Aaron Bentley)
2195
2196
* When trying to acquire a lock, don't fail immediately. Instead, try
2197
a few times (up to 1 hour) before timing out. Also, report why the
2198
lock is unavailable (John Arbash Meinel, #43521, #49556)
2199
2200
* Leave HttpTransportBase daughter classes decides how they
2201
implement cloning. (Vincent Ladeuil, #61606)
2202
2203
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
2204
2205
* If a commit fails, the commit message is stored in a file at the root of
2206
the tree for later commit. (Cheuksan Edward Wang, Stefan Metzmacher,
2207
#32054)
2208
2209
TESTING:
2210
2211
* New test base class TestCaseWithMemoryTransport offers memory-only
2212
testing facilities: its not suitable for tests that need to mutate disk
2213
state, but most tests should not need that and should be converted to
2214
TestCaseWithMemoryTransport. (Robert Collins)
2215
2216
* ``TestCase.make_branch_and_memory_tree`` now takes a format
2217
option to set the BzrDir, Repository and Branch formats of the
2218
created objects. (Robert Collins, John Arbash Meinel)
2219
2220
bzr 0.11 2006-10-02
2221
====================
2222
2223
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
2224
2225
bzr 0.11rc2 2006-09-27
2226
=======================
2227
2228
BUG FIXES:
2229
2230
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
2231
2232
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
2233
Arbash Meinel).
2234
2235
bzr 0.11rc1 2006-09-25
2236
=======================
2237
2238
IMPROVEMENTS:
2239
2240
* Knit files now wait to create their contents until the first data is
2241
added. The old code used to create an empty .knit and a .kndx with just
2242
the header. However, this caused a lot of extra round trips over sftp.
2243
This can change the time for ``bzr push`` to create a new remote branch
2244
from 160s down to 100s. This also affects ``bzr commit`` performance when
2245
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
2246
down to 40s (John Arbash Meinel, #44692)
2247
2248
* When an entire subtree has been deleted, commit will now report that
2249
just the top of the subtree has been deleted, rather than reporting
2250
all the individual items. (Robert Collins)
2251
2252
* Commit performs one less XML parse. (Robert Collins)
2253
2254
* ``bzr checkout`` now operates on readonly branches as well
2255
as readwrite branches. This fixes bug #39542. (Robert Collins)
2256
2257
* ``bzr bind`` no longer synchronises history with the master branch.
2258
Binding should be followed by an update or push to synchronise the
2259
two branches. This is closely related to the fix for bug #39542.
2260
(Robert Collins)
2261
2262
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
2263
objects. This allows all imports to stay at the global scope, but
2264
modules will not actually be imported if they are not used.
2265
(John Arbash Meinel)
2266
2267
* Support ``bzr://`` and ``bzr+ssh://`` urls to work with the new RPC-based
2268
transport which will be used with the upcoming high-performance smart
2269
server. The new command ``bzr serve`` will invoke bzr in server mode,
2270
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
2271
Pool)
2272
2273
* New command ``bzr version-info`` which can be used to get a summary
2274
of the current state of the tree. This is especially useful as part
2275
of a build commands. See ``doc/version_info.txt`` for more information
2276
(John Arbash Meinel)
2277
2278
BUG FIXES:
2279
2280
* ``'bzr inventory [FILE...]'`` allows restricting the file list to a
2281
specific set of files. (John Arbash Meinel, #3631)
2282
2283
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
2284
2285
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
2286
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
2287
reading a nested Stanza. (John Arbash Meinel)
2288
2289
* Transform._set_mode() needs to stat the right file.
2290
(John Arbash Meinel, #56549)
2291
2292
* Raise WeaveFormatError rather than StopIteration when trying to read
2293
an empty Weave file. (John Arbash Meinel, #46871)
2294
2295
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
2296
(Vincent Ladeuil, #59835)
2297
2298
* Handle boundary="" lines properly to allow access through a Squid proxy.
2299
(John Arbash Meinel, #57723)
2300
2301
* revert now removes newly-added directories (Aaron Bentley, #54172)
2302
2303
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
2304
isn't a working tree. (David Allouche, #40679)
2305
2306
* Give nicer error messages when a user supplies an invalid --revision
2307
parameter. (John Arbash Meinel, #55420)
2308
2309
* Handle when LANG is not recognized by python. Emit a warning, but
2310
just revert to using 'ascii'. (John Arbash Meinel, #35392)
2311
2312
* Don't use ``preexec_fn`` on win32, as it is not supported by subprocess.
2313
(John Arbash Meinel)
2314
2315
* Skip specific tests when the dependencies aren't met. This includes
2316
some ``setup.py`` tests when ``python-dev`` is not available, and
2317
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
2318
2319
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
2320
the system. (Andrew Bennetts, John Arbash Meinel)
2321
2322
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
2323
other branch, and will not push or pull between the two branches.
2324
API users will need to perform a push or pull or update operation if they
2325
require branch synchronisation to take place. (Robert Collins, #47344)
2326
2327
* When creating a tarball or zipfile export, export unicode names as utf-8
2328
paths. This may not work perfectly on all platforms, but has the best
2329
chance of working in the common case. (John Arbash Meinel, #56816)
2330
2331
* When committing, only files that exist in working tree or basis tree
2332
may be specified (Aaron Bentley, #50793)
2333
2334
PORTABILITY:
2335
2336
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
2337
2338
INTERNALS:
2339
2340
* TestCaseInTempDir now creates a separate directory for HOME, rather
2341
than having HOME set to the same location as the working directory.
2342
(John Arbash Meinel)
2343
2344
* ``run_bzr_subprocess()`` can take an optional ``env_changes={}`` parameter,
2345
which will update os.environ inside the spawned child. It also can
2346
take a ``universal_newlines=True``, which helps when checking the output
2347
of the command. (John Arbash Meinel)
2348
2349
* Refactor SFTP vendors to allow easier re-use when ssh is used.
2350
(Andrew Bennetts)
2351
2352
* ``Transport.list_dir()`` and ``Transport.iter_files_recursive()`` should always
2353
return urlescaped paths. This is now tested (there were bugs in a few
2354
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
2355
2356
* New utility function ``symbol_versioning.deprecation_string``. Returns the
2357
formatted string for a callable, deprecation format pair. (Robert Collins)
2358
2359
* New TestCase helper applyDeprecated. This allows you to call a callable
2360
which is deprecated without it spewing to the screen, just by supplying
2361
the deprecation format string issued for it. (Robert Collins)
2362
2363
* Transport.append and Transport.put have been deprecated in favor of
2364
``.append_bytes``, ``.append_file``, ``.put_bytes``, and
2365
``.put_file``. This removes the ambiguity in what type of object the
2366
functions take. ``Transport.non_atomic_put_{bytes,file}`` has also
2367
been added. Which works similarly to ``Transport.append()`` except for
2368
SFTP, it doesn't have a round trip when opening the file. Also, it
2369
provides functionality for creating a parent directory when trying
2370
to create a file, rather than raise NoSuchFile and forcing the
2371
caller to repeat their request.
2372
(John Arbash Meinel)
2373
2374
* WorkingTree has a new api ``unversion`` which allow the unversioning of
2375
entries by their file id. (Robert Collins)
2376
2377
* ``WorkingTree.pending_merges`` is deprecated. Please use the
2378
``get_parent_ids`` (introduced in 0.10) method instead. (Robert Collins)
2379
2380
* WorkingTree has a new ``lock_tree_write`` method which locks the branch for
2381
read rather than write. This is appropriate for actions which only need
2382
the branch data for reference rather than mutation. A new decorator
2383
``needs_tree_write_lock`` is provided in the workingtree module. Like the
2384
``needs_read_lock`` and ``needs_write_lock`` decorators this allows static
2385
declaration of the locking requirements of a function to ensure that
2386
a lock is taken out for casual scripts. (Robert Collins, #54107)
2387
2388
* All WorkingTree methods which write to the tree, but not to the branch
2389
have been converted to use ``needs_tree_write_lock`` rather than
2390
``needs_write_lock``. Also converted is the revert, conflicts and tree
2391
transform modules. This provides a modest performance improvement on
2392
metadir style trees, due to the reduce lock-acquisition, and a more
2393
significant performance improvement on lightweight checkouts from
2394
remote branches, where trivial operations used to pay a significant
2395
penalty. It also provides the basis for allowing readonly checkouts.
2396
(Robert Collins)
2397
2398
* Special case importing the standard library 'copy' module. This shaves
2399
off 40ms of startup time, while retaining compatibility. See:
2400
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
2401
2402
* WorkingTree has a new parent class MutableTree which represents the
2403
specialisations of Tree which are able to be altered. (Robert Collins)
2404
2405
* New methods mkdir and ``put_file_bytes_non_atomic`` on MutableTree that
2406
mutate the tree and its contents. (Robert Collins)
2407
2408
* Transport behaviour at the root of the URL is now defined and tested.
2409
(Andrew Bennetts, Robert Collins)
2410
2411
TESTING:
2412
2413
* New test helper classs MemoryTree. This is typically accessed via
2414
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
2415
2416
* Add ``start_bzr_subprocess`` and ``stop_bzr_subprocess`` to allow test
2417
code to continue running concurrently with a subprocess of bzr.
2418
(Andrew Bennetts, Robert Collins)
2419
2420
* Add a new method ``Transport.get_smart_client()``. This is provided to
2421
allow upgrades to a richer interface than the VFS one provided by
2422
Transport. (Andrew Bennetts, Martin Pool)
2423
2424
bzr 0.10 2006-08-29
2425
====================
2426
2427
IMPROVEMENTS:
2428
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
2429
tree. (Aaron Bentley)
2430
2431
* 'bzr add --file-ids-from' can be used to specify another path to use
2432
for creating file ids, rather than generating all new ones. Internally,
2433
the 'action' passed to ``smart_add_tree()`` can return ``file_ids`` that
2434
will be used, rather than having bzrlib generate new ones.
2435
(John Arbash Meinel, #55781)
2436
2437
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
2438
This will cache some of the intermediate trees, and decrease the
2439
setup time for benchmark tests. (John Arbash Meinel)
2440
2441
* Inverse forms are provided for all boolean options. For example,
2442
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
2443
2444
* Serialize out Inventories directly, rather than using ElementTree.
2445
Writing out a kernel sized inventory drops from 2s down to ~350ms.
2446
(Robert Collins, John Arbash Meinel)
2447
2448
BUG FIXES:
2449
2450
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
2451
2452
* Change LockDir so that if the lock directory doesn't exist when
2453
``lock_write()`` is called, an attempt will be made to create it.
2454
(John Arbash Meinel, #56974)
2455
2456
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
2457
2458
* Active FTP transport now works as intended. (ghozzy, #56472)
2459
2460
* Really fix mutter() so that it won't ever raise a UnicodeError.
2461
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
2462
But it is a debugging log, not a real user file.
2463
(John Arbash Meinel, #56947, #53880)
2464
2465
* Change Command handle to allow Unicode command and options.
2466
At present we cannot register Unicode command names, so we will get
2467
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
2468
But that is better than a UnicodeError + a traceback.
2469
(John Arbash Meinel, #57123)
2470
2471
* Handle TZ=UTC properly when reading/writing revisions.
2472
(John Arbash Meinel, #55783, #56290)
2473
2474
* Use ``GPG_TTY`` to allow gpg --cl to work with gpg-agent in a pipeline,
2475
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
2476
2477
* External diff does the right thing for binaries even in foreign
2478
languages. (John Arbash Meinel, #56307)
2479
2480
* Testament handles more cases when content is unicode. Specific bug was
2481
in handling of revision properties.
2482
(John Arbash Meinel, Holger Krekel, #54723)
2483
2484
* The bzr selftest was failing on installed versions due to a bug in a new
2485
test helper. (John Arbash Meinel, Robert Collins, #58057)
2486
2487
INTERNALS:
2488
2489
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
2490
which can be used to cache the conversion between utf8 and Unicode.
2491
Especially helpful for some of the knit annotation code, which has to
2492
convert revision ids to utf8 to annotate lines in storage.
2493
(John Arbash Meinel)
2494
2495
* ``setup.py`` now searches the filesystem to find all packages which
2496
need to be installed. This should help make the life of packagers
2497
easier. (John Arbash Meinel)
2498
2499
bzr 0.9.0 2006-08-11
2500
=====================
2501
2502
SURPRISES:
2503
2504
* The hard-coded built-in ignore rules have been removed. There are
2505
now two rulesets which are enforced. A user global one in
2506
``~/.bazaar/ignore`` which will apply to every tree, and the tree
2507
specific one '.bzrignore'.
2508
``~/.bazaar/ignore`` will be created if it does not exist, but with
2509
a more conservative list than the old default.
2510
This fixes bugs with default rules being enforced no matter what.
2511
The old list of ignore rules from bzr is available by
2512
running 'bzr ignore --old-default-rules'.
2513
(Robert Collins, Martin Pool, John Arbash Meinel)
2514
2515
* 'branches.conf' has been changed to 'locations.conf', since it can apply
2516
to more locations than just branch locations.
2517
(Aaron Bentley)
2518
2519
IMPROVEMENTS:
2520
2521
* The revision specifier "revno:" is extended to accept the syntax
2522
revno:N:branch. For example,
2523
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
2524
bzr.dev. (Matthieu Moy)
2525
2526
* Tests updates to ensure proper URL handling, UNICODE support, and
2527
proper printing when the user's terminal encoding cannot display
2528
the path of a file that has been versioned.
2529
``bzr branch`` can take a target URL rather than only a local directory.
2530
``Branch.get_parent()/set_parent()`` now save a relative path if possible,
2531
and normalize the parent based on root, allowing access across
2532
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
2533
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
2534
#42517, #42514)
2535
2536
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
2537
Use terminal width for single-line logs from ``bzr log --line`` and
2538
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
2539
(Malone #3507)
2540
2541
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
2542
(Alexander Belchenko)
2543
2544
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
2545
2546
* Show the correct number of revisions pushed when pushing a new branch.
2547
(Robert Collins).
2548
2549
* 'bzr selftest' now shows a progress bar with the number of tests, and
2550
progress made. 'make check' shows tests in -v mode, to be more useful
2551
for the PQM status window. (Robert Collins).
2552
When using a progress bar, failed tests are printed out, rather than
2553
being overwritten by the progress bar until the suite finishes.
2554
(John Arbash Meinel)
2555
2556
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
2557
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2558
profile data for the individual profiled calls, allowing for fine
2559
grained analysis of performance.
2560
(Robert Collins, Martin Pool).
2561
2562
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
2563
where commit can take an appreciable time. (Robert Collins)
2564
2565
* 'bzr add' is now less verbose in telling you what ignore globs were
2566
matched by files being ignored. Instead it just tells you how many
2567
were ignored (because you might reasonably be expecting none to be
2568
ignored). 'bzr add -v' is unchanged and will report every ignored
2569
file. (Robert Collins).
2570
2571
* ftp now has a test server if medusa is installed. As part of testing,
2572
ftp support has been improved, including support for supplying a
2573
non-standard port. (John Arbash Meinel).
2574
2575
* 'bzr log --line' shows the revision number, and uses only the
2576
first line of the log message (#5162, Alexander Belchenko;
2577
Matthieu Moy)
2578
2579
* 'bzr status' has had the --all option removed. The 'bzr ls' command
2580
should be used to retrieve all versioned files. (Robert Collins)
2581
2582
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
2583
over email, and applied on the other end, while maintaining ancestry.
2584
This bundle can be applied with either 'bzr merge' or 'bzr pull',
2585
the same way you would apply another branch.
2586
(John Arbash Meinel, Aaron Bentley)
2587
2588
* 'bzr whoami' can now be used to set your identity from the command line,
2589
for a branch or globally. (Robey Pointer)
2590
2591
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
2592
(Michael Ellerman)
2593
2594
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
2595
(Aaron Bentley)
2596
2597
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
2598
Also updates things like 'http+pycurl://' if pycurl is not present.
2599
(John Arbash Meinel) (Malone #47821, #52204)
2600
2601
* New env variable ``BZR_PROGRESS_BAR``, sets the default progress bar type.
2602
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
2603
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
2604
2605
* Improve the help text for 'bzr diff' to explain what various options do.
2606
(John Arbash Meinel, #6391)
2607
2608
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
2609
revision 10. This makes -r10 more in line with what other commands do.
2610
'bzr uncommit' also now saves the pending merges of the revisions that
2611
were removed. So it is safe to uncommit after a merge, fix something,
2612
and commit again. (John Arbash Meinel, #32526, #31426)
2613
2614
* 'bzr init' now also works on remote locations.
2615
(Wouter van Heyst, #48904)
2616
2617
* HTTP support has been updated. When using pycurl we now support
2618
connection keep-alive, which reduces dns requests and round trips.
2619
And for both urllib and pycurl we support multi-range requests,
2620
which decreases the number of round-trips. Performance results for
2621
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
2622
http branching is now 2-3x faster, and ``bzr pull`` in an existing
2623
branch is as much as 4x faster.
2624
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
2625
2626
* Performance improvements for sftp. Branching and pulling are now up to
2627
2x faster. Utilize paramiko.readv() support for async requests if it
2628
is available (paramiko > 1.6) (John Arbash Meinel)
2629
2630
BUG FIXES:
2631
2632
* Fix shadowed definition of TestLocationConfig that caused some
2633
tests not to run.
2634
(Erik Bågfors, Michael Ellerman, Martin Pool, #32587)
2635
2636
* Fix unnecessary requirement of sign-my-commits that it be run from
2637
a working directory. (Martin Pool, Robert Collins)
2638
2639
* 'bzr push location' will only remember the push location if it succeeds
2640
in connecting to the remote location. (John Arbash Meinel, #49742)
2641
2642
* 'bzr revert' no longer toggles the executable bit on win32
2643
(John Arbash Meinel, #45010)
2644
2645
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
2646
2647
* sftp tests now work correctly on win32 if you have a newer paramiko
2648
(John Arbash Meinel)
2649
2650
* Cleanup win32 test suite, and general cleanup of places where
2651
file handles were being held open. (John Arbash Meinel)
2652
2653
* When specifying filenames for 'diff -r x..y', the name of the file in the
2654
working directory can be used, even if its name is different in both x
2655
and y.
2656
2657
* File-ids containing single- or double-quotes are handled correctly by
2658
push. (Aaron Bentley, #52227)
2659
2660
* Normalize unicode filenames to ensure cross-platform consistency.
2661
(John Arbash Meinel, #43689)
2662
2663
* The argument parser can now handle '-' as an argument. Currently
2664
no code interprets it specially (it is mostly handled as a file named
2665
'-'). But plugins, and future operations can use it.
2666
(John Arbash meinel, #50984)
2667
2668
* Bundles can properly read binary files with a plain '\r' in them.
2669
(John Arbash Meinel, #51927)
2670
2671
* Tuning ``iter_entries()`` to be more efficient (John Arbash Meinel, #5444)
2672
2673
* Lots of win32 fixes (the test suite passes again).
2674
(John Arbash Meinel, #50155)
2675
2676
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
2677
2678
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
2679
2680
* Removals are only committed if they match the filespec (or if there is
2681
no filespec). (#46635, Aaron Bentley)
2682
2683
* smart-add recurses through all supplied directories
2684
(John Arbash Meinel, #52578)
2685
2686
* Make the bundle reader extra lines before and after the bundle text.
2687
This allows you to parse an email with the bundle inline.
2688
(John Arbash Meinel, #49182)
2689
2690
* Change the file id generator to squash a little bit more. Helps when
2691
working with long filenames on windows. (Also helps for unicode filenames
2692
not generating hidden files). (John Arbash Meinel, #43801)
2693
2694
* Restore terminal mode on C-c while reading sftp password. (#48923,
2695
Nicholas Allen, Martin Pool)
2696
2697
* Timestamps are rounded to 1ms, and revision entries can be recreated
2698
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
2699
2700
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
2701
use local paths, since it is user visible (John Arbash Meinel, #53653)
2702
2703
* ``bzr status foo`` when foo was unversioned used to cause a full delta
2704
to be generated (John Arbash Meinel, #53638)
2705
2706
* When reading revision properties, an empty value should be considered
2707
the empty string, not None (John Arbash Meinel, #47782)
2708
2709
* ``bzr diff --diff-options`` can now handle binary files being changed.
2710
Also, the output is consistent when --diff-options is not supplied.
2711
(John Arbash Meinel, #54651, #52930)
2712
2713
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
2714
2715
* Fix ``Branch.get_parent()`` to handle the case when the parent is not
2716
accessible (John Arbash Meinel, #52976)
2717
2718
INTERNALS:
2719
2720
* Combine the ignore rules into a single regex rather than looping over
2721
them to reduce the threshold where N^2 behaviour occurs in operations
2722
like status. (Jan Hudec, Robert Collins).
2723
2724
* Appending to ``bzrlib.DEFAULT_IGNORE`` is now deprecated. Instead, use
2725
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
2726
2727
* 'bzr push' should only push the ancestry of the current revision, not
2728
all of the history in the repository. This is especially important for
2729
shared repositories. (John Arbash Meinel)
2730
2731
* ``bzrlib.delta.compare_trees`` now iterates in alphabetically sorted order,
2732
rather than randomly walking the inventories. (John Arbash Meinel)
2733
2734
* Doctests are now run in temporary directories which are cleaned up when
2735
they finish, rather than using special ScratchDir/ScratchBranch objects.
2736
(Martin Pool)
2737
2738
* Split ``check`` into separate methods on the branch and on the repository,
2739
so that it can be specialized in ways that are useful or efficient for
2740
different formats. (Martin Pool, Robert Collins)
2741
2742
* Deprecate ``Repository.all_revision_ids``; most methods don't really need
2743
the global revision graph but only that part leading up to a particular
2744
revision. (Martin Pool, Robert Collins)
2745
2746
* Add a BzrDirFormat ``control_formats`` list which allows for control formats
2747
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
2748
(Robert Collins, Jelmer Vernooij).
2749
2750
* ``bzrlib.diff.external_diff`` can be redirected to any file-like object.
2751
Uses subprocess instead of spawnvp.
2752
(James Henstridge, John Arbash Meinel, #4047, #48914)
2753
2754
* New command line option '--profile-imports', which will install a custom
2755
importer to log time to import modules and regex compilation time to
2756
sys.stderr (John Arbash Meinel)
2757
2758
* 'EmptyTree' is now deprecated, please use ``repository.revision_tree(None)``
2759
instead. (Robert Collins)
2760
2761
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
2762
2763
bzr 0.8.2 2006-05-17
2764
=====================
2765
2766
BUG FIXES:
2767
2768
* setup.py failed to install launchpad plugin. (Martin Pool)
2769
2770
bzr 0.8.1 2006-05-16
2771
=====================
2772
2773
BUG FIXES:
2774
2775
* Fix failure to commit a merge in a checkout. (Martin Pool,
2776
Robert Collins, Erik Bågfors, #43959)
2777
2778
* Nicer messages from 'commit' in the case of renames, and correct
2779
messages when a merge has occured. (Robert Collins, Martin Pool)
2780
2781
* Separate functionality from assert statements as they are skipped in
2782
optimized mode of python. Add the same check to pending merges.
2783
(Olaf Conradi, #44443)
2784
2785
CHANGES:
2786
2787
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
2788
2789
* Add info on standalone branches without a working tree.
2790
(Olaf Conradi, #44155)
2791
2792
* Fix bug in knits when raising InvalidRevisionId. (Olaf Conradi, #44284)
2793
2794
CHANGES:
2795
2796
* Make editor invocation comply with Debian Policy. First check
2797
environment variables VISUAL and EDITOR, then try editor from
2798
alternatives system. If that all fails, fall back to the pre-defined
2799
list of editors. (Olaf Conradi, #42904)
2800
2801
NEW FEATURES:
2802
2803
* New 'register-branch' command registers a public branch into
2804
Launchpad.net, where it can be associated with bugs, etc.
2805
(Martin Pool, Bjorn Tillenius, Robert Collins)
2806
2807
INTERNALS:
2808
2809
* New public api in InventoryEntry - ``describe_change(old, new)`` which
2810
provides a human description of the changes between two old and
2811
new. (Robert Collins, Martin Pool)
2812
2813
TESTING:
2814
2815
* Fix test case for bzr info in upgrading a standalone branch to metadir,
2816
uses bzrlib api now. (Olaf Conradi)
2817
2818
bzr 0.8 2006-05-08
2819
===================
2820
2821
NOTES WHEN UPGRADING:
2822
2823
Release 0.8 of bzr introduces a new format for history storage, called
2824
'knit', as an evolution of to the 'weave' format used in 0.7. Local
2825
and remote operations are faster using knits than weaves. Several
2826
operations including 'init', 'init-repo', and 'upgrade' take a
2827
--format option that controls this. Branching from an existing branch
2828
will keep the same format.
2829
2830
It is possible to merge, pull and push between branches of different
2831
formats but this is slower than moving data between homogenous
2832
branches. It is therefore recommended (but not required) that you
2833
upgrade all branches for a project at the same time. Information on
2834
formats is shown by 'bzr info'.
2835
2836
bzr 0.8 now allows creation of 'repositories', which hold the history
2837
of files and revisions for several branches. Previously bzr kept all
2838
the history for a branch within the .bzr directory at the root of the
2839
branch, and this is still the default. To create a repository, use
2840
the new 'bzr init-repo' command. Branches exist as directories under
2841
the repository and contain just a small amount of information
2842
indicating the current revision of the branch.
2843
2844
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
2845
subversion. Checkouts are associated with a branch (optionally in a
2846
repository), which contains all the historical information. The
2847
result is that a checkout can be deleted without losing any
2848
already-committed revisions. A new 'update' command is also available.
2849
2850
Repositories and checkouts are not supported with the 0.7 storage
2851
format. To use them you must upgrad to either knits, or to the
2852
'metaweave' format, which uses weaves but changes the .bzr directory
2853
arrangement.
2854
2855
2856
IMPROVEMENTS:
2857
2858
* Sftp paths can now be relative, or local, according to the lftp
2859
convention. Paths now take the form::
2860
2861
sftp://user:pass@host:port/~/relative/path
2862
or
2863
sftp://user:pass@host:port/absolute/path
2864
2865
* The FTP transport now tries to reconnect after a temporary
2866
failure. ftp put is made atomic. (Matthieu Moy)
2867
2868
* The FTP transport now maintains a pool of connections, and
2869
reuses them to avoid multiple connections to the same host (like
2870
sftp did). (Daniel Silverstone)
2871
2872
* The ``bzr_man.py`` file has been removed. To create the man page now,
2873
use ``./generate_docs.py man``. The new program can also create other files.
2874
Run ``python generate_docs.py --help`` for usage information.
2875
(Hans Ulrich Niedermann & James Blackwell).
2876
2877
* Man Page now gives full help (James Blackwell).
2878
Help also updated to reflect user config now being stored in .bazaar
2879
(Hans Ulrich Niedermann)
2880
2881
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
2882
2883
* Pull now accepts a --revision argument (Erik Bågfors)
2884
2885
* ``bzr re-sign`` now allows multiple revisions to be supplied on the command
2886
line. You can now use the following command to sign all of your old
2887
commits::
2888
2889
find .bzr/revision-store// -name my@email-* \
2890
| sed 's/.*\/\/..\///' \
2891
| xargs bzr re-sign
2892
2893
* Upgrade can now upgrade over the network. (Robert Collins)
2894
2895
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
2896
behaviour. By default they will cache history in the checkout, but
2897
with --lightweight almost all data is kept in the master branch.
2898
(Robert Collins)
2899
2900
* 'revert' unversions newly-versioned files, instead of deleting them.
2901
2902
* 'merge' is more robust. Conflict messages have changed.
2903
2904
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
2905
'.moved'.
2906
2907
* Default log format can be set in configuration and plugins can register
2908
their own formatters. (Erik Bågfors)
2909
2910
* New 'reconcile' command will check branch consistency and repair indexes
2911
that can become out of sync in pre 0.8 formats. (Robert Collins,
2912
Daniel Silverstone)
2913
2914
* New 'bzr init --format' and 'bzr upgrade --format' option to control
2915
what storage format is created or produced. (Robert Collins,
2916
Martin Pool)
2917
2918
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
2919
2920
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
2921
2922
* New 'init-repository' command, plus support for repositories in 'init'
2923
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
2924
2925
* Improve output of 'info' command. Show all relevant locations related to
2926
working tree, branch and repository. Use kibibytes for binary quantities.
2927
Fix off-by-one error in missing revisions of working tree. Make 'info'
2928
work on branches, repositories and remote locations. Show locations
2929
relative to the shared repository, if applicable. Show locking status
2930
of locations. (Olaf Conradi)
2931
2932
* Diff and merge now safely handle binary files. (Aaron Bentley)
2933
2934
* 'pull' and 'push' now normalise the revision history, so that any two
2935
branches with the same tip revision will have the same output from 'log'.
2936
(Robert Collins)
2937
2938
* 'merge' accepts --remember option to store parent location, like 'push'
2939
and 'pull'. (Olaf Conradi)
2940
2941
* bzr status and diff when files given as arguments do not exist
2942
in the relevant trees. (Martin Pool, #3619)
2943
2944
* Add '.hg' to the default ignore list. (Martin Pool)
2945
2946
* 'knit' is now the default disk format. This improves disk performance and
2947
utilization, increases incremental pull performance, robustness with SFTP
2948
and allows checkouts over SFTP to perform acceptably.
2949
The initial Knit code was contributed by Johan Rydberg based on a
2950
specification by Martin Pool.
2951
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
2952
2953
* New tool to generate all-in-one html version of the manual. (Alexander
2954
Belchenko)
2955
2956
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
2957
to be left in the SFTP repository. (Robert Collins, Martin Pool).
2958
2959
* New option 'diff --prefix' to control how files are named in diff
2960
output, with shortcuts '-p0' and '-p1' corresponding to the options for
2961
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
2962
2963
* Add --revision option to 'annotate' command. (Olaf Conradi)
2964
2965
* If bzr shows an unexpected revision-history after pulling (perhaps due
2966
to a reweave) it can now be corrected by 'bzr reconcile'.
2967
(Robert Collins)
2968
2969
CHANGES:
2970
2971
* Commit is now verbose by default, and shows changed filenames and the
2972
new revision number. (Robert Collins, Martin Pool)
2973
2974
* Unify 'mv', 'move', 'rename'. (Matthew Fuller, #5379)
2975
2976
* 'bzr -h' shows help. (Martin Pool, Ian Bicking, #35940)
2977
2978
* Make 'pull' and 'push' remember location on failure using --remember.
2979
(Olaf Conradi)
2980
2981
* For compatibility, make old format for using weaves inside metadir
2982
available as 'metaweave' format. Rename format 'metadir' to 'default'.
2983
Clean up help for option --format in commands 'init', 'init-repo' and
2984
'upgrade'. (Olaf Conradi)
2985
2986
INTERNALS:
2987
2988
* The internal storage of history, and logical branch identity have now
2989
been split into Branch, and Repository. The common locking and file
2990
management routines are now in bzrlib.lockablefiles.
2991
(Aaron Bentley, Robert Collins, Martin Pool)
2992
2993
* Transports can now raise DependencyNotPresent if they need a library
2994
which is not installed, and then another implementation will be
2995
tried. (Martin Pool)
2996
2997
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
2998
(Martin Pool)
2999
3000
* Using Tree Transform for merge, revert, tree-building
3001
3002
* WorkingTree.create, Branch.create, ``WorkingTree.create_standalone``,
3003
Branch.initialize are now deprecated. Please see ``BzrDir.create_*`` for
3004
replacement API's. (Robert Collins)
3005
3006
* New BzrDir class represents the .bzr control directory and manages
3007
formatting issues. (Robert Collins)
3008
3009
* New repository.InterRepository class encapsulates Repository to
3010
Repository actions and allows for clean selection of optimised code
3011
paths. (Robert Collins)
3012
3013
* ``bzrlib.fetch.fetch`` and ``bzrlib.fetch.greedy_fetch`` are now
3014
deprecated, please use ``branch.fetch`` or ``repository.fetch``
3015
depending on your needs. (Robert Collins)
3016
3017
* deprecated methods now have a ``is_deprecated`` flag on them that can
3018
be checked, if you need to determine whether a given callable is
3019
deprecated at runtime. (Robert Collins)
3020
3021
* Progress bars are now nested - see
3022
``bzrlib.ui.ui_factory.nested_progress_bar``.
3023
(Robert Collins, Robey Pointer)
3024
3025
* New API call ``get_format_description()`` for each type of format.
3026
(Olaf Conradi)
3027
3028
* Changed ``branch.set_parent()`` to accept None to remove parent.
3029
(Olaf Conradi)
3030
3031
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
3032
3033
* WorkingTree.branch is now a read only property. (Robert Collins)
3034
3035
* bzrlib.ui.text.TextUIFactory now accepts a ``bar_type`` parameter which
3036
can be None or a factory that will create a progress bar. This is
3037
useful for testing or for overriding the bzrlib.progress heuristic.
3038
(Robert Collins)
3039
3040
* New API method ``get_physical_lock_status()`` to query locks present on a
3041
transport. (Olaf Conradi)
3042
3043
* Repository.reconcile now takes a thorough keyword parameter to allow
3044
requesting an indepth reconciliation, rather than just a data-loss
3045
check. (Robert Collins)
3046
3047
* ``bzrlib.ui.ui_factory protocol`` now supports ``get_boolean`` to prompt
3048
the user for yes/no style input. (Robert Collins)
3049
3050
TESTING:
3051
3052
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
3053
for testing SFTP protocol support. (Robey Pointer)
3054
3055
* Branch formats are now tested once per implementation (see ``bzrlib.
3056
tests.branch_implementations``. This is analagous to the transport
3057
interface tests, and has been followed up with working tree,
3058
repository and BzrDir tests. (Robert Collins)
3059
3060
* New test base class TestCaseWithTransport provides a transport aware
3061
test environment, useful for testing any transport-interface using
3062
code. The test suite option --transport controls the transport used
3063
by this class (when its not being used as part of implementation
3064
contract testing). (Robert Collins)
3065
3066
* Close logging handler on disabling the test log. This will remove the
3067
handler from the internal list inside python's logging module,
3068
preventing shutdown from closing it twice. (Olaf Conradi)
3069
3070
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
3071
3072
* ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'
3073
parameter which will provide String("foo") to the command as its stdin.
3074
3075
bzr 0.7 2006-01-09
3076
==================
3077
3078
CHANGES:
3079
3080
* .bzrignore is excluded from exports, on the grounds that it's a bzr
3081
internal-use file and may not be wanted. (Jamie Wilkinson)
3082
3083
* The "bzr directories" command were removed in favor of the new
3084
--kind option to the "bzr inventory" command. To list all
3085
versioned directories, now use "bzr inventory --kind directory".
3086
(Johan Rydberg)
3087
3088
* Under Windows configuration directory is now ``%APPDATA%\bazaar\2.0``
3089
by default. (John Arbash Meinel)
3090
3091
* The parent of Bzr configuration directory can be set by ``BZR_HOME``
3092
environment variable. Now the path for it is searched in ``BZR_HOME``,
3093
then in HOME. Under Windows the order is: ``BZR_HOME``, ``APPDATA``
3094
(usually points to ``C:\Documents and Settings\User Name\Application Data``),
3095
``HOME``. (John Arbash Meinel)
3096
3097
* Plugins with the same name in different directories in the bzr plugin
3098
path are no longer loaded: only the first successfully loaded one is
3099
used. (Robert Collins)
3100
3101
* Use systems' external ssh command to open connections if possible.
3102
This gives better integration with user settings such as ProxyCommand.
3103
(James Henstridge)
3104
3105
* Permissions on files underneath .bzr/ are inherited from the .bzr
3106
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
3107
will mean that future file will be created with group write permissions.
3108
3109
* configure.in and config.guess are no longer in the builtin default
3110
ignore list.
3111
3112
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
3113
files. (John Arbash Meinel, Martin Pool)
3114
3115
IMPROVEMENTS:
3116
3117
* "bzr INIT dir" now initializes the specified directory, and creates
3118
it if it does not exist. (John Arbash Meinel)
3119
3120
* New remerge command (Aaron Bentley)
3121
3122
* Better zsh completion script. (Steve Borho)
3123
3124
* 'bzr diff' now returns 1 when there are changes in the working
3125
tree. (Robert Collins)
3126
3127
* 'bzr push' now exists and can push changes to a remote location.
3128
This uses the transport infrastructure, and can store the remote
3129
location in the ~/.bazaar/branches.conf configuration file.
3130
(Robert Collins)
3131
3132
* Test directories are only kept if the test fails and the user requests
3133
that they be kept.
3134
3135
* Tweaks to short log printing
3136
3137
* Added branch nicks, new nick command, printing them in log output.
3138
(Aaron Bentley)
3139
3140
* If ``$BZR_PDB`` is set, pop into the debugger when an uncaught exception
3141
occurs. (Martin Pool)
3142
3143
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
3144
the same as Subversion. (Martin Pool)
3145
3146
* New ftp transport support (on ftplib), for ftp:// and aftp://
3147
URLs. (Daniel Silverstone)
3148
3149
* Commit editor temporary files now start with ``bzr_log.``, to allow
3150
text editors to match the file name and set up appropriate modes or
3151
settings. (Magnus Therning)
3152
3153
* Improved performance when integrating changes from a remote weave.
3154
(Goffredo Baroncelli)
3155
3156
* Sftp will attempt to cache the connection, so it is more likely that
3157
a connection will be reused, rather than requiring multiple password
3158
requests.
3159
3160
* bzr revno now takes an optional argument indicating the branch whose
3161
revno should be printed. (Michael Ellerman)
3162
3163
* bzr cat defaults to printing the last version of the file.
3164
(Matthieu Moy, #3632)
3165
3166
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
3167
profiler. (Denys Duchier)
3168
3169
* Faster commits by reading only the headers of affected weave files.
3170
(Denys Duchier)
3171
3172
* 'bzr add' now takes a --dry-run parameter which shows you what would be
3173
added, but doesn't actually add anything. (Michael Ellerman)
3174
3175
* 'bzr add' now lists how many files were ignored per glob. add --verbose
3176
lists the specific files. (Aaron Bentley)
3177
3178
* 'bzr missing' now supports displaying changes in diverged trees and can
3179
be limited to show what either end of the comparison is missing.
3180
(Aaron Bently, with a little prompting from Daniel Silverstone)
3181
3182
BUG FIXES:
3183
3184
* SFTP can walk up to the root path without index errors. (Robert Collins)
3185
3186
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
3187
3188
* Error when run with -OO
3189
3190
* Fix bug in reporting http errors that don't have an http error code.
3191
(Martin Pool)
3192
3193
* Handle more cases of pipe errors in display commands
3194
3195
* Change status to 3 for all errors
3196
3197
* Files that are added and unlinked before committing are completely
3198
ignored by diff and status
3199
3200
* Stores with some compressed texts and some uncompressed texts are now
3201
able to be used. (John A Meinel)
3202
3203
* Fix for bzr pull failing sometimes under windows
3204
3205
* Fix for sftp transport under windows when using interactive auth
3206
3207
* Show files which are both renamed and modified as such in 'bzr
3208
status' output. (Daniel Silverstone, #4503)
3209
3210
* Make annotate cope better with revisions committed without a valid
3211
email address. (Marien Zwart)
3212
3213
* Fix representation of tab characters in commit messages.
3214
(Harald Meland)
3215
3216
* List of plugin directories in ``BZR_PLUGIN_PATH`` environment variable is
3217
now parsed properly under Windows. (Alexander Belchenko)
3218
3219
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
3220
3221
* Keep a cached copy of the basis inventory to speed up operations
3222
that need to refer to it. (Johan Rydberg, Martin Pool)
3223
3224
* Fix bugs in bzr status display of non-ascii characters.
3225
(Martin Pool)
3226
3227
* Remove Makefile.in from default ignore list.
3228
(Tollef Fog Heen, Martin Pool, #6413)
3229
3230
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
3231
3232
TESTING:
3233
3234
* Fix selftest asking for passwords when there are no SFTP keys.
3235
(Robey Pointer, Jelmer Vernooij)
3236
3237
* Fix selftest run with 'python -O'. (Martin Pool)
3238
3239
* Fix HTTP tests under Windows. (John Arbash Meinel)
3240
3241
* Make tests work even if HOME is not set (Aaron Bentley)
3242
3243
* Updated ``build_tree`` to use fixed line-endings for tests which read
3244
the file cotents and compare. Make some tests use this to pass under
3245
Windows. (John Arbash Meinel)
3246
3247
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
3248
3249
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
3250
(John Arbash Meinel)
3251
3252
* Use terminal width to align verbose test output. (Martin Pool)
3253
3254
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
3255
If adding a new test script please add that to
3256
``bzrlib.tests.blackbox.__init__``. (Robert Collins)
3257
3258
* Much better error message if one of the test suites can't be
3259
imported. (Martin Pool)
3260
3261
* Make check now runs the test suite twice - once with the default locale,
3262
and once with all locales forced to C, to expose bugs. This is not
3263
trivially done within python, so for now its only triggered by running
3264
Make check. Integrators and packagers who wish to check for full
3265
platform support should run 'make check' to test the source.
3266
(Robert Collins)
3267
3268
* Tests can now run TestSkipped if they can't execute for any reason.
3269
(Martin Pool) (NB: TestSkipped should only be raised for correctable
3270
reasons - see the wiki spec ImprovingBzrTestSuite).
3271
3272
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
3273
paths for the transport tests. Introduce blackbox remote sftp tests that
3274
test the same permutations. (Robert Collins, Robey Pointer)
3275
3276
* Transport implementation tests are now independent of the local file
3277
system, which allows tests for esoteric transports, and for features
3278
not available in the local file system. They also repeat for variations
3279
on the URL scheme that can introduce issues in the transport code,
3280
see bzrlib.transport.TransportTestProviderAdapter() for this.
3281
(Robert Collins).
3282
3283
* ``TestCase.build_tree`` uses the transport interface to build trees,
3284
pass in a transport parameter to give it an existing connection.
3285
(Robert Collins).
3286
3287
INTERNALS:
3288
3289
* WorkingTree.pull has been split across Branch and WorkingTree,
3290
to allow Branch only pulls. (Robert Collins)
3291
3292
* ``commands.display_command`` now returns the result of the decorated
3293
function. (Robert Collins)
3294
3295
* LocationConfig now has a ``set_user_option(key, value)`` call to save
3296
a setting in its matching location section (a new one is created
3297
if needed). (Robert Collins)
3298
3299
* Branch has two new methods, ``get_push_location`` and
3300
``set_push_location`` to respectively, get and set the push location.
3301
(Robert Collins)
3302
3303
* ``commands.register_command`` now takes an optional flag to signal that
3304
the registrant is planning to decorate an existing command. When
3305
given multiple plugins registering a command is not an error, and
3306
the original command class (whether built in or a plugin based one) is
3307
returned to the caller. There is a new error 'MustUseDecorated' for
3308
signalling when a wrapping command should switch to the original
3309
version. (Robert Collins)
3310
3311
* Some option parsing errors will raise 'BzrOptionError', allowing
3312
granular detection for decorating commands. (Robert Collins).
3313
3314
* ``Branch.read_working_inventory`` has moved to
3315
``WorkingTree.read_working_inventory``. This necessitated changes to
3316
``Branch.get_root_id``, and a move of ``Branch.set_inventory`` to
3317
WorkingTree as well. To make it clear that a WorkingTree cannot always
3318
be obtained ``Branch.working_tree()`` will raise
3319
``errors.NoWorkingTree`` if one cannot be obtained. (Robert Collins)
3320
3321
* All pending merges operations from Branch are now on WorkingTree.
3322
(Robert Collins)
3323
3324
* The follow operations from Branch have moved to WorkingTree::
3325
3326
add()
3327
commit()
3328
move()
3329
rename_one()
3330
unknowns()
3331
3332
(Robert Collins)
3333
3334
* ``bzrlib.add.smart_add_branch`` is now ``smart_add_tree``. (Robert Collins)
3335
3336
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
3337
3338
* Rename selftests to ``bzrlib.tests.test_foo``. (John A Meinel, Martin
3339
Pool)
3340
3341
* ``bzrlib.plugin.all_plugins`` has been changed from an attribute to a
3342
query method. (Robert Collins)
3343
3344
* New options to read only the table-of-contents of a weave.
3345
(Denys Duchier)
3346
3347
* Raise NoSuchFile when someone tries to add a non-existant file.
3348
(Michael Ellerman)
3349
3350
* Simplify handling of DivergedBranches in ``cmd_pull()``.
3351
(Michael Ellerman)
3352
3353
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
3354
is exposed as ``Branch().control_files``. Also this has been altered with the
3355
controlfile pre/suffix replaced by simple method names like 'get' and
3356
'put'. (Aaron Bentley, Robert Collins).
3357
3358
* Deprecated functions and methods can now be marked as such using the
3359
``bzrlib.symbol_versioning`` module. Marked method have their docstring
3360
updated and will issue a DeprecationWarning using the warnings module
3361
when they are used. (Robert Collins)
3362
3363
* ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion
3364
for functions that need unicode strings. (Robert Collins)
3365
3366
bzr 0.6 2005-10-28
3367
==================
3368
3369
IMPROVEMENTS:
3370
3371
* pull now takes --verbose to show you what revisions are added or removed
3372
(John A Meinel)
3373
3374
* merge now takes a --show-base option to include the base text in
3375
conflicts.
3376
(Aaron Bentley)
3377
3378
* The config files are now read using ConfigObj, so '=' should be used as
3379
a separator, not ':'.
3380
(Aaron Bentley)
3381
3382
* New 'bzr commit --strict' option refuses to commit if there are
3383
any unknown files in the tree. To commit, make sure all files are
3384
either ignored, added, or deleted. (Michael Ellerman)
3385
3386
* The config directory is now ~/.bazaar, and there is a single file
3387
~/.bazaar/bazaar.conf storing email, editor and other preferences.
3388
(Robert Collins)
3389
3390
* 'bzr add' no longer takes a --verbose option, and a --quiet option
3391
has been added that suppresses all output.
3392
3393
* Improved zsh completion support in contrib/zsh, from Clint
3394
Adams.
3395
3396
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
3397
Goffredo Baroncelli.
3398
3399
* 'bzr check' now accepts -v for verbose reporting, and checks for
3400
ghosts in the branch. (Robert Collins)
3401
3402
* New command 're-sign' which will regenerate the gpg signature for
3403
a revision. (Robert Collins)
3404
3405
* If you set ``check_signatures=require`` for a path in
3406
``~/.bazaar/branches.conf`` then bzr will invoke your
3407
``gpg_signing_command`` (defaults to gpg) and record a digital signature
3408
of your commit. (Robert Collins)
3409
3410
* New sftp transport, based on Paramiko. (Robey Pointer)
3411
3412
* 'bzr pull' now accepts '--clobber' which will discard local changes
3413
and make this branch identical to the source branch. (Robert Collins)
3414
3415
* Just give a quieter warning if a plugin can't be loaded, and
3416
put the details in .bzr.log. (Martin Pool)
3417
3418
* 'bzr branch' will now set the branch-name to the last component of the
3419
output directory, if one was supplied.
3420
3421
* If the option ``post_commit`` is set to one (or more) python function
3422
names (must be in the bzrlib namespace), then they will be invoked
3423
after the commit has completed, with the branch and ``revision_id`` as
3424
parameters. (Robert Collins)
3425
3426
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
3427
3428
* --merge-type weave is now supported for file contents. Tree-shape
3429
changes are still three-way based. (Martin Pool, Aaron Bentley)
3430
3431
* 'bzr check' allows the first revision on revision-history to have
3432
parents - something that is expected for cheap checkouts, and occurs
3433
when conversions from baz do not have all history. (Robert Collins).
3434
3435
* 'bzr merge' can now graft unrelated trees together, if your specify
3436
0 as a base. (Aaron Bentley)
3437
3438
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
3439
(Aaron Bentley)
3440
3441
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
3442
3443
* 'bzr merge --reprocess' minimizes conflicts
3444
3445
TESTING:
3446
3447
* The 'bzr selftest --pattern' option for has been removed, now
3448
test specifiers on the command line can be simple strings, or
3449
regexps, or both. (Robert Collins)
3450
3451
* Passing -v to selftest will now show the time each test took to
3452
complete, which will aid in analysing performance regressions and
3453
related questions. (Robert Collins)
3454
3455
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
3456
is given. (Martin Pool)
3457
3458
* There is a new method for TestCaseInTempDir, assertFileEqual, which
3459
will check that a given content is equal to the content of the named
3460
file. (Robert Collins)
3461
3462
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
3463
(Martin Pool)
3464
3465
INTERNALS:
3466
3467
* New 'testament' command and concept for making gpg-signatures
3468
of revisions that are not tied to a particular internal
3469
representation. (Martin Pool).
3470
3471
* Per-revision properties ('revprops') as key-value associated
3472
strings on each revision created when the revision is committed.
3473
Intended mainly for the use of external tools. (Martin Pool).
3474
3475
* Config options have moved from bzrlib.osutils to bzrlib.config.
3476
(Robert Collins)
3477
3478
* Improved command line option definitions allowing explanations
3479
for individual options, among other things. Contributed by
3480
Magnus Therning.
3481
3482
* Config options have moved from bzrlib.osutils to bzrlib.config.
3483
Configuration is now done via the config.Config interface:
3484
Depending on whether you have a Branch, a Location or no information
3485
available, construct a ``*Config``, and use its ``signature_checking``,
3486
``username`` and ``user_email`` methods. (Robert Collins)
3487
3488
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
3489
they are made available for other plugins to use. You should not
3490
import other plugins during the ``__init__`` of your plugin though, as
3491
no ordering is guaranteed, and the plugins directory is not on the
3492
python path. (Robert Collins)
3493
3494
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
3495
no longer takes an inventory, rather it takes an option branch
3496
parameter, and if None is given will open the branch at basedir
3497
implicitly. (Robert Collins)
3498
3499
* Cleaner exception structure and error reporting. Suggested by
3500
Scott James Remnant. (Martin Pool)
3501
3502
* Branch.remove has been moved to WorkingTree, which has also gained
3503
``lock_read``, ``lock_write`` and ``unlock`` methods for convenience.
3504
(Robert Collins)
3505
3506
* Two decorators, ``needs_read_lock`` and ``needs_write_lock`` have been
3507
added to the branch module. Use these to cause a function to run in a
3508
read or write lock respectively. (Robert Collins)
3509
3510
* ``Branch.open_containing`` now returns a tuple (Branch, relative-path),
3511
which allows direct access to the common case of 'get me this file
3512
from its branch'. (Robert Collins)
3513
3514
* Transports can register using ``register_lazy_transport``, and they
3515
will be loaded when first used. (Martin Pool)
3516
3517
* 'pull' has been factored out of the command as ``WorkingTree.pull()``.
3518
A new option to WorkingTree.pull has been added, clobber, which will
3519
ignore diverged history and pull anyway.
3520
(Robert Collins)
3521
3522
* config.Config has a ``get_user_option`` call that accepts an option name.
3523
This will be looked up in branches.conf and bazaar.conf as normal.
3524
It is intended that this be used by plugins to support options -
3525
options of built in programs should have specific methods on the config.
3526
(Robert Collins)
3527
3528
* ``merge.merge_inner`` now has tempdir as an optional parameter.
3529
(Robert Collins)
3530
3531
* Tree.kind is not recorded at the top level of the hierarchy, as it was
3532
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
3533
(Robert Collins)
3534
3535
* ``WorkingTree.__del__`` has been removed, it was non deterministic and not
3536
doing what it was intended to. See ``WorkingTree.__init__`` for a comment
3537
about future directions. (Robert Collins/Martin Pool)
3538
3539
* bzrlib.transport.http has been modified so that only 404 urllib errors
3540
are returned as NoSuchFile. Other exceptions will propogate as normal.
3541
This allows debuging of actual errors. (Robert Collins)
3542
3543
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
3544
to apis like 'put', 'get' and 'has'. This is to provide consistent
3545
behaviour - it operates on url's only. (Robert Collins)
3546
3547
* Transports can register using ``register_lazy_transport``, and they
3548
will be loaded when first used. (Martin Pool)
3549
3550
* ``merge_flex`` no longer calls ``conflict_handler.finalize()``, instead that
3551
is called by ``merge_inner``. This is so that the conflict count can be
3552
retrieved (and potentially manipulated) before returning to the caller
3553
of ``merge_inner``. Likewise 'merge' now returns the conflict count to the
3554
caller. (Robert Collins)
3555
3556
* ``revision.revision_graph`` can handle having only partial history for
3557
a revision - that is no revisions in the graph with no parents.
3558
(Robert Collins).
3559
3560
* New ``builtins.branch_files`` uses the standard ``file_list`` rules to
3561
produce a branch and a list of paths, relative to that branch
3562
(Aaron Bentley)
3563
3564
* New TestCase.addCleanup facility.
3565
3566
* New ``bzrlib.version_info`` tuple (similar to ``sys.version_info``),
3567
which can be used by programs importing bzrlib.
3568
3569
BUG FIXES:
3570
3571
* Better handling of branches in directories with non-ascii names.
3572
(Joel Rosdahl, Panagiotis Papadakos)
3573
3574
* Upgrades of trees with no commits will not fail due to accessing
3575
[-1] in the revision-history. (Andres Salomon)
3576
3577
3578
bzr 0.1.1 2005-10-12
3579
====================
3580
3581
BUG FIXES:
3582
3583
* Fix problem in pulling over http from machines that do not
3584
allow directories to be listed.
3585
3586
* Avoid harmless warning about invalid hash cache after
3587
upgrading branch format.
3588
3589
PERFORMANCE:
3590
3591
* Avoid some unnecessary http operations in branch and pull.
3592
3593
3594
bzr 0.1 2005-10-11
3595
==================
3596
3597
NOTES:
3598
3599
* 'bzr branch' over http initially gives a very high estimate
3600
of completion time but it should fall as the first few
3601
revisions are pulled in. branch is still slow on
3602
high-latency connections.
3603
3604
BUG FIXES:
3605
3606
* bzr-man.py has been updated to work again. Contributed by
3607
Rob Weir.
3608
3609
* Locking is now done with fcntl.lockf which works with NFS
3610
file systems. Contributed by Harald Meland.
3611
3612
* When a merge encounters a file that has been deleted on
3613
one side and modified on the other, the old contents are
3614
written out to foo.BASE and foo.SIDE, where SIDE is this
3615
or OTHER. Contributed by Aaron Bentley.
3616
3617
* Export was choosing incorrect file paths for the content of
3618
the tarball, this has been fixed by Aaron Bentley.
3619
3620
* Commit will no longer commit without a log message, an
3621
error is returned instead. Contributed by Jelmer Vernooij.
3622
3623
* If you commit a specific file in a sub directory, any of its
3624
parent directories that are added but not listed will be
3625
automatically included. Suggested by Michael Ellerman.
3626
3627
* bzr commit and upgrade did not correctly record new revisions
3628
for files with only a change to their executable status.
3629
bzr will correct this when it encounters it. Fixed by
3630
Robert Collins
3631
3632
* HTTP tests now force off the use of ``http_proxy`` for the duration.
3633
Contributed by Gustavo Niemeyer.
3634
3635
* Fix problems in merging weave-based branches that have
3636
different partial views of history.
3637
3638
* Symlink support: working with symlinks when not in the root of a
3639
bzr tree was broken, patch from Scott James Remnant.
3640
3641
IMPROVEMENTS:
3642
3643
* 'branch' now accepts a --basis parameter which will take advantage
3644
of local history when making a new branch. This allows faster
3645
branching of remote branches. Contributed by Aaron Bentley.
3646
3647
* New tree format based on weave files, called version 5.
3648
Existing branches can be upgraded to this format using
3649
'bzr upgrade'.
3650
3651
* Symlinks are now versionable. Initial patch by
3652
Erik Toubro Nielsen, updated to head by Robert Collins.
3653
3654
* Executable bits are tracked on files. Patch from Gustavo
3655
Niemeyer.
3656
3657
* 'bzr status' now shows unknown files inside a selected directory.
3658
Patch from Heikki Paajanen.
3659
3660
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
3661
and 'resolve' have needed added, which list and remove those
3662
merge conflicts respectively. A conflicted tree cannot be committed
3663
in. Contributed by Aaron Bentley.
3664
3665
* 'rm' is now an alias for 'remove'.
3666
3667
* Stores now split out their content in a single byte prefixed hash,
3668
dropping the density of files per directory by 256. Contributed by
3669
Gustavo Niemeyer.
3670
3671
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
3672
Contributed by Robert Collins.
3673
3674
* 'bzr log' with the default formatter will show merged revisions,
3675
indented to the right. Initial implementation contributed by Gustavo
3676
Niemeyer, made incremental by Robert Collins.
3677
3678
3679
INTERNALS:
3680
3681
* Test case failures have the exception printed after the log
3682
for your viewing pleasure.
3683
3684
* InventoryEntry is now an abstract base class, use one of the
3685
concrete InventoryDirectory etc classes instead.
3686
3687
* Branch raises an UnsupportedFormatError when it detects a
3688
bzr branch it cannot understand. This allows for precise
3689
handling of such circumstances.
3690
3691
* Remove RevisionReference class; ``Revision.parent_ids`` is now simply a
3692
list of their ids and ``parent_sha1s`` is a list of their corresponding
3693
sha1s (for old branches only at the moment.)
3694
3695
* New method-object style interface for Commit() and Fetch().
3696
3697
* Renamed ``Branch.last_patch()`` to ``Branch.last_revision()``, since
3698
we call them revisions not patches.
3699
3700
* Move ``copy_branch`` to ``bzrlib.clone.copy_branch``. The destination
3701
directory is created if it doesn't exist.
3702
3703
* Inventories now identify the files which were present by
3704
giving the revision *of that file*.
3705
3706
* Inventory and Revision XML contains a version identifier.
3707
This must be consistent with the overall branch version
3708
but allows for more flexibility in future upgrades.
3709
3710
TESTING:
3711
3712
* Removed testsweet module so that tests can be run after
3713
bzr installed by 'bzr selftest'.
3714
3715
* 'bzr selftest' command-line arguments can now be partial ids
3716
of tests to run, e.g. ``bzr selftest test_weave``
3717
3718
3719
bzr 0.0.9 2005-09-23
3720
====================
3721
3722
BUG FIXES:
3723
3724
* Fixed "branch -r" option.
3725
3726
* Fix remote access to branches containing non-compressed history.
3727
(Robert Collins).
3728
3729
* Better reliability of http server tests. (John Arbash-Meinel)
3730
3731
* Merge graph maximum distance calculation fix. (Aaron Bentley)
3732
3733
* Various minor bug in windows support have been fixed, largely in the
3734
test suite. Contributed by Alexander Belchenko.
3735
3736
IMPROVEMENTS:
3737
3738
* Status now accepts a -r argument to give status between chosen
3739
revisions. Contributed by Heikki Paajanen.
3740
3741
* Revision arguments no longer use +/-/= to control ranges, instead
3742
there is a 'before' namespace, which limits the successive namespace.
3743
For example '$ bzr log -r date:yesterday..before:date:today' will
3744
select everything from yesterday and before today. Contributed by
3745
Robey Pointer
3746
3747
* There is now a bzr.bat file created by distutils when building on
3748
Windows. Contributed by Alexander Belchenko.
3749
3750
INTERNALS:
3751
3752
* Removed uuid() as it was unused.
3753
3754
* Improved 'fetch' code for pulling revisions from one branch into
3755
another (used by pull, merged, etc.)
3756
3757
3758
bzr 0.0.8 2005-09-20
3759
====================
3760
3761
IMPROVEMENTS:
3762
3763
* Adding a file whose parent directory is not versioned will
3764
implicitly add the parent, and so on up to the root. This means
3765
you should never need to explictly add a directory, they'll just
3766
get added when you add a file in the directory. Contributed by
3767
Michael Ellerman.
3768
3769
* Ignore ``.DS_Store`` (contains Mac metadata) by default.
3770
(Nir Soffer)
3771
3772
* If you set ``BZR_EDITOR`` in the environment, it is checked in
3773
preference to EDITOR and the config file for the interactive commit
3774
editing program. Related to this is a bugfix where a missing program
3775
set in EDITOR would cause editing to fail, now the fallback program
3776
for the operating system is still tried.
3777
3778
* Files that are not directories/symlinks/regular files will no longer
3779
cause bzr to fail, it will just ignore them by default. You cannot add
3780
them to the tree though - they are not versionable.
3781
3782
3783
INTERNALS:
3784
3785
* Refactor xml packing/unpacking.
3786
3787
BUG FIXES:
3788
3789
* Fixed 'bzr mv' by Ollie Rutherfurd.
3790
3791
* Fixed strange error when trying to access a nonexistent http
3792
branch.
3793
3794
* Make sure that the hashcache gets written out if it can't be
3795
read.
3796
3797
3798
PORTABILITY:
3799
3800
* Various Windows fixes from Ollie Rutherfurd.
3801
3802
* Quieten warnings about locking; patch from Matt Lavin.
3803
3804
3805
bzr-0.0.7 2005-09-02
3806
====================
3807
3808
NEW FEATURES:
3809
3810
* ``bzr shell-complete`` command contributed by Clint Adams to
3811
help with intelligent shell completion.
3812
3813
* New expert command ``bzr find-merge-base`` for debugging merges.
3814
3815
3816
ENHANCEMENTS:
3817
3818
* Much better merge support.
3819
3820
* merge3 conflicts are now reported with markers like '<<<<<<<'
3821
(seven characters) which is the same as CVS and pleases things
3822
like emacs smerge.
3823
3824
3825
BUG FIXES:
3826
3827
* ``bzr upgrade`` no longer fails when trying to fix trees that
3828
mention revisions that are not present.
3829
3830
* Fixed bugs in listing plugins from ``bzr plugins``.
3831
3832
* Fix case of $EDITOR containing options for the editor.
3833
3834
* Fix log -r refusing to show the last revision.
3835
(Patch from Goffredo Baroncelli.)
3836
3837
3838
CHANGES:
3839
3840
* ``bzr log --show-ids`` shows the revision ids of all parents.
3841
3842
* Externally provided commands on your $BZRPATH no longer need
3843
to recognize --bzr-usage to work properly, and can just handle
3844
--help themselves.
3845
3846
3847
LIBRARY:
3848
3849
* Changed trace messages to go through the standard logging
3850
framework, so that they can more easily be redirected by
3851
libraries.
3852
3853
3854
3855
bzr-0.0.6 2005-08-18
3856
====================
1
DEVELOPMENT HEAD
3857
2
3858
3
NEW FEATURES:
3859
4
3860
5
* Python plugins, automatically loaded from the directories on
3861
``BZR_PLUGIN_PATH`` or ``~/.bzr.conf/plugins`` by default.
6
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
3862
7
3863
8
* New 'bzr mkdir' command.
3864
9
3865
10
* Commit mesage is fetched from an editor if not given on the
3866
11
command line; patch from Torsten Marek.
3867
12
3868
* ``bzr log -m FOO`` displays commits whose message matches regexp
3869
FOO.
3870
3871
* ``bzr add`` with no arguments adds everything under the current directory.
3872
3873
* ``bzr mv`` does move or rename depending on its arguments, like
3874
the Unix command.
3875
3876
* ``bzr missing`` command shows a summary of the differences
3877
between two trees. (Merged from John Arbash-Meinel.)
3878
3879
* An email address for commits to a particular tree can be
3880
specified by putting it into .bzr/email within a branch. (Based
3881
on a patch from Heikki Paajanen.)
3882
3883
3884
ENHANCEMENTS:
3885
3886
* Faster working tree operations.
3887
3888
3889
13
CHANGES:
3890
14
3891
* 3rd-party modules shipped with bzr are copied within the bzrlib
3892
python package, so that they can be installed by the setup
3893
script without clashing with anything already existing on the
3894
system. (Contributed by Gustavo Niemeyer.)
3895
3896
* Moved plugins directory to bzrlib/, so that there's a standard
3897
plugin directory which is not only installed with bzr itself but
3898
is also available when using bzr from the development tree.
3899
``BZR_PLUGIN_PATH`` and ``DEFAULT_PLUGIN_PATH`` are then added to the
3900
standard plugins directory.
3901
3902
* When exporting to a tarball with ``bzr export --format tgz``, put
3903
everything under a top directory rather than dumping it into the
3904
current directory. This can be overridden with the ``--root``
3905
option. Patch from William Dodé and John Meinel.
3906
3907
15
* New ``bzr upgrade`` command to upgrade the format of a branch,
3908
16
replacing ``bzr check --update``.
3909
17
3914
22
John A Meinel. Old format is available with the ``--long`` or
3915
23
``-l`` option, patched by William Dodé.
3916
24
3917
* By default the commit command refuses to record a revision with
3918
no changes unless the ``--unchanged`` option is given.
3919
3920
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
3921
line options must come before the command name because they
3922
affect what commands are available; all other options must come
3923
after the command name because their interpretation depends on
3924
it.
3925
3926
* ``branch`` and ``clone`` added as aliases for ``branch``.
3927
3928
* Default log format is back to the long format; the compact one
3929
is available with ``--short``.
3930
3931
3932
BUG FIXES:
3933
3934
* Fix bugs in committing only selected files or within a subdirectory.
3935
3936
25
3937
26
bzr-0.0.5 2005-06-15
3938
=====================
3939
27
3940
28
CHANGES:
3941
29
4049
137
4050
138
* Better help messages for many commands.
4051
139
4052
* Expose ``bzrlib.open_tracefile()`` to start the tracefile; until
140
* Expose bzrlib.open_tracefile() to start the tracefile; until
4053
141
this is called trace messages are just discarded.
4054
142
4055
* New internal function ``find_touching_revisions()`` and hidden
143
* New internal function find_touching_revisions() and hidden
4056
144
command touching-revisions trace the changes to a given file.
4057
145
4058
* Simpler and faster ``compare_inventories()`` function.
146
* Simpler and faster compare_inventories() function.
4059
147
4060
* ``bzrlib.open_tracefile()`` takes a tracefilename parameter.
148
* bzrlib.open_tracefile() takes a tracefilename parameter.
4061
149
4062
150
* New AtomicFile class.
4063
151
4071
159
4072
160
4073
161
bzr-0.0.4 2005-04-22
4074
=====================
4075
162
4076
163
ENHANCEMENTS:
4077
164
4108
195
4109
196
* Some Unicode/locale fixes.
4110
197
4111
* Partial workaround for ``difflib.unified_diff`` not handling
198
* Partial workaround for difflib.unified_diff not handling
4112
199
trailing newlines properly.
4113
200
4114
201
4135
222
4136
223
4137
224
bzr-0.0.3 2005-04-06
4138
=====================
4139
225
4140
226
ENHANCEMENTS:
4141
227
4176
262
4177
263
4178
264
bzr-0.0.2.1
4179
===========
4180
265
4181
266
PORTABILITY:
4182
267
4184
269
4185
270
4186
271
bzr-0.0.2 "black cube" 2005-03-31
4187
===================================
4188
272
4189
273
ENHANCEMENTS:
4190
274
4212
296
4213
297
4214
298
bzr-0.0.1 2005-03-26
4215
=====================
4216
299
4217
300
ENHANCEMENTS:
4218
301
4239
322
4240
323
4241
324
bzr-0.0.0.69 2005-03-22
4242
========================
4243
325
4244
326
ENHANCEMENTS:
4245
327
Loggerhead is a web-based interface for Breezy
Version: 2.0.1