To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to NEWS
- browse files at revision 2455
- compare with another revision
- download diff
- download tarball
- view history from revision 2455
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-04-25 06:50:22 UTC
- mfrom: (2292.1.34 bzr.rm_delete_working_file)
- Revision ID: pqm@pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
bzr rm removes the working file
- files added:
- .bzrignore
- bzrlib
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/bundle
- bzrlib/bundle/old
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins
- bzrlib/plugins/launchpad
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/intertree_implementations
- bzrlib/tests/interversionedfile_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/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- bzrlib/version_info_formats
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- doc
- man1
- tools
- tools/doc_generate
- tools/win32
- files removed:
- .bzrignore
- notes
- tests
added
removed
NEWS
1
IN DEVELOPMENT
2
3
NOTES WHEN UPGRADING:
4
5
* ``bzr remove`` and ``bzr rm`` will now remove the working file, if
6
it could be recovered again.
7
This has been done for consistency with svn and the unix rm command.
8
The old ``remove`` behaviour has been retained in the new option
9
``bzr remove --keep``, which will just stop versioning the file,
10
but not delete it.
11
``bzr remove --force`` have been added which will always delete the
12
files.
13
``bzr remove`` is also more verbose.
14
(Marius Kruger, #82602)
15
16
IMPROVEMENTS:
17
18
* Merge directives can now be supplied as input to `merge` and `pull`,
19
like bundles can. (Aaron Bentley)
20
21
* Sending the SIGQUIT signal to bzr, which can be done on Unix by
22
pressing Control-Backslash, drops bzr into a debugger. Type `c`
23
to continue. This can be disabled by setting the environment variable
24
BZR_SIGQUIT_PDB=0. (Martin Pool)
25
26
* selftest now supports --list-only to list tests instead of running
27
them. (Ian Clatworthy)
28
29
* selftest now supports --exclude PATTERN (or -x PATTERN) to exclude
30
tests with names that match that regular expression.
31
(Ian Clatworthy, #102679)
32
33
* selftest now supports --randomize SEED to run tests in a random order.
34
SEED is typically the value 'now' meaning 'use the current time'.
35
(Ian Clatworthy, #102686)
36
37
* New option ``--fixes`` to commit, which stores bug fixing annotations as
38
revision properties. Built-in support for Launchpad, Debian, Trac and
39
Bugzilla bug trackers. (Jonathan Lange, James Henstridge, Robert Collins)
40
41
* New API, ``bzrlib.bugtracker.tracker_registry``, for adding support for
42
other bug trackers to ``fixes``. (Jonathan Lange, James Henstridge,
43
Robert Collins)
44
45
* ``selftest`` has new short options ``-f`` and ``-1``. (Martin
46
Pool)
47
48
* ``bzrlib.tsort.MergeSorter`` optimizations. Change the inner loop
49
into using local variables instead of going through ``self._var``.
50
Improves the time to ``merge_sort`` a 10k revision graph by
51
approximately 40% (~700->400ms). (John Arbash Meinel)
52
53
* ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
54
(Robert Collins)
55
56
* ``bzr help`` now provides cross references to other help topics using
57
the _see_also facility on command classes. Likewise the bzr_man
58
documentation, and the bzr.1 man page also include this information.
59
(Robert Collins)
60
61
* Tags are now included in logs, that use the long log formatter.
62
(Erik Bågfors, Alexander Belchenko)
63
64
* ``bzr help`` provides a clearer message when a help topic cannot be
65
found (fixes bug 107656). (Robert Collins)
66
67
* ``bzr help`` now accepts optional prefixes for command help. The help
68
for all commands can now be found at ``bzr help commands/COMMANDNAME``
69
as well as ``bzr help COMMANDNAME`` (which only works for commands
70
where the name is not the same as a more general help topic).
71
(Robert Collins)
72
73
* ``bzr help PLUGINNAME`` will now return the module docstring from the
74
plugin PLUGINNAME fixing bug 50408. (Robert Collins)
75
76
* New help topic ``urlspec`` which lists the availables transports.
77
(Goffredo Baroncelli)
78
79
* doc/server.txt updated to document the default bzr:// port (fixes
80
#107125) and also update the blurb about the hpss' current status.
81
(Robert Collins).
82
83
* ``bzr serve`` now listens on interface 0.0.0.0 by default, making it
84
serve out to the local LAN (and anyone in the world that can reach the
85
machine running ``bzr serve``. (Robert Collins, #98918)
86
87
INTERNALS:
88
89
* bzrlib API compatability with 0.8 has been dropped, cleaning up some
90
code paths. (Robert Collins)
91
92
* Change the format of chroot urls so that they can be safely manipulated
93
by generic url utilities without causing the resulting urls to have
94
escaped the chroot. A side effect of this is that creating a chroot
95
requires an explicit action using a ChrootServer.
96
(Robert Collins, Andrew Bennetts)
97
98
* Deprecate Branch.get_root_id() because branches don't have root ids,
99
rather than fixing bug #96847. (Aaron Bentley)
100
101
* WorkingTree.apply_inventory_delta provides a better alternative to
102
WorkingTree._write_inventory. (Aaron Bentley)
103
104
* Convenience method TestCase.expectFailure ensures that known failures
105
do not silently pass. (Aaron Bentley)
106
107
* Transport.local_abspath now raises NotLocalUrl rather than
108
TransportNotPossible. (Martin Pool, Ian Clatworthy)
109
110
* New SmartServer hooks facility. There are two initial hooks documented
111
in bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
112
plugins to execute code upon server startup and shutdown.
113
(Robert Collins).
114
115
* SmartServer in standalone mode will now close its listening socket
116
when it stops, rather than waiting for garbage collection. This primarily
117
fixes test suite hangs when a test tries to connect to a shutdown server.
118
It may also help improve behaviour when dealing with a server running
119
on a specific port (rather than dynamically assigned ports).
120
(Robert Collins)
121
122
* Move most SmartServer code into a new package, bzrlib/smart.
123
bzrlib/transport/remote.py contains just the Transport classes that used
124
to be in bzrlib/transport/smart.py. (Andrew Bennetts)
125
126
* Renamed SmartTransport (and subclasses like SmartTCPTransport) to
127
RemoteTransport (and subclasses to RemoteTCPTransport, etc). This is more
128
consistent with its new home in bzrlib/transport/remote.py, and because
129
it's not really a "smart" transport, just one that does file operations
130
via remote procedure calls. (Andrew Bennetts)
131
132
* The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
133
``Branch`` now accept a ``token`` keyword argument, so that separate
134
instances of those objects can share a lock if it has the right token.
135
(Andrew Bennetts, Robert Collins)
136
137
* New method 'get_branch_reference' on 'BzrDir' allows the detection of
138
branch references - which the smart server component needs.
139
140
* The Repository API ``make_working_trees`` is now permitted to return
141
False when ``set_make_working_trees`` is not implemented - previously
142
an unimplemented ``set_make_working_trees`` implied the result True
143
from ``make_working_trees``. This has been changed to accomodate the
144
smart server, where it does not make sense (at this point) to ever
145
make working trees by default. (Robert Collins)
146
147
* Command objects can now declare related help topics by having _see_also
148
set to a list of related topic. (Robert Collins)
149
150
* ``bzrlib.help`` now delegates to the Command class for Command specific
151
help. (Robert Collins)
152
153
* New class 'TransportListRegistry', derived from the Registry class, which
154
simplifies tracking the available Transports. (Goffredo Baroncelli)
155
156
* New function ``Branch.get_revision_id_to_revno_map`` which will
157
return a dictionary mapping revision ids to dotted revnos. Since
158
dotted revnos are defined in the context of the branch tip, it makes
159
sense to generate them from a ``Branch`` object.
160
(John Arbash Meinel)
161
162
BUGFIXES:
163
164
* Don't fail bundle selftest if email has 'two' embedded.
165
(#98510, Ian Clatworthy)
166
167
* Remove ``--verbose`` from ``bzr bundle``. It didn't work anyway.
168
(Robert Widhopf-Fenk, #98591)
169
170
* Remove ``--basis`` from the checkout/branch commands - it didn't work
171
properly and is no longer beneficial. Fixes #53675 and #43486.
172
(Robert Collins)
173
174
* Don't produce encoding error when adding duplicate files.
175
(Aaron Bentley)
176
177
* Fix ``InterDirstateTre._iter_changes`` to handle when we come across
178
an empty versioned directory, which now has files in it.
179
(John Arbash Meinel, #104257)
180
181
* Teach ``common_ancestor`` to shortcut when the tip of one branch is
182
inside the ancestry of the other. Saves a lot of graph processing
183
(with an ancestry of 16k revisions, ``bzr merge ../already-merged``
184
changes from 2m10s to 13s). (John Arbash Meinel, #103757)
185
186
* Fix ``show_diff_trees`` to handle the case when a file is modified,
187
and the containing directory is renamed. (The file path is different
188
in this versus base, but it isn't marked as a rename).
189
(John Arbash Meinel, #103870)
190
191
* FTP now works even when the FTP server does not support atomic rename.
192
(Aaron Bentley, #89436)
193
194
* Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
195
196
* "dirstate" and "dirstate-tags" formats now produce branches compatible
197
with old versions of bzr. (Aaron Bentley, #107168))
198
199
* Handle moving a directory when children have been added, removed,
200
and renamed. (John Arbash Meinel, #105479)
201
202
TESTING:
203
204
* Added ``bzrlib.strace.strace`` which will strace a single callable and
205
return a StraceResult object which contains just the syscalls involved
206
in running it. (Robert Collins)
207
208
* New test method ``reduceLockdirTimeout`` to drop the default (ui-centric)
209
default time down to one suitable for tests. (Andrew Bennetts)
210
211
* Add new vfs_transport_factory attribute on tests which provides the
212
common vfs backing for both the readonly and readwrite transports.
213
This allows the RemoteObject tests to back onto local disk or memory,
214
and use the existing transport_server attribute all tests know about
215
to be the smart server transport. This in turn allows tests to
216
differentiate between 'transport to access the branch', and
217
'transport which is a VFS' - which matters in Remote* tests.
218
(Robert Collins, Andrew Bennetts)
219
220
* The ``make_branch_and_tree`` method for tests will now create a
221
lightweight checkout for the tree if the vfs_transport_factory is not
222
a LocalURLServer. (Robert Collins, Andrew Bennetts)
223
224
* Branch implementation tests have been audited to ensure that all urls
225
passed to Branch APIs use proper urls, except when local-disk paths
226
are intended. This is so that tests correctly access the test transport
227
which is often not equivalent to local disk in Remote* tests. As part
228
of this many tests were adjusted to remove dependencies on local disk
229
access.
230
(Robert Collins, Andrew Bennetts)
231
232
* Mark bzrlib.tests and bzrlib.tests.TestUtil as providing assertFOO helper
233
functions by adding a __unittest global attribute. (Robert Collins,
234
Andrew Bennetts, Martin Pool, Jonathan Lange)
235
236
bzr 0.15 2007-04-01
237
238
BUGFIXES:
239
240
* Handle incompatible repositories as a user issue when fetching.
241
(Aaron Bentley)
242
243
* Don't give a recommendation to upgrade when branching or
244
checking out a branch that contains an old-format working tree.
245
(Martin Pool)
246
247
bzr 0.15rc3 2007-03-26
248
249
CHANGES:
250
251
* A warning is now displayed when opening working trees in older
252
formats, to encourage people to upgrade to WorkingTreeFormat4.
253
(Martin Pool)
254
255
IMPROVEMENTS:
256
257
* HTTP redirections are now taken into account when a branch (or a
258
bundle) is accessed for the first time. A message is issued at each
259
redirection to inform the user. In the past, http redirections were
260
silently followed for each request which significantly degraded the
261
performances. The http redirections are not followed anymore by
262
default, instead a RedirectRequested exception is raised. For bzrlib
263
users needing to follow http redirections anyway,
264
bzrlib.transport.do_catching_redirections provide an easy transition
265
path. (vila)
266
267
INTERNALS:
268
269
* Added ``ReadLock.temporary_write_lock()`` to allow upgrading an OS read
270
lock to an OS write lock. Linux can do this without unlocking, Win32
271
needs to unlock in between. (John Arbash Meinel)
272
273
* New parameter ``recommend_upgrade`` to BzrDir.open_workingtree
274
to silence (when false) warnings about opening old formats.
275
(Martin Pool)
276
277
* Fix minor performance regression with bzr-0.15 on pre-dirstate
278
trees. (We were reading the working inventory too many times).
279
(John Arbash Meinel)
280
281
* Remove ``Branch.get_transaction()`` in favour of a simple cache of
282
``revision_history``. Branch subclasses should override
283
``_gen_revision_history`` rather than ``revision_history`` to make use of
284
this cache, and call ``_clear_revision_history_cache`` and
285
``_cache_revision_history`` at appropriate times. (Andrew Bennetts)
286
287
BUGFIXES:
288
289
* Take smtp_server from user config into account.
290
(vila, #92195)
291
292
* Restore Unicode filename handling for versioned and unversioned files.
293
(John Arbash Meinel, #92608)
294
295
* Don't fail during ``bzr commit`` if a file is marked removed, and
296
the containing directory is auto-removed. (John Arbash Meinel, #93681)
297
298
* ``bzr status FILENAME`` failed on Windows because of an uncommon
299
errno. (``ERROR_DIRECTORY == 267 != ENOTDIR``).
300
(Wouter van Heyst, John Arbash Meinel, #90819)
301
302
* ``bzr checkout source`` should create a local branch in the same
303
format as source. (John Arbash Meinel, #93854)
304
305
* ``bzr commit`` with a kind change was failing to update the
306
last-changed-revision for directories. The
307
InventoryDirectory._unchanged only looked at the parent_id and name,
308
ignoring the fact that the kind could have changed, too.
309
(John Arbash Meinel, #90111)
310
311
* ``bzr mv dir/subdir other`` was incorrectly updating files inside
312
the directory. So that there was a chance it would break commit,
313
etc. (John Arbash Meinel, #94037)
314
315
* Correctly handles mutiple permanent http redirections.
316
(vila, #88780)
317
318
319
bzr 0.15rc2 2007-03-14
320
321
NOTES WHEN UPGRADING:
322
323
* Release 0.15rc2 of bzr changes the ``bzr init-repo`` command to
324
default to ``--trees`` instead of ``--no-trees``.
325
Existing shared repositories are not affected.
326
327
IMPROVEMENTS:
328
329
* New ``merge-directive`` command to generate machine- and human-readable
330
merge requests. (Aaron Bentley)
331
332
* New ``submit:`` revision specifier makes it easy to diff against the
333
common ancestor with the submit location (Aaron Bentley)
334
335
* Added support for Putty's SSH implementation. (Dmitry Vasiliev)
336
337
* Added ``bzr status --versioned`` to report only versioned files,
338
not unknowns. (Kent Gibson)
339
340
* Merge now autodetects the correct line-ending style for its conflict
341
markers. (Aaron Bentley)
342
343
INTERNALS:
344
345
* Refactored SSH vendor registration into SSHVendorManager class.
346
(Dmitry Vasiliev)
347
348
BUGFIXES:
349
350
* New ``--numbered-dirs`` option to ``bzr selftest`` to use
351
numbered dirs for TestCaseInTempDir. This is default behavior
352
on Windows. Anyone can force named dirs on Windows
353
with ``--no-numbered-dirs``. (Alexander Belchenko)
354
355
* Fix ``RevisionSpec_revid`` to handle the Unicode strings passed in
356
from the command line. (Marien Zwart, #90501)
357
358
* Fix ``TreeTransform._iter_changes`` when both the source and
359
destination are missing. (Aaron Bentley, #88842)
360
361
* Fix commit of merges with symlinks in dirstate trees.
362
(Marien Zwart)
363
364
* Switch the ``bzr init-repo`` default from --no-trees to --trees.
365
(Wouter van Heyst, #53483)
366
367
368
bzr 0.15rc1 2007-03-07
369
370
SURPRISES:
371
372
* The default disk format has changed. Please run 'bzr upgrade' in your
373
working trees to upgrade. This new default is compatible for network
374
operations, but not for local operations. That is, if you have two
375
versions of bzr installed locally, after upgrading you can only use the
376
bzr 0.15 version. This new default does not enable tags or nested-trees
377
as they are incompatible with bzr versions before 0.15 over the network.
378
379
* For users of bzrlib: Two major changes have been made to the working tree
380
api in bzrlib. The first is that many methods and attributes, including
381
the inventory attribute, are no longer valid for use until one of
382
lock_read/lock_write/lock_tree_write has been called, and become invalid
383
again after unlock is called. This has been done to improve performance
384
and correctness as part of the dirstate development. (Robert Collins,
385
John A Meinel, Martin Pool, and others).
386
387
* For users of bzrlib: The attribute 'tree.inventory' should be considered
388
readonly. Previously it was possible to directly alter this attribute, or
389
its contents, and have the tree notice this. This has been made
390
unsupported - it may work in some tree formats, but in the newer dirstate
391
format such actions will have no effect and will be ignored, or even
392
cause assertions. All operations possible can still be carried out by a
393
combination of the tree API, and the bzrlib.transform API. (Robert
394
Collins, John A Meinel, Martin Pool, and others).
395
396
IMPROVEMENTS:
397
398
* Support for OS Windows 98. Also .bzr.log on any windows system
399
saved in My Documents folder. (Alexander Belchenko)
400
401
* ``bzr mv`` enhanced to support already moved files.
402
In the past the mv command would have failed if the source file doesn't
403
exist. In this situation ``bzr mv`` would now detect that the file has
404
already moved and update the repository accordingly, if the target file
405
does exist.
406
A new option ``--after`` has been added so that if two files already
407
exist, you could notify Bazaar that you have moved a (versioned) file
408
and replaced it with another. Thus in this case ``bzr move --after``
409
will only update the Bazaar identifier.
410
(Steffen Eichenberg, Marius Kruger)
411
412
* ``ls`` now works on treeless branches and remote branches.
413
(Aaron Bentley)
414
415
* ``bzr help global-options`` describes the global options.
416
(Aaron Bentley)
417
418
* ``bzr pull --overwrite`` will now correctly overwrite checkouts.
419
(Robert Collins)
420
421
* Files are now allowed to change kind (e.g. from file to symlink).
422
Supported by ``commit``, ``revert`` and ``status``
423
(Aaron Bentley)
424
425
* ``inventory`` and ``unknowns`` hidden in favour of ``ls``
426
(Aaron Bentley)
427
428
* ``bzr help checkouts`` descibes what checkouts are and some possible
429
uses of them. (James Westby, Aaron Bentley)
430
431
* A new ``-d`` option to push, pull and merge overrides the default
432
directory. (Martin Pool)
433
434
* Branch format 6: smaller, and potentially faster than format 5. Supports
435
"append_history_only" mode, where the log view and revnos do not change,
436
except by being added to. Stores policy settings in
437
".bzr/branch/branch.conf".
438
439
* append_only branches: Format 6 branches may be configured so that log
440
view and revnos are always consistent. Either create the branch using
441
"bzr init --append-revisions-only" or edit the config file as descriped
442
in docs/configuration.txt.
443
444
* rebind: Format 6 branches retain the last-used bind location, so if you
445
"bzr unbind", you can "bzr bind" to bind to the previously-selected
446
bind location.
447
448
* Builtin tags support, created and deleted by the ``tag`` command and
449
stored in the branch. Tags can be accessed with the revisionspec
450
``-rtag:``, and listed with ``bzr tags``. Tags are not versioned
451
at present. Tags require a network incompatible upgrade. To perform this
452
upgrade, run ``bzr upgrade --dirstate-tags`` in your branch and
453
repositories. (Martin Pool)
454
455
* The bzr:// transport now has a well-known port number, 4155, which it will
456
use by default. (Andrew Bennetts, Martin Pool)
457
458
* Bazaar now looks for user-installed plugins before looking for site-wide
459
plugins. (Jonathan Lange)
460
461
* ``bzr resolve`` now detects and marks resolved text conflicts.
462
(Aaron Bentley)
463
464
INTERNALS:
465
466
* Internally revision ids and file ids are now passed around as utf-8
467
bytestrings, rather than treating them as Unicode strings. This has
468
performance benefits for Knits, since we no longer need to decode the
469
revision id for each line of content, nor for each entry in the index.
470
This will also help with the future dirstate format.
471
(John Arbash Meinel)
472
473
* Reserved ids (any revision-id ending in a colon) are rejected by
474
versionedfiles, repositories, branches, and working trees
475
(Aaron Bentley)
476
477
* Minor performance improvement by not creating a ProgressBar for
478
every KnitIndex we create. (about 90ms for a bzr.dev tree)
479
(John Arbash Meinel)
480
481
* New easier to use Branch hooks facility. There are five initial hooks,
482
all documented in bzrlib.branch.BranchHooks.__init__ - 'set_rh',
483
'post_push', 'post_pull', 'post_commit', 'post_uncommit'. These hooks
484
fire after the matching operation on a branch has taken place, and were
485
originally added for the branchrss plugin. (Robert Collins)
486
487
* New method ``Branch.push()`` which should be used when pushing from a
488
branch as it makes performance and policy decisions to match the UI
489
level command ``push``. (Robert Collins).
490
491
* Add a new method ``Tree.revision_tree`` which allows access to cached
492
trees for arbitrary revisions. This allows the in development dirstate
493
tree format to provide access to the callers to cached copies of
494
inventory data which are cheaper to access than inventories from the
495
repository.
496
(Robert Collins, Martin Pool)
497
498
* New Branch.last_revision_info method, this is being done to allow
499
optimization of requests for both the number of revisions and the last
500
revision of a branch with smartservers and potentially future branch
501
formats. (Wouter van Heyst, Robert Collins)
502
503
* Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not
504
yet been loaded by load_plugins(). This allows plugins to depend on each
505
other for code reuse without requiring users to perform file-renaming
506
gymnastics. (Robert Collins)
507
508
* New Repository method 'gather_stats' for statistic data collection.
509
This is expected to grow to cover a number of related uses mainly
510
related to bzr info. (Robert Collins)
511
512
* Log formatters are now managed with a registry.
513
``log.register_formatter`` continues to work, but callers accessing
514
the FORMATTERS dictionary directly will not.
515
516
* Allow a start message to be passed to the ``edit_commit_message``
517
function. This will be placed in the message offered to the user
518
for editing above the separator. It allows a template commit message
519
to be used more easily. (James Westby)
520
521
* ``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
522
you pass a Unicode string rather than an 8-bit string. Callers need
523
to be updated to encode first. (John Arbash Meinel)
524
525
* Branch.push, pull, merge now return Result objects with information
526
about what happened, rather than a scattering of various methods. These
527
are also passed to the post hooks. (Martin Pool)
528
529
* File formats and architecture is in place for managing a forest of trees
530
in bzr, and splitting up existing trees into smaller subtrees, and
531
finally joining trees to make a larger tree. This is the first iteration
532
of this support, and the user-facing aspects still require substantial
533
work. If you wish to experiment with it, use ``bzr upgrade
534
--dirstate-with-subtree`` in your working trees and repositories.
535
You can use the hidden commands ``split`` and ``join`` and to create
536
and manipulate nested trees, but please consider using the nested-trees
537
branch, which contains substantial UI improvements, instead.
538
http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/
539
(Aaron Bentley, Martin Pool, Robert Collins).
540
541
BUGFIXES:
542
543
* ``bzr annotate`` now uses dotted revnos from the viewpoint of the
544
branch, rather than the last changed revision of the file.
545
(John Arbash Meinel, #82158)
546
547
* Lock operations no longer hang if they encounter a permission problem.
548
(Aaron Bentley)
549
550
* ``bzr push`` can resume a push that was canceled before it finished.
551
Also, it can push even if the target directory exists if you supply
552
the ``--use-existing-dir`` flag.
553
(John Arbash Meinel, #30576, #45504)
554
555
* Fix http proxy authentication when user and an optional
556
password appears in the ``*_proxy`` vars. (Vincent Ladeuil,
557
#83954).
558
559
* ``bzr log branch/file`` works for local treeless branches
560
(Aaron Bentley, #84247)
561
562
* Fix problem with UNC paths on Windows 98. (Alexander Belchenko, #84728)
563
564
* Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE),
565
and on win32 along the PATH. (Alexander Belchenko, #82086)
566
567
* ``bzr init`` works with unicode argument LOCATION.
568
(Alexander Belchenko, #85599)
569
570
* Raise DependencyNotPresent if pycurl do not support https. (Vincent
571
Ladeuil, #85305)
572
573
* Invalid proxy env variables should not cause a traceback.
574
(Vincent Ladeuil, #87765)
575
576
* Ignore patterns normalised to use '/' path separator.
577
(Kent Gibson, #86451)
578
579
* bzr rocks. It sure does! Fix case. (Vincent Ladeuil, #78026)
580
581
* Fix bzrtools shelve command for removed lines beginning with "--"
582
(Johan Dahlberg, #75577)
583
584
TESTING:
585
586
* New ``--first`` option to ``bzr selftest`` to run specified tests
587
before the rest of the suite. (Martin Pool)
588
589
590
bzr 0.14 2007-01-23
591
592
IMPROVEMENTS:
593
594
* ``bzr help global-options`` describes the global options. (Aaron Bentley)
595
596
BUG FIXES:
597
598
* Skip documentation generation tests if the tools to do so are not
599
available. Fixes running selftest for installled copies of bzr.
600
(John Arbash Meinel, #80330)
601
602
* Fix the code that discovers whether bzr is being run from it's
603
working tree to handle the case when it isn't but the directory
604
it is in is below a repository. (James Westby, #77306)
605
606
607
bzr 0.14rc1 2007-01-16
608
609
IMPROVEMENTS:
610
611
* New connection: ``bzr+http://`` which supports tunnelling the smart
612
protocol over an HTTP connection. If writing is enabled on the bzr
613
server, then you can write over the http connection.
614
(Andrew Bennetts, John Arbash Meinel)
615
616
* Aliases now support quotation marks, so they can contain whitespace
617
(Marius Kruger)
618
619
* PyCurlTransport now use a single curl object. By specifying explicitly
620
the 'Range' header, we avoid the need to use two different curl objects
621
(and two connections to the same server). (Vincent Ladeuil)
622
623
* ``bzr commit`` does not prompt for a message until it is very likely to
624
succeed. (Aaron Bentley)
625
626
* ``bzr conflicts`` now takes --text to list pathnames of text conflicts
627
(Aaron Bentley)
628
629
* Fix ``iter_lines_added_or_present_in_versions`` to use a set instead
630
of a list while checking if a revision id was requested. Takes 10s
631
off of the ``fileids_affected_by_revision_ids`` time, which is 10s
632
of the ``bzr branch`` time. Also improve ``fileids_...`` time by
633
filtering lines with a regex rather than multiple ``str.find()``
634
calls. (saves another 300ms) (John Arbash Meinel)
635
636
* Policy can be set for each configuration key. This allows keys to be
637
inherited properly across configuration entries. For example, this
638
should enable you to do::
639
640
[/home/user/project]
641
push_location = sftp://host/srv/project/
642
push_location:policy = appendpath
643
644
And then a branch like ``/home/user/project/mybranch`` should get an
645
automatic push location of ``sftp://host/srv/project/mybranch``.
646
(James Henstridge)
647
648
* Added ``bzr status --short`` to make status report svn style flags
649
for each file. For example::
650
651
$ bzr status --short
652
A foo
653
A bar
654
D baz
655
? wooley
656
657
* 'bzr selftest --clean-output' allows easily clean temporary tests
658
directories without running tests. (Alexander Belchenko)
659
660
* ``bzr help hidden-commands`` lists all hidden commands. (Aaron Bentley)
661
662
* ``bzr merge`` now has an option ``--pull`` to fall back to pull if
663
local is fully merged into remote. (Jan Hudec)
664
665
* ``bzr help formats`` describes available directory formats. (Aaron Bentley)
666
667
INTERNALS:
668
669
* A few tweaks directly to ``fileids_affected_by_revision_ids`` to
670
help speed up processing, as well allowing to extract unannotated
671
lines. Between the two ``fileids_affected_by_revision_ids`` is
672
improved by approx 10%. (John Arbash Meinel)
673
674
* Change Revision serialization to only write out millisecond
675
resolution. Rather than expecting floating point serialization to
676
preserve more resolution than we need. (Henri Weichers, Martin Pool)
677
678
* Test suite ends cleanly on Windows. (Vincent Ladeuil)
679
680
* When 'encoding_type' attribute of class Command is equal to 'exact',
681
force sys.stdout to be a binary stream on Windows, and therefore
682
keep exact line-endings (without LF -> CRLF conversion).
683
(Alexander Belchenko)
684
685
* Single-letter short options are no longer globally declared. (Martin
686
Pool)
687
688
* Before using detected user/terminal encoding bzr should check
689
that Python has corresponding codec. (Alexander Belchenko)
690
691
* Formats for end-user selection are provided via a FormatRegistry (Aaron Bentley)
692
693
BUG FIXES:
694
695
* ``bzr missing --verbose`` was showing adds/removals in the wrong
696
direction. (John Arbash Meinel)
697
698
* ``bzr annotate`` now defaults to showing dotted revnos for merged
699
revisions. It cuts them off at a depth of 12 characters, but you can
700
supply ``--long`` to see the full number. You can also use
701
``--show-ids`` to display the original revision ids, rather than
702
revision numbers and committer names. (John Arbash Meinel, #75637)
703
704
* bzr now supports Win32 UNC path (e.g. \\HOST\path).
705
(Alexander Belchenko, #57869)
706
707
* Win32-specific: output of cat, bundle and diff commands don't mangle
708
line-endings (Alexander Belchenko, #55276)
709
710
* Replace broken fnmatch based ignore pattern matching with custom pattern
711
matcher.
712
(Kent Gibson, Jan Hudec #57637)
713
714
* pycurl and urllib can detect short reads at different places. Update
715
the test suite to test more cases. Also detect http error code 416
716
which was raised for that specific bug. Also enhance the urllib
717
robustness by detecting invalid ranges (and pycurl's one by detecting
718
short reads during the initial GET). (Vincent Ladeuil, #73948)
719
720
* The urllib connection sharing interacts badly with urllib2
721
proxy setting (the connections didn't go thru the proxy
722
anymore). Defining a proper ProxyHandler solves the
723
problem. (Vincent Ladeuil, #74759)
724
725
* Use urlutils to generate relative URLs, not osutils
726
(Aaron Bentley, #76229)
727
728
* ``bzr status`` in a readonly directory should work without giving
729
lots of errors. (John Arbash Meinel, #76299)
730
731
* Mention the revisionspec topic for the revision option help.
732
(Wouter van Heyst, #31663)
733
734
* Allow plugins import from zip archives.
735
(Alexander Belchenko, #68124)
736
737
738
bzr 0.13 2006-12-05
739
740
No changes from 0.13rc1
741
742
bzr 0.13rc1 2006-11-27
743
744
IMPROVEMENTS:
745
746
* New command ``bzr remove-tree`` allows the removal of the working
747
tree from a branch.
748
(Daniel Silverstone)
749
750
* urllib uses shared keep-alive connections, so http
751
operations are substantially faster.
752
(Vincent Ladeuil, #53654)
753
754
* ``bzr export`` allows an optional branch parameter, to export a bzr
755
tree from some other url. For example:
756
``bzr export bzr.tar.gz http://bazaar-vcs.org/bzr/bzr.dev``
757
(Daniel Silverstone)
758
759
* Added ``bzr help topics`` to the bzr help system. This gives a
760
location for general information, outside of a specific command.
761
This includes updates for ``bzr help revisionspec`` the first topic
762
included. (Goffredo Baroncelli, John Arbash Meinel, #42714)
763
764
* WSGI-compatible HTTP smart server. See ``doc/http_smart_server.txt``.
765
(Andrew Bennetts)
766
767
* Knit files will now cache full texts only when the size of the
768
deltas is as large as the size of the fulltext. (Or after 200
769
deltas, whichever comes first). This has the most benefit on large
770
files with small changes, such as the inventory for a large project.
771
(eg For a project with 2500 files, and 7500 revisions, it changes
772
the size of inventory.knit from 11MB to 5.4MB) (John Arbash Meinel)
773
774
INTERNALS:
775
776
* New -D option given before the command line turns on debugging output
777
for particular areas. -Derror shows tracebacks on all errors.
778
(Martin Pool)
779
780
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
781
and remove benchmarks that take longer than 10min to run.
782
(John Arbash Meinel)
783
784
* Use ``time.time()`` instead of ``time.clock()`` to decide on
785
progress throttling. Because ``time.clock()`` is actually CPU time,
786
so over a high-latency connection, too many updates get throttled.
787
(John Arbash Meinel)
788
789
* ``MemoryTransport.list_dir()`` would strip the first character for
790
files or directories in root directory. (John Arbash Meinel)
791
792
* New method 'get_branch_reference' on 'BzrDir' allows the detection of
793
branch references - which the smart server component needs.
794
795
* New ``ChrootTransportDecorator``, accessible via the ``chroot+`` url
796
prefix. It disallows any access to locations above a set URL. (Andrew
797
Bennetts)
798
799
BUG FIXES:
800
801
* Now _KnitIndex properly decode revision ids when loading index data.
802
And optimize the knit index parsing code. (Dmitry Vasiliev, John
803
Arbash Meinel)
804
805
* ``bzrlib/bzrdir.py`` was directly referencing ``bzrlib.workingtree``,
806
without importing it. This prevented ``bzr upgrade`` from working
807
unless a plugin already imported ``bzrlib.workingtree``
808
(John Arbash Meinel, #70716)
809
810
* Suppress the traceback on invalid URLs (Vincent Ladeuil, #70803).
811
812
* Give nicer error message when an http server returns a 403
813
error code. (Vincent Ladeuil, #57644).
814
815
* When a multi-range http GET request fails, try a single
816
range one. If it fails too, forget about ranges. Remember that until
817
the death of the transport and propagates that to the clones.
818
(Vincent Ladeuil, #62276, #62029).
819
820
* Handles user/passwords supplied in url from command
821
line (for the urllib implementation). Don't request already
822
known passwords (Vincent Ladeuil, #42383, #44647, #48527)
823
824
* _KnitIndex.add_versions() dictionary compresses revision ids as they
825
are added. This fixes bug where fetching remote revisions records
826
them as full references rather than integers. (John Arbash Meinel,
827
#64789)
828
829
* ``bzr ignore`` strips trailing slashes in patterns.
830
Also ``bzr ignore`` rejects absolute paths. (Kent Gibson, #4559)
831
832
* ``bzr ignore`` takes multiple arguments. (Cheuksan Edward Wang, #29488)
833
834
* mv correctly handles paths that traverse symlinks.
835
(Aaron Bentley, #66964)
836
837
* Give nicer looking error messages when failing to connect over ssh.
838
(John Arbash Meinel, #49172)
839
840
* Pushing to a remote branch does not currently update the remote working
841
tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
842
machine now show that the working tree is out of date.
843
(Cheuksan Edward Wang #48136)
844
845
* Use patiencediff instead of difflib for determining deltas to insert
846
into knits. This avoids the O(N^3) behavior of difflib. Patience
847
diff should be O(N^2). (Cheuksan Edward Wang, #65714)
848
849
* Running ``bzr log`` on nonexistent file gives an error instead of the
850
entire log history. (Cheuksan Edward Wang #50793)
851
852
* ``bzr cat`` can look up contents of removed or renamed files. If the
853
pathname is ambiguous, i.e. the files in the old and new trees have
854
different id's, the default is the file in the new tree. The user can
855
use "--name-from-revision" to select the file in the old tree.
856
(Cheuksan Edward Wang, #30190)
857
858
TESTING:
859
860
* TestingHTTPRequestHandler really handles the Range header
861
(previously it was ignoring it and returning the whole file,).
862
863
bzr 0.12 2006-10-30
864
865
INTERNALS:
866
867
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
868
and remove benchmarks that take longer than 10min to run.
869
(John Arbash Meinel)
870
871
bzr 0.12rc1 2006-10-23
872
873
IMPROVEMENTS:
874
875
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
876
rather than just showing a decimal revision number for revisions on the
877
mainline. These revision numbers are not yet accepted as input into bzr
878
commands such as log, diff etc. (Robert Collins)
879
880
* revisions can now be specified using dotted-decimal revision numbers.
881
For instance, ``bzr diff -r 1.2.1..1.2.3``. (Robert Collins)
882
883
* ``bzr help commands`` output is now shorter (Aaron Bentley)
884
885
* ``bzr`` now uses lazy importing to reduce the startup time. This has
886
a moderate effect on lots of actions, especially ones that have
887
little to do. For example ``bzr rocks`` time is down to 116ms from
888
283ms. (John Arbash Meinel)
889
890
* New Registry class to provide name-to-object registry-like support,
891
for example for schemes where plugins can register new classes to
892
do certain tasks (e.g. log formatters). Also provides lazy registration
893
to allow modules to be loaded on request. (John Arbash Meinel, Adeodato
894
Simó)
895
896
API INCOMPATABILITY:
897
898
* LogFormatter subclasses show now expect the 'revno' parameter to
899
show() to be a string rather than an int. (Robert Collins)
900
901
INTERNALS:
902
903
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
904
can take a ``working_dir='foo'`` parameter, which will change directory
905
for the command. (John Arbash Meinel)
906
907
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
908
around a regex, which defers compilation until first use.
909
(John Arbash Meinel)
910
911
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
912
``--no-plugins`` parameter to ensure test reproducability, and avoid
913
problems with system-wide installed plugins. (John Arbash Meinel)
914
915
* Unique tree root ids are now supported. Newly created trees still
916
use the common root id for compatibility with bzr versions before 0.12.
917
(Aaron Bentley)
918
919
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
920
pass in inventory.ROOT_ID if you want the default root id value.
921
(Robert Collins, John Arbash Meinel)
922
923
* New method ``WorkingTree.flush()`` which will write the current memory
924
inventory out to disk. At the same time, read_working_inventory will
925
no longer trash the current tree inventory if it has been modified within
926
the current lock, and the tree will now ``flush()`` automatically on
927
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
928
advantage of this functionality. (Robert Collins, John Arbash Meinel)
929
930
* ``bzrlib.tsort.merge_sorted`` now accepts ``generate_revnos``. This
931
parameter will cause it to add another column to its output, which
932
contains the dotted-decimal revno for each revision, as a tuple.
933
(Robert Collins)
934
935
* ``LogFormatter.show_merge`` is deprecated in favour of
936
``LogFormatter.show_merge_revno``. (Robert Collins)
937
938
BUG FIXES:
939
940
* Avoid circular imports by creating a deprecated function for
941
``bzrlib.tree.RevisionTree``. Callers should have been using
942
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel,
943
#63360, #66349)
944
945
* Don't use ``socket.MSG_WAITALL`` as it doesn't exist on all
946
platforms. (Martin Pool, #66356)
947
948
* Don't require ``Content-Type`` in range responses. Assume they are a
949
single range if ``Content-Type`` does not exist.
950
(John Arbash Meinel, #62473)
951
952
* bzr branch/pull no longer complain about progress bar cleanup when
953
interrupted during fetch. (Aaron Bentley, #54000)
954
955
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
956
the basis inventory, rather than going through the repository. This
957
allows us to have 1 inventory read, and 2 inventory writes when
958
committing a new tree. (John Arbash Meinel)
959
960
* When reverting, files that are not locally modified that do not exist
961
in the target are deleted, not just unversioned (Aaron Bentley)
962
963
* When trying to acquire a lock, don't fail immediately. Instead, try
964
a few times (up to 1 hour) before timing out. Also, report why the
965
lock is unavailable (John Arbash Meinel, #43521, #49556)
966
967
* Leave HttpTransportBase daughter classes decides how they
968
implement cloning. (Vincent Ladeuil, #61606)
969
970
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
971
972
* If a commit fails, the commit message is stored in a file at the root of
973
the tree for later commit. (Cheuksan Edward Wang, Stefan Metzmacher,
974
#32054)
975
976
TESTING:
977
978
* New test base class TestCaseWithMemoryTransport offers memory-only
979
testing facilities: its not suitable for tests that need to mutate disk
980
state, but most tests should not need that and should be converted to
981
TestCaseWithMemoryTransport. (Robert Collins)
982
983
* ``TestCase.make_branch_and_memory_tree`` now takes a format
984
option to set the BzrDir, Repository and Branch formats of the
985
created objects. (Robert Collins, John Arbash Meinel)
986
987
bzr 0.11 2006-10-02
988
989
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
990
991
bzr 0.11rc2 2006-09-27
992
993
BUG FIXES:
994
995
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
996
997
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
998
Arbash Meinel).
999
1000
bzr 0.11rc1 2006-09-25
1001
1002
IMPROVEMENTS:
1003
1004
* Knit files now wait to create their contents until the first data is
1005
added. The old code used to create an empty .knit and a .kndx with just
1006
the header. However, this caused a lot of extra round trips over sftp.
1007
This can change the time for ``bzr push`` to create a new remote branch
1008
from 160s down to 100s. This also affects ``bzr commit`` performance when
1009
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
1010
down to 40s (John Arbash Meinel, #44692)
1011
1012
* When an entire subtree has been deleted, commit will now report that
1013
just the top of the subtree has been deleted, rather than reporting
1014
all the individual items. (Robert Collins)
1015
1016
* Commit performs one less XML parse. (Robert Collins)
1017
1018
* ``bzr checkout`` now operates on readonly branches as well
1019
as readwrite branches. This fixes bug #39542. (Robert Collins)
1020
1021
* ``bzr bind`` no longer synchronises history with the master branch.
1022
Binding should be followed by an update or push to synchronise the
1023
two branches. This is closely related to the fix for bug #39542.
1024
(Robert Collins)
1025
1026
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
1027
objects. This allows all imports to stay at the global scope, but
1028
modules will not actually be imported if they are not used.
1029
(John Arbash Meinel)
1030
1031
* Support bzr:// and bzr+ssh:// urls to work with the new RPC-based
1032
transport which will be used with the upcoming high-performance smart
1033
server. The new command ``bzr serve`` will invoke bzr in server mode,
1034
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
1035
Pool)
1036
1037
* New command ``bzr version-info`` which can be used to get a summary
1038
of the current state of the tree. This is especially useful as part
1039
of a build commands. See ``doc/version_info.txt`` for more information
1040
(John Arbash Meinel)
1041
1042
BUG FIXES:
1043
1044
* 'bzr inventory [FILE...]' allows restricting the file list to a
1045
specific set of files. (John Arbash Meinel, #3631)
1046
1047
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
1048
1049
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
1050
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
1051
reading a nested Stanza. (John Arbash Meinel)
1052
1053
* Transform._set_mode() needs to stat the right file.
1054
(John Arbash Meinel, #56549)
1055
1056
* Raise WeaveFormatError rather than StopIteration when trying to read
1057
an empty Weave file. (John Arbash Meinel, #46871)
1058
1059
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
1060
(Vincent Ladeuil, #59835)
1061
1062
* Handle boundary="" lines properly to allow access through a Squid proxy.
1063
(John Arbash Meinel, #57723)
1064
1065
* revert now removes newly-added directories (Aaron Bentley, #54172)
1066
1067
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
1068
isn't a working tree. (David Allouche, #40679)
1069
1070
* Give nicer error messages when a user supplies an invalid --revision
1071
parameter. (John Arbash Meinel, #55420)
1072
1073
* Handle when LANG is not recognized by python. Emit a warning, but
1074
just revert to using 'ascii'. (John Arbash Meinel, #35392)
1075
1076
* Don't use preexec_fn on win32, as it is not supported by subprocess.
1077
(John Arbash Meinel)
1078
1079
* Skip specific tests when the dependencies aren't met. This includes
1080
some ``setup.py`` tests when ``python-dev`` is not available, and
1081
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
1082
1083
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
1084
the system. (Andrew Bennetts, John Arbash Meinel)
1085
1086
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
1087
other branch, and will not push or pull between the two branches.
1088
API users will need to perform a push or pull or update operation if they
1089
require branch synchronisation to take place. (Robert Collins, #47344)
1090
1091
* When creating a tarball or zipfile export, export unicode names as utf-8
1092
paths. This may not work perfectly on all platforms, but has the best
1093
chance of working in the common case. (John Arbash Meinel, #56816)
1094
1095
* When committing, only files that exist in working tree or basis tree
1096
may be specified (Aaron Bentley, #50793)
1097
1098
PORTABILITY:
1099
1100
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
1101
1102
INTERNALS:
1103
1104
* TestCaseInTempDir now creates a separate directory for HOME, rather
1105
than having HOME set to the same location as the working directory.
1106
(John Arbash Meinel)
1107
1108
* run_bzr_subprocess() can take an optional 'env_changes={}' parameter,
1109
which will update os.environ inside the spawned child. It also can
1110
take a 'universal_newlines=True', which helps when checking the output
1111
of the command. (John Arbash Meinel)
1112
1113
* Refactor SFTP vendors to allow easier re-use when ssh is used.
1114
(Andrew Bennetts)
1115
1116
* Transport.list_dir() and Transport.iter_files_recursive() should always
1117
return urlescaped paths. This is now tested (there were bugs in a few
1118
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
1119
1120
* New utility function symbol_versioning.deprecation_string. Returns the
1121
formatted string for a callable, deprecation format pair. (Robert Collins)
1122
1123
* New TestCase helper applyDeprecated. This allows you to call a callable
1124
which is deprecated without it spewing to the screen, just by supplying
1125
the deprecation format string issued for it. (Robert Collins)
1126
1127
* Transport.append and Transport.put have been deprecated in favor of
1128
.append_bytes, .append_file, .put_bytes, and .put_file. This removes the
1129
ambiguity in what type of object the functions take.
1130
Transport.non_atomic_put_{bytes,file} has also been added. Which works
1131
similarly to Transport.append() except for SFTP, it doesn't have a round
1132
trip when opening the file. Also, it provides functionality for creating
1133
a parent directory when trying to create a file, rather than raise
1134
NoSuchFile and forcing the caller to repeat their request.
1135
(John Arbash Meinel)
1136
1137
* WorkingTree has a new api ``unversion`` which allow the unversioning of
1138
entries by their file id. (Robert Collins)
1139
1140
* WorkingTree.pending_merges is deprecated. Please use the get_parent_ids
1141
(introduced in 0.10) method instead. (Robert Collins)
1142
1143
* WorkingTree has a new lock_tree_write method which locks the branch for
1144
read rather than write. This is appropriate for actions which only need
1145
the branch data for reference rather than mutation. A new decorator
1146
needs_tree_write_lock is provided in the workingtree module. Like the
1147
needs_read_lock and needs_write_lock decorators this allows static
1148
declaration of the locking requirements of a function to ensure that
1149
a lock is taken out for casual scripts. (Robert Collins, #54107)
1150
1151
* All WorkingTree methods which write to the tree, but not to the branch
1152
have been converted to use ``needs_tree_write_lock`` rather than
1153
``needs_write_lock``. Also converted is the revert, conflicts and tree
1154
transform modules. This provides a modest performance improvement on
1155
metadir style trees, due to the reduce lock-acquisition, and a more
1156
significant performance improvement on lightweight checkouts from
1157
remote branches, where trivial operations used to pay a significant
1158
penalty. It also provides the basis for allowing readonly checkouts.
1159
(Robert Collins)
1160
1161
* Special case importing the standard library 'copy' module. This shaves
1162
off 40ms of startup time, while retaining compatibility. See:
1163
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
1164
1165
* WorkingTree has a new parent class MutableTree which represents the
1166
specialisations of Tree which are able to be altered. (Robert Collins)
1167
1168
* New methods mkdir and put_file_bytes_non_atomic on MutableTree that
1169
mutate the tree and its contents. (Robert Collins)
1170
1171
* Transport behaviour at the root of the URL is now defined and tested.
1172
(Andrew Bennetts, Robert Collins)
1173
1174
TESTING:
1175
1176
* New test helper classs MemoryTree. This is typically accessed via
1177
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
1178
1179
* Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to
1180
continue running concurrently with a subprocess of bzr. (Andrew Bennetts,
1181
Robert Collins)
1182
1183
* Add a new method ``Transport.get_smart_client()``. This is provided to
1184
allow upgrades to a richer interface than the VFS one provided by
1185
Transport. (Andrew Bennetts, Martin Pool)
1186
1187
bzr 0.10 2006-08-29
1188
1189
IMPROVEMENTS:
1190
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
1191
tree. (Aaron Bentley)
1192
1193
* 'bzr add --file-ids-from' can be used to specify another path to use
1194
for creating file ids, rather than generating all new ones. Internally,
1195
the 'action' passed to smart_add_tree() can return file_ids that
1196
will be used, rather than having bzrlib generate new ones.
1197
(John Arbash Meinel, #55781)
1198
1199
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
1200
This will cache some of the intermediate trees, and decrease the
1201
setup time for benchmark tests. (John Arbash Meinel)
1202
1203
* Inverse forms are provided for all boolean options. For example,
1204
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
1205
1206
* Serialize out Inventories directly, rather than using ElementTree.
1207
Writing out a kernel sized inventory drops from 2s down to ~350ms.
1208
(Robert Collins, John Arbash Meinel)
1209
1210
BUG FIXES:
1211
1212
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
1213
1214
* Change LockDir so that if the lock directory doesn't exist when
1215
lock_write() is called, an attempt will be made to create it.
1216
(John Arbash Meinel, #56974)
1217
1218
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
1219
1220
* Active FTP transport now works as intended. (ghozzy, #56472)
1221
1222
* Really fix mutter() so that it won't ever raise a UnicodeError.
1223
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
1224
But it is a debugging log, not a real user file.
1225
(John Arbash Meinel, #56947, #53880)
1226
1227
* Change Command handle to allow Unicode command and options.
1228
At present we cannot register Unicode command names, so we will get
1229
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
1230
But that is better than a UnicodeError + a traceback.
1231
(John Arbash Meinel, #57123)
1232
1233
* Handle TZ=UTC properly when reading/writing revisions.
1234
(John Arbash Meinel, #55783, #56290)
1235
1236
* Use GPG_TTY to allow gpg --cl to work with gpg-agent in a pipeline,
1237
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
1238
1239
* External diff does the right thing for binaries even in foreign
1240
languages. (John Arbash Meinel, #56307)
1241
1242
* Testament handles more cases when content is unicode. Specific bug was
1243
in handling of revision properties. (John Arbash Meinel, Holger Krekel,
1244
#54723)
1245
1246
* The bzr selftest was failing on installed versions due to a bug in a new
1247
test helper. (John Arbash Meinel, Robert Collins, #58057)
1248
1249
INTERNALS:
1250
1251
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
1252
which can be used to cache the conversion between utf8 and Unicode.
1253
Especially helpful for some of the knit annotation code, which has to
1254
convert revision ids to utf8 to annotate lines in storage.
1255
(John Arbash Meinel)
1256
1257
* ``setup.py`` now searches the filesystem to find all packages which
1258
need to be installed. This should help make the life of packagers
1259
easier. (John Arbash Meinel)
1260
1261
bzr 0.9.0 2006-08-11
1262
1263
SURPRISES:
1264
1265
* The hard-coded built-in ignore rules have been removed. There are
1266
now two rulesets which are enforced. A user global one in
1267
~/.bazaar/ignore which will apply to every tree, and the tree
1268
specific one '.bzrignore'.
1269
~/.bazaar/ignore will be created if it does not exist, but with
1270
a more conservative list than the old default.
1271
This fixes bugs with default rules being enforced no matter what.
1272
The old list of ignore rules from bzr is available by
1273
running 'bzr ignore --old-default-rules'.
1274
(Robert Collins, Martin Pool, John Arbash Meinel)
1275
1276
* 'branches.conf' has been changed to 'locations.conf', since it can apply
1277
to more locations than just branch locations.
1278
(Aaron Bentley)
1279
1280
IMPROVEMENTS:
1281
1282
* The revision specifier "revno:" is extended to accept the syntax
1283
revno:N:branch. For example,
1284
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
1285
bzr.dev. (Matthieu Moy)
1286
1287
* Tests updates to ensure proper URL handling, UNICODE support, and
1288
proper printing when the user's terminal encoding cannot display
1289
the path of a file that has been versioned.
1290
``bzr branch`` can take a target URL rather than only a local directory.
1291
Branch.get_parent()/set_parent() now save a relative path if possible,
1292
and normalize the parent based on root, allowing access across
1293
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
1294
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
1295
#42517, #42514)
1296
1297
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
1298
Use terminal width for single-line logs from ``bzr log --line`` and
1299
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
1300
(Malone #3507)
1301
1302
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
1303
(Alexander Belchenko)
1304
1305
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
1306
1307
* Show the correct number of revisions pushed when pushing a new branch.
1308
(Robert Collins).
1309
1310
* 'bzr selftest' now shows a progress bar with the number of tests, and
1311
progress made. 'make check' shows tests in -v mode, to be more useful
1312
for the PQM status window. (Robert Collins).
1313
When using a progress bar, failed tests are printed out, rather than
1314
being overwritten by the progress bar until the suite finishes.
1315
(John Arbash Meinel)
1316
1317
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
1318
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1319
profile data for the individual profiled calls, allowing for fine
1320
grained analysis of performance.
1321
(Robert Collins, Martin Pool).
1322
1323
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
1324
where commit can take an appreciable time. (Robert Collins)
1325
1326
* 'bzr add' is now less verbose in telling you what ignore globs were
1327
matched by files being ignored. Instead it just tells you how many
1328
were ignored (because you might reasonably be expecting none to be
1329
ignored). 'bzr add -v' is unchanged and will report every ignored
1330
file. (Robert Collins).
1331
1332
* ftp now has a test server if medusa is installed. As part of testing,
1333
ftp support has been improved, including support for supplying a
1334
non-standard port. (John Arbash Meinel).
1335
1336
* 'bzr log --line' shows the revision number, and uses only the
1337
first line of the log message (#5162, Alexander Belchenko;
1338
Matthieu Moy)
1339
1340
* 'bzr status' has had the --all option removed. The 'bzr ls' command
1341
should be used to retrieve all versioned files. (Robert Collins)
1342
1343
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
1344
over email, and applied on the other end, while maintaining ancestry.
1345
This bundle can be applied with either 'bzr merge' or 'bzr pull',
1346
the same way you would apply another branch.
1347
(John Arbash Meinel, Aaron Bentley)
1348
1349
* 'bzr whoami' can now be used to set your identity from the command line,
1350
for a branch or globally. (Robey Pointer)
1351
1352
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
1353
(Michael Ellerman)
1354
1355
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
1356
(Aaron Bentley)
1357
1358
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
1359
Also updates things like 'http+pycurl://' if pycurl is not present.
1360
(John Arbash Meinel) (Malone #47821, #52204)
1361
1362
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
1363
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
1364
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
1365
1366
* Improve the help text for 'bzr diff' to explain what various options do.
1367
(John Arbash Meinel, #6391)
1368
1369
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
1370
revision 10. This makes -r10 more in line with what other commands do.
1371
'bzr uncommit' also now saves the pending merges of the revisions that
1372
were removed. So it is safe to uncommit after a merge, fix something,
1373
and commit again. (John Arbash Meinel, #32526, #31426)
1374
1375
* 'bzr init' now also works on remote locations.
1376
(Wouter van Heyst, #48904)
1377
1378
* HTTP support has been updated. When using pycurl we now support
1379
connection keep-alive, which reduces dns requests and round trips.
1380
And for both urllib and pycurl we support multi-range requests,
1381
which decreases the number of round-trips. Performance results for
1382
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
1383
http branching is now 2-3x faster, and ``bzr pull`` in an existing
1384
branch is as much as 4x faster.
1385
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
1386
1387
* Performance improvements for sftp. Branching and pulling are now up to
1388
2x faster. Utilize paramiko.readv() support for async requests if it
1389
is available (paramiko > 1.6) (John Arbash Meinel)
1390
1391
BUG FIXES:
1392
1393
* Fix shadowed definition of TestLocationConfig that caused some
1394
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
1395
Martin Pool)
1396
1397
* Fix unnecessary requirement of sign-my-commits that it be run from
1398
a working directory. (Martin Pool, Robert Collins)
1399
1400
* 'bzr push location' will only remember the push location if it succeeds
1401
in connecting to the remote location. (#49742, John Arbash Meinel)
1402
1403
* 'bzr revert' no longer toggles the executable bit on win32
1404
(#45010, John Arbash Meinel)
1405
1406
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
1407
1408
* sftp tests now work correctly on win32 if you have a newer paramiko
1409
(John Arbash Meinel)
1410
1411
* Cleanup win32 test suite, and general cleanup of places where
1412
file handles were being held open. (John Arbash Meinel)
1413
1414
* When specifying filenames for 'diff -r x..y', the name of the file in the
1415
working directory can be used, even if its name is different in both x
1416
and y.
1417
1418
* File-ids containing single- or double-quotes are handled correctly by
1419
push. (#52227, Aaron Bentley)
1420
1421
* Normalize unicode filenames to ensure cross-platform consistency.
1422
(John Arbash Meinel, #43689)
1423
1424
* The argument parser can now handle '-' as an argument. Currently
1425
no code interprets it specially (it is mostly handled as a file named
1426
'-'). But plugins, and future operations can use it.
1427
(John Arbash meinel, #50984)
1428
1429
* Bundles can properly read binary files with a plain '\r' in them.
1430
(John Arbash Meinel, #51927)
1431
1432
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
1433
1434
* Lots of win32 fixes (the test suite passes again).
1435
(John Arbash Meinel, #50155)
1436
1437
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
1438
1439
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
1440
1441
* Removals are only committed if they match the filespec (or if there is
1442
no filespec). (#46635, Aaron Bentley)
1443
1444
* smart-add recurses through all supplied directories
1445
(John Arbash Meinel, #52578)
1446
1447
* Make the bundle reader extra lines before and after the bundle text.
1448
This allows you to parse an email with the bundle inline.
1449
(John Arbash Meinel, #49182)
1450
1451
* Change the file id generator to squash a little bit more. Helps when
1452
working with long filenames on windows. (Also helps for unicode filenames
1453
not generating hidden files). (John Arbash Meinel, #43801)
1454
1455
* Restore terminal mode on C-c while reading sftp password. (#48923,
1456
Nicholas Allen, Martin Pool)
1457
1458
* Timestamps are rounded to 1ms, and revision entries can be recreated
1459
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
1460
1461
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
1462
use local paths, since it is user visible (John Arbash Meinel, #53653)
1463
1464
* ``bzr status foo`` when foo was unversioned used to cause a full delta
1465
to be generated (John Arbash Meinel, #53638)
1466
1467
* When reading revision properties, an empty value should be considered
1468
the empty string, not None (John Arbash Meinel, #47782)
1469
1470
* ``bzr diff --diff-options`` can now handle binary files being changed.
1471
Also, the output is consistent when --diff-options is not supplied.
1472
(John Arbash Meinel, #54651, #52930)
1473
1474
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
1475
1476
* Fix Branch.get_parent() to handle the case when the parent is not
1477
accessible (John Arbash Meinel, #52976)
1478
1479
INTERNALS:
1480
1481
* Combine the ignore rules into a single regex rather than looping over
1482
them to reduce the threshold where N^2 behaviour occurs in operations
1483
like status. (Jan Hudec, Robert Collins).
1484
1485
* Appending to bzrlib.DEFAULT_IGNORE is now deprecated. Instead, use
1486
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
1487
1488
* 'bzr push' should only push the ancestry of the current revision, not
1489
all of the history in the repository. This is especially important for
1490
shared repositories. (John Arbash Meinel)
1491
1492
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
1493
rather than randomly walking the inventories. (John Arbash Meinel)
1494
1495
* Doctests are now run in temporary directories which are cleaned up when
1496
they finish, rather than using special ScratchDir/ScratchBranch objects.
1497
(Martin Pool)
1498
1499
* Split ``check`` into separate methods on the branch and on the repository,
1500
so that it can be specialized in ways that are useful or efficient for
1501
different formats. (Martin Pool, Robert Collins)
1502
1503
* Deprecate Repository.all_revision_ids; most methods don't really need
1504
the global revision graph but only that part leading up to a particular
1505
revision. (Martin Pool, Robert Collins)
1506
1507
* Add a BzrDirFormat control_formats list which allows for control formats
1508
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
1509
(Robert Collins, Jelmer Vernooij).
1510
1511
* bzrlib.diff.external_diff can be redirected to any file-like object.
1512
Uses subprocess instead of spawnvp.
1513
(#4047, #48914, James Henstridge, John Arbash Meinel)
1514
1515
* New command line option '--profile-imports', which will install a custom
1516
importer to log time to import modules and regex compilation time to
1517
sys.stderr (John Arbash Meinel)
1518
1519
* 'EmptyTree' is now deprecated, please use repository.revision_tree(None)
1520
instead. (Robert Collins)
1521
1522
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
1523
1524
bzr 0.8.2 2006-05-17
1525
1526
BUG FIXES:
1527
1528
* setup.py failed to install launchpad plugin. (Martin Pool)
1529
1530
bzr 0.8.1 2006-05-16
1531
1532
BUG FIXES:
1533
1534
* Fix failure to commit a merge in a checkout. (Martin Pool,
1535
Robert Collins, Erik Bågfors, #43959)
1536
1537
* Nicer messages from 'commit' in the case of renames, and correct
1538
messages when a merge has occured. (Robert Collins, Martin Pool)
1539
1540
* Separate functionality from assert statements as they are skipped in
1541
optimized mode of python. Add the same check to pending merges.
1542
(#44443, Olaf Conradi)
1543
1544
CHANGES:
1545
1546
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
1547
1548
* Add info on standalone branches without a working tree.
1549
(#44155, Olaf Conradi)
1550
1551
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
1552
1553
CHANGES:
1554
1555
* Make editor invocation comply with Debian Policy. First check
1556
environment variables VISUAL and EDITOR, then try editor from
1557
alternatives system. If that all fails, fall back to the pre-defined
1558
list of editors. (#42904, Olaf Conradi)
1559
1560
NEW FEATURES:
1561
1562
* New 'register-branch' command registers a public branch into
1563
Launchpad.net, where it can be associated with bugs, etc.
1564
(Martin Pool, Bjorn Tillenius, Robert Collins)
1565
1566
INTERNALS:
1567
1568
* New public api in InventoryEntry - 'describe_change(old, new)' which
1569
provides a human description of the changes between two old and
1570
new. (Robert Collins, Martin Pool)
1571
1572
TESTING:
1573
1574
* Fix test case for bzr info in upgrading a standalone branch to metadir,
1575
uses bzrlib api now. (Olaf Conradi)
1576
1577
bzr 0.8 2006-05-08
1578
1579
NOTES WHEN UPGRADING:
1580
1581
Release 0.8 of bzr introduces a new format for history storage, called
1582
'knit', as an evolution of to the 'weave' format used in 0.7. Local
1583
and remote operations are faster using knits than weaves. Several
1584
operations including 'init', 'init-repo', and 'upgrade' take a
1585
--format option that controls this. Branching from an existing branch
1586
will keep the same format.
1587
1588
It is possible to merge, pull and push between branches of different
1589
formats but this is slower than moving data between homogenous
1590
branches. It is therefore recommended (but not required) that you
1591
upgrade all branches for a project at the same time. Information on
1592
formats is shown by 'bzr info'.
1593
1594
bzr 0.8 now allows creation of 'repositories', which hold the history
1595
of files and revisions for several branches. Previously bzr kept all
1596
the history for a branch within the .bzr directory at the root of the
1597
branch, and this is still the default. To create a repository, use
1598
the new 'bzr init-repo' command. Branches exist as directories under
1599
the repository and contain just a small amount of information
1600
indicating the current revision of the branch.
1601
1602
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
1603
subversion. Checkouts are associated with a branch (optionally in a
1604
repository), which contains all the historical information. The
1605
result is that a checkout can be deleted without losing any
1606
already-committed revisions. A new 'update' command is also available.
1607
1608
Repositories and checkouts are not supported with the 0.7 storage
1609
format. To use them you must upgrad to either knits, or to the
1610
'metaweave' format, which uses weaves but changes the .bzr directory
1611
arrangement.
1612
1613
1614
IMPROVEMENTS:
1615
1616
* Sftp paths can now be relative, or local, according to the lftp
1617
convention. Paths now take the form:
1618
sftp://user:pass@host:port/~/relative/path
1619
or
1620
sftp://user:pass@host:port/absolute/path
1621
1622
* The FTP transport now tries to reconnect after a temporary
1623
failure. ftp put is made atomic. (Matthieu Moy)
1624
1625
* The FTP transport now maintains a pool of connections, and
1626
reuses them to avoid multiple connections to the same host (like
1627
sftp did). (Daniel Silverstone)
1628
1629
* The bzr_man.py file has been removed. To create the man page now,
1630
use ./generate_docs.py man. The new program can also create other files.
1631
Run "python generate_docs.py --help" for usage information. (Hans
1632
Ulrich Niedermann & James Blackwell).
1633
1634
* Man Page now gives full help (James Blackwell). Help also updated to
1635
reflect user config now being stored in .bazaar (Hans Ulrich
1636
Niedermann)
1637
1638
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
1639
1640
* Pull now accepts a --revision argument (Erik Bågfors)
1641
1642
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
1643
line. You can now use the following command to sign all of your old
1644
commits::
1645
1646
find .bzr/revision-store// -name my@email-* \
1647
| sed 's/.*\/\/..\///' \
1648
| xargs bzr re-sign
1649
1650
* Upgrade can now upgrade over the network. (Robert Collins)
1651
1652
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
1653
behaviour. By default they will cache history in the checkout, but
1654
with --lightweight almost all data is kept in the master branch.
1655
(Robert Collins)
1656
1657
* 'revert' unversions newly-versioned files, instead of deleting them.
1658
1659
* 'merge' is more robust. Conflict messages have changed.
1660
1661
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
1662
'.moved'.
1663
1664
* Default log format can be set in configuration and plugins can register
1665
their own formatters. (Erik Bågfors)
1666
1667
* New 'reconcile' command will check branch consistency and repair indexes
1668
that can become out of sync in pre 0.8 formats. (Robert Collins,
1669
Daniel Silverstone)
1670
1671
* New 'bzr init --format' and 'bzr upgrade --format' option to control
1672
what storage format is created or produced. (Robert Collins,
1673
Martin Pool)
1674
1675
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
1676
1677
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
1678
1679
* New 'init-repository' command, plus support for repositories in 'init'
1680
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
1681
1682
* Improve output of 'info' command. Show all relevant locations related to
1683
working tree, branch and repository. Use kibibytes for binary quantities.
1684
Fix off-by-one error in missing revisions of working tree. Make 'info'
1685
work on branches, repositories and remote locations. Show locations
1686
relative to the shared repository, if applicable. Show locking status
1687
of locations. (Olaf Conradi)
1688
1689
* Diff and merge now safely handle binary files. (Aaron Bentley)
1690
1691
* 'pull' and 'push' now normalise the revision history, so that any two
1692
branches with the same tip revision will have the same output from 'log'.
1693
(Robert Collins)
1694
1695
* 'merge' accepts --remember option to store parent location, like 'push'
1696
and 'pull'. (Olaf Conradi)
1697
1698
* bzr status and diff when files given as arguments do not exist
1699
in the relevant trees. (Martin Pool, #3619)
1700
1701
* Add '.hg' to the default ignore list. (Martin Pool)
1702
1703
* 'knit' is now the default disk format. This improves disk performance and
1704
utilization, increases incremental pull performance, robustness with SFTP
1705
and allows checkouts over SFTP to perform acceptably.
1706
The initial Knit code was contributed by Johan Rydberg based on a
1707
specification by Martin Pool.
1708
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
1709
1710
* New tool to generate all-in-one html version of the manual. (Alexander
1711
Belchenko)
1712
1713
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
1714
to be left in the SFTP repository. (Robert Collins, Martin Pool).
1715
1716
* New option 'diff --prefix' to control how files are named in diff
1717
output, with shortcuts '-p0' and '-p1' corresponding to the options for
1718
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
1719
1720
* Add --revision option to 'annotate' command. (Olaf Conradi)
1721
1722
* If bzr shows an unexpected revision-history after pulling (perhaps due
1723
to a reweave) it can now be corrected by 'bzr reconcile'.
1724
(Robert Collins)
1725
1726
CHANGES:
1727
1728
* Commit is now verbose by default, and shows changed filenames and the
1729
new revision number. (Robert Collins, Martin Pool)
1730
1731
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
1732
1733
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
1734
1735
* Make 'pull' and 'push' remember location on failure using --remember.
1736
(Olaf Conradi)
1737
1738
* For compatibility, make old format for using weaves inside metadir
1739
available as 'metaweave' format. Rename format 'metadir' to 'default'.
1740
Clean up help for option --format in commands 'init', 'init-repo' and
1741
'upgrade'. (Olaf Conradi)
1742
1743
INTERNALS:
1744
1745
* The internal storage of history, and logical branch identity have now
1746
been split into Branch, and Repository. The common locking and file
1747
management routines are now in bzrlib.lockablefiles.
1748
(Aaron Bentley, Robert Collins, Martin Pool)
1749
1750
* Transports can now raise DependencyNotPresent if they need a library
1751
which is not installed, and then another implementation will be
1752
tried. (Martin Pool)
1753
1754
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
1755
(Martin Pool)
1756
1757
* Using Tree Transform for merge, revert, tree-building
1758
1759
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
1760
Branch.initialize are now deprecated. Please see BzrDir.create_* for
1761
replacement API's. (Robert Collins)
1762
1763
* New BzrDir class represents the .bzr control directory and manages
1764
formatting issues. (Robert Collins)
1765
1766
* New repository.InterRepository class encapsulates Repository to
1767
Repository actions and allows for clean selection of optimised code
1768
paths. (Robert Collins)
1769
1770
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
1771
please use 'branch.fetch' or 'repository.fetch' depending on your
1772
needs. (Robert Collins)
1773
1774
* deprecated methods now have a 'is_deprecated' flag on them that can
1775
be checked, if you need to determine whether a given callable is
1776
deprecated at runtime. (Robert Collins)
1777
1778
* Progress bars are now nested - see
1779
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
1780
1781
* New API call get_format_description() for each type of format.
1782
(Olaf Conradi)
1783
1784
* Changed branch.set_parent() to accept None to remove parent.
1785
(Olaf Conradi)
1786
1787
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
1788
1789
* WorkingTree.branch is now a read only property. (Robert Collins)
1790
1791
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
1792
can be None or a factory that will create a progress bar. This is
1793
useful for testing or for overriding the bzrlib.progress heuristic.
1794
(Robert Collins)
1795
1796
* New API method get_physical_lock_status() to query locks present on a
1797
transport. (Olaf Conradi)
1798
1799
* Repository.reconcile now takes a thorough keyword parameter to allow
1800
requesting an indepth reconciliation, rather than just a data-loss
1801
check. (Robert Collins)
1802
1803
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
1804
the user for yes/no style input. (Robert Collins)
1805
1806
TESTING:
1807
1808
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
1809
for testing SFTP protocol support. (Robey Pointer)
1810
1811
* Branch formats are now tested once per implementation (see bzrlib.
1812
tests.branch_implementations. This is analagous to the transport
1813
interface tests, and has been followed up with working tree,
1814
repository and BzrDir tests. (Robert Collins)
1815
1816
* New test base class TestCaseWithTransport provides a transport aware
1817
test environment, useful for testing any transport-interface using
1818
code. The test suite option --transport controls the transport used
1819
by this class (when its not being used as part of implementation
1820
contract testing). (Robert Collins)
1821
1822
* Close logging handler on disabling the test log. This will remove the
1823
handler from the internal list inside python's logging module,
1824
preventing shutdown from closing it twice. (Olaf Conradi)
1825
1826
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
1827
1828
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
1829
will provide String("foo") to the command as its stdin.
1830
1831
bzr 0.7 2006-01-09
1832
1833
CHANGES:
1834
1835
* .bzrignore is excluded from exports, on the grounds that it's a bzr
1836
internal-use file and may not be wanted. (Jamie Wilkinson)
1837
1838
* The "bzr directories" command were removed in favor of the new
1839
--kind option to the "bzr inventory" command. To list all
1840
versioned directories, now use "bzr inventory --kind directory".
1841
(Johan Rydberg)
1842
1843
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
1844
by default. (John Arbash Meinel)
1845
1846
* The parent of Bzr configuration directory can be set by BZR_HOME
1847
environment variable. Now the path for it is searched in BZR_HOME, then
1848
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
1849
points to C:\Documents and Settings\User Name\Application Data), HOME.
1850
(John Arbash Meinel)
1851
1852
* Plugins with the same name in different directories in the bzr plugin
1853
path are no longer loaded: only the first successfully loaded one is
1854
used. (Robert Collins)
1855
1856
* Use systems' external ssh command to open connections if possible.
1857
This gives better integration with user settings such as ProxyCommand.
1858
(James Henstridge)
1859
1860
* Permissions on files underneath .bzr/ are inherited from the .bzr
1861
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
1862
will mean that future file will be created with group write permissions.
1863
1864
* configure.in and config.guess are no longer in the builtin default
1865
ignore list.
1866
1867
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
1868
files. (John Arbash Meinel, Martin Pool)
1869
1870
IMPROVEMENTS:
1871
1872
* "bzr INIT dir" now initializes the specified directory, and creates
1873
it if it does not exist. (John Arbash Meinel)
1874
1875
* New remerge command (Aaron Bentley)
1876
1877
* Better zsh completion script. (Steve Borho)
1878
1879
* 'bzr diff' now returns 1 when there are changes in the working
1880
tree. (Robert Collins)
1881
1882
* 'bzr push' now exists and can push changes to a remote location.
1883
This uses the transport infrastructure, and can store the remote
1884
location in the ~/.bazaar/branches.conf configuration file.
1885
(Robert Collins)
1886
1887
* Test directories are only kept if the test fails and the user requests
1888
that they be kept.
1889
1890
* Tweaks to short log printing
1891
1892
* Added branch nicks, new nick command, printing them in log output.
1893
(Aaron Bentley)
1894
1895
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
1896
occurs. (Martin Pool)
1897
1898
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
1899
the same as Subversion. (Martin Pool)
1900
1901
* New ftp transport support (on ftplib), for ftp:// and aftp://
1902
URLs. (Daniel Silverstone)
1903
1904
* Commit editor temporary files now start with 'bzr_log.', to allow
1905
text editors to match the file name and set up appropriate modes or
1906
settings. (Magnus Therning)
1907
1908
* Improved performance when integrating changes from a remote weave.
1909
(Goffredo Baroncelli)
1910
1911
* Sftp will attempt to cache the connection, so it is more likely that
1912
a connection will be reused, rather than requiring multiple password
1913
requests.
1914
1915
* bzr revno now takes an optional argument indicating the branch whose
1916
revno should be printed. (Michael Ellerman)
1917
1918
* bzr cat defaults to printing the last version of the file.
1919
(#3632, Matthieu Moy)
1920
1921
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
1922
profiler. (Denys Duchier)
1923
1924
* Faster commits by reading only the headers of affected weave files.
1925
(Denys Duchier)
1926
1927
* 'bzr add' now takes a --dry-run parameter which shows you what would be
1928
added, but doesn't actually add anything. (Michael Ellerman)
1929
1930
* 'bzr add' now lists how many files were ignored per glob. add --verbose
1931
lists the specific files. (Aaron Bentley)
1932
1933
* 'bzr missing' now supports displaying changes in diverged trees and can
1934
be limited to show what either end of the comparison is missing.
1935
(Aaron Bently, with a little prompting from Daniel Silverstone)
1936
1937
BUG FIXES:
1938
1939
* SFTP can walk up to the root path without index errors. (Robert Collins)
1940
1941
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
1942
1943
* Error when run with -OO
1944
1945
* Fix bug in reporting http errors that don't have an http error code.
1946
(Martin Pool)
1947
1948
* Handle more cases of pipe errors in display commands
1949
1950
* Change status to 3 for all errors
1951
1952
* Files that are added and unlinked before committing are completely
1953
ignored by diff and status
1954
1955
* Stores with some compressed texts and some uncompressed texts are now
1956
able to be used. (John A Meinel)
1957
1958
* Fix for bzr pull failing sometimes under windows
1959
1960
* Fix for sftp transport under windows when using interactive auth
1961
1962
* Show files which are both renamed and modified as such in 'bzr
1963
status' output. (#4503, Daniel Silverstone)
1964
1965
* Make annotate cope better with revisions committed without a valid
1966
email address. (Marien Zwart)
1967
1968
* Fix representation of tab characters in commit messages. (Harald
1969
Meland)
1970
1971
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
1972
now parsed properly under Windows. (Alexander Belchenko)
1973
1974
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
1975
1976
* Keep a cached copy of the basis inventory to speed up operations
1977
that need to refer to it. (Johan Rydberg, Martin Pool)
1978
1979
* Fix bugs in bzr status display of non-ascii characters. (Martin
1980
Pool)
1981
1982
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
1983
Heen, Martin Pool)
1984
1985
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
1986
1987
TESTING:
1988
1989
* Fix selftest asking for passwords when there are no SFTP keys.
1990
(Robey Pointer, Jelmer Vernooij)
1991
1992
* Fix selftest run with 'python -O'. (Martin Pool)
1993
1994
* Fix HTTP tests under Windows. (John Arbash Meinel)
1995
1996
* Make tests work even if HOME is not set (Aaron Bentley)
1997
1998
* Updated build_tree to use fixed line-endings for tests which read
1999
the file cotents and compare. Make some tests use this to pass under
2000
Windows. (John Arbash Meinel)
2001
2002
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
2003
2004
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
2005
(John Arbash Meinel)
2006
2007
* Use terminal width to align verbose test output. (Martin Pool)
2008
2009
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
2010
If adding a new test script please add that to
2011
bzrlib.tests.blackbox.__init__. (Robert Collins)
2012
2013
* Much better error message if one of the test suites can't be
2014
imported. (Martin Pool)
2015
2016
* Make check now runs the test suite twice - once with the default locale,
2017
and once with all locales forced to C, to expose bugs. This is not
2018
trivially done within python, so for now its only triggered by running
2019
Make check. Integrators and packagers who wish to check for full
2020
platform support should run 'make check' to test the source.
2021
(Robert Collins)
2022
2023
* Tests can now run TestSkipped if they can't execute for any reason.
2024
(Martin Pool) (NB: TestSkipped should only be raised for correctable
2025
reasons - see the wiki spec ImprovingBzrTestSuite).
2026
2027
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
2028
paths for the transport tests. Introduce blackbox remote sftp tests that
2029
test the same permutations. (Robert Collins, Robey Pointer)
2030
2031
* Transport implementation tests are now independent of the local file
2032
system, which allows tests for esoteric transports, and for features
2033
not available in the local file system. They also repeat for variations
2034
on the URL scheme that can introduce issues in the transport code,
2035
see bzrlib.transport.TransportTestProviderAdapter() for this.
2036
(Robert Collins).
2037
2038
* TestCase.build_tree uses the transport interface to build trees, pass
2039
in a transport parameter to give it an existing connection.
2040
(Robert Collins).
2041
2042
INTERNALS:
2043
2044
* WorkingTree.pull has been split across Branch and WorkingTree,
2045
to allow Branch only pulls. (Robert Collins)
2046
2047
* commands.display_command now returns the result of the decorated
2048
function. (Robert Collins)
2049
2050
* LocationConfig now has a set_user_option(key, value) call to save
2051
a setting in its matching location section (a new one is created
2052
if needed). (Robert Collins)
2053
2054
* Branch has two new methods, get_push_location and set_push_location
2055
to respectively, get and set the push location. (Robert Collins)
2056
2057
* commands.register_command now takes an optional flag to signal that
2058
the registrant is planning to decorate an existing command. When
2059
given multiple plugins registering a command is not an error, and
2060
the original command class (whether built in or a plugin based one) is
2061
returned to the caller. There is a new error 'MustUseDecorated' for
2062
signalling when a wrapping command should switch to the original
2063
version. (Robert Collins)
2064
2065
* Some option parsing errors will raise 'BzrOptionError', allowing
2066
granular detection for decorating commands. (Robert Collins).
2067
2068
* Branch.read_working_inventory has moved to
2069
WorkingTree.read_working_inventory. This necessitated changes to
2070
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
2071
as well. To make it clear that a WorkingTree cannot always be obtained
2072
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
2073
be obtained. (Robert Collins)
2074
2075
* All pending merges operations from Branch are now on WorkingTree.
2076
(Robert Collins)
2077
2078
* The follow operations from Branch have moved to WorkingTree:
2079
add()
2080
commit()
2081
move()
2082
rename_one()
2083
unknowns()
2084
(Robert Collins)
2085
2086
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
2087
2088
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
2089
2090
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
2091
Pool)
2092
2093
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2094
query method. (Robert Collins)
2095
2096
* New options to read only the table-of-contents of a weave.
2097
(Denys Duchier)
2098
2099
* Raise NoSuchFile when someone tries to add a non-existant file.
2100
(Michael Ellerman)
2101
2102
* Simplify handling of DivergedBranches in cmd_pull().
2103
(Michael Ellerman)
2104
2105
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
2106
is exposed as Branch().control_files. Also this has been altered with the
2107
controlfile pre/suffix replaced by simple method names like 'get' and
2108
'put'. (Aaron Bentley, Robert Collins).
2109
2110
* Deprecated functions and methods can now be marked as such using the
2111
bzrlib.symbol_versioning module. Marked method have their docstring
2112
updated and will issue a DeprecationWarning using the warnings module
2113
when they are used. (Robert Collins)
2114
2115
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
2116
for functions that need unicode strings. (Robert Collins)
2117
2118
bzr 0.6 2005-10-28
2119
2120
IMPROVEMENTS:
2121
2122
* pull now takes --verbose to show you what revisions are added or removed
2123
(John A Meinel)
2124
2125
* merge now takes a --show-base option to include the base text in
2126
conflicts.
2127
(Aaron Bentley)
2128
2129
* The config files are now read using ConfigObj, so '=' should be used as
2130
a separator, not ':'.
2131
(Aaron Bentley)
2132
2133
* New 'bzr commit --strict' option refuses to commit if there are
2134
any unknown files in the tree. To commit, make sure all files are
2135
either ignored, added, or deleted. (Michael Ellerman)
2136
2137
* The config directory is now ~/.bazaar, and there is a single file
2138
~/.bazaar/bazaar.conf storing email, editor and other preferences.
2139
(Robert Collins)
2140
2141
* 'bzr add' no longer takes a --verbose option, and a --quiet option
2142
has been added that suppresses all output.
2143
2144
* Improved zsh completion support in contrib/zsh, from Clint
2145
Adams.
2146
2147
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
2148
Goffredo Baroncelli.
2149
2150
* 'bzr check' now accepts -v for verbose reporting, and checks for
2151
ghosts in the branch. (Robert Collins)
2152
2153
* New command 're-sign' which will regenerate the gpg signature for
2154
a revision. (Robert Collins)
2155
2156
* If you set check_signatures=require for a path in
2157
~/.bazaar/branches.conf then bzr will invoke your
2158
gpg_signing_command (defaults to gpg) and record a digital signature
2159
of your commit. (Robert Collins)
2160
2161
* New sftp transport, based on Paramiko. (Robey Pointer)
2162
2163
* 'bzr pull' now accepts '--clobber' which will discard local changes
2164
and make this branch identical to the source branch. (Robert Collins)
2165
2166
* Just give a quieter warning if a plugin can't be loaded, and
2167
put the details in .bzr.log. (Martin Pool)
2168
2169
* 'bzr branch' will now set the branch-name to the last component of the
2170
output directory, if one was supplied.
2171
2172
* If the option 'post_commit' is set to one (or more) python function
2173
names (must be in the bzrlib namespace), then they will be invoked
2174
after the commit has completed, with the branch and revision_id as
2175
parameters. (Robert Collins)
2176
2177
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2178
2179
* --merge-type weave is now supported for file contents. Tree-shape
2180
changes are still three-way based. (Martin Pool, Aaron Bentley)
2181
2182
* 'bzr check' allows the first revision on revision-history to have
2183
parents - something that is expected for cheap checkouts, and occurs
2184
when conversions from baz do not have all history. (Robert Collins).
2185
2186
* 'bzr merge' can now graft unrelated trees together, if your specify
2187
0 as a base. (Aaron Bentley)
2188
2189
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
2190
(Aaron Bentley)
2191
2192
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
2193
2194
* 'bzr merge --reprocess' minimizes conflicts
2195
2196
TESTING:
2197
2198
* The 'bzr selftest --pattern' option for has been removed, now
2199
test specifiers on the command line can be simple strings, or
2200
regexps, or both. (Robert Collins)
2201
2202
* Passing -v to selftest will now show the time each test took to
2203
complete, which will aid in analysing performance regressions and
2204
related questions. (Robert Collins)
2205
2206
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
2207
is given. (Martin Pool)
2208
2209
* There is a new method for TestCaseInTempDir, assertFileEqual, which
2210
will check that a given content is equal to the content of the named
2211
file. (Robert Collins)
2212
2213
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
2214
(Martin Pool)
2215
2216
INTERNALS:
2217
2218
* New 'testament' command and concept for making gpg-signatures
2219
of revisions that are not tied to a particular internal
2220
representation. (Martin Pool).
2221
2222
* Per-revision properties ('revprops') as key-value associated
2223
strings on each revision created when the revision is committed.
2224
Intended mainly for the use of external tools. (Martin Pool).
2225
2226
* Config options have moved from bzrlib.osutils to bzrlib.config.
2227
(Robert Collins)
2228
2229
* Improved command line option definitions allowing explanations
2230
for individual options, among other things. Contributed by
2231
Magnus Therning.
2232
2233
* Config options have moved from bzrlib.osutils to bzrlib.config.
2234
Configuration is now done via the config.Config interface:
2235
Depending on whether you have a Branch, a Location or no information
2236
available, construct a ``*Config``, and use its ``signature_checking``,
2237
``username`` and ``user_email`` methods. (Robert Collins)
2238
2239
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
2240
they are made available for other plugins to use. You should not
2241
import other plugins during the __init__ of your plugin though, as
2242
no ordering is guaranteed, and the plugins directory is not on the
2243
python path. (Robert Collins)
2244
2245
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
2246
no longer takes an inventory, rather it takes an option branch
2247
parameter, and if None is given will open the branch at basedir
2248
implicitly. (Robert Collins)
2249
2250
* Cleaner exception structure and error reporting. Suggested by
2251
Scott James Remnant. (Martin Pool)
2252
2253
* Branch.remove has been moved to WorkingTree, which has also gained
2254
lock_read, lock_write and unlock methods for convenience. (Robert
2255
Collins)
2256
2257
* Two decorators, needs_read_lock and needs_write_lock have been added
2258
to the branch module. Use these to cause a function to run in a
2259
read or write lock respectively. (Robert Collins)
2260
2261
* Branch.open_containing now returns a tuple (Branch, relative-path),
2262
which allows direct access to the common case of 'get me this file
2263
from its branch'. (Robert Collins)
2264
2265
* Transports can register using register_lazy_transport, and they
2266
will be loaded when first used. (Martin Pool)
2267
2268
* 'pull' has been factored out of the command as WorkingTree.pull().
2269
A new option to WorkingTree.pull has been added, clobber, which will
2270
ignore diverged history and pull anyway.
2271
(Robert Collins)
2272
2273
* config.Config has a 'get_user_option' call that accepts an option name.
2274
This will be looked up in branches.conf and bazaar.conf as normal.
2275
It is intended that this be used by plugins to support options -
2276
options of built in programs should have specific methods on the config.
2277
(Robert Collins)
2278
2279
* merge.merge_inner now has tempdir as an optional parameter. (Robert
2280
Collins)
2281
2282
* Tree.kind is not recorded at the top level of the hierarchy, as it was
2283
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
2284
(Robert Collins)
2285
2286
* WorkingTree.__del__ has been removed, it was non deterministic and not
2287
doing what it was intended to. See WorkingTree.__init__ for a comment
2288
about future directions. (Robert Collins/Martin Pool)
2289
2290
* bzrlib.transport.http has been modified so that only 404 urllib errors
2291
are returned as NoSuchFile. Other exceptions will propogate as normal.
2292
This allows debuging of actual errors. (Robert Collins)
2293
2294
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
2295
to apis like 'put', 'get' and 'has'. This is to provide consistent
2296
behaviour - it operates on url's only. (Robert Collins)
2297
2298
* Transports can register using register_lazy_transport, and they
2299
will be loaded when first used. (Martin Pool)
2300
2301
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
2302
is called by merge_inner. This is so that the conflict count can be
2303
retrieved (and potentially manipulated) before returning to the caller
2304
of merge_inner. Likewise 'merge' now returns the conflict count to the
2305
caller. (Robert Collins)
2306
2307
* 'revision.revision_graph can handle having only partial history for
2308
a revision - that is no revisions in the graph with no parents.
2309
(Robert Collins).
2310
2311
* New builtins.branch_files uses the standard file_list rules to produce
2312
a branch and a list of paths, relative to that branch (Aaron Bentley)
2313
2314
* New TestCase.addCleanup facility.
2315
2316
* New bzrlib.version_info tuple (similar to sys.version_info), which can
2317
be used by programs importing bzrlib.
2318
2319
BUG FIXES:
2320
2321
* Better handling of branches in directories with non-ascii names.
2322
(Joel Rosdahl, Panagiotis Papadakos)
2323
2324
* Upgrades of trees with no commits will not fail due to accessing
2325
[-1] in the revision-history. (Andres Salomon)
2326
2327
2328
bzr 0.1.1 2005-10-12
2329
2330
BUG FIXES:
2331
2332
* Fix problem in pulling over http from machines that do not
2333
allow directories to be listed.
2334
2335
* Avoid harmless warning about invalid hash cache after
2336
upgrading branch format.
2337
2338
PERFORMANCE:
2339
2340
* Avoid some unnecessary http operations in branch and pull.
2341
2342
2343
bzr 0.1 2005-10-11
2344
2345
NOTES:
2346
2347
* 'bzr branch' over http initially gives a very high estimate
2348
of completion time but it should fall as the first few
2349
revisions are pulled in. branch is still slow on
2350
high-latency connections.
2351
2352
BUG FIXES:
2353
2354
* bzr-man.py has been updated to work again. Contributed by
2355
Rob Weir.
2356
2357
* Locking is now done with fcntl.lockf which works with NFS
2358
file systems. Contributed by Harald Meland.
2359
2360
* When a merge encounters a file that has been deleted on
2361
one side and modified on the other, the old contents are
2362
written out to foo.BASE and foo.SIDE, where SIDE is this
2363
or OTHER. Contributed by Aaron Bentley.
2364
2365
* Export was choosing incorrect file paths for the content of
2366
the tarball, this has been fixed by Aaron Bentley.
2367
2368
* Commit will no longer commit without a log message, an
2369
error is returned instead. Contributed by Jelmer Vernooij.
2370
2371
* If you commit a specific file in a sub directory, any of its
2372
parent directories that are added but not listed will be
2373
automatically included. Suggested by Michael Ellerman.
2374
2375
* bzr commit and upgrade did not correctly record new revisions
2376
for files with only a change to their executable status.
2377
bzr will correct this when it encounters it. Fixed by
2378
Robert Collins
2379
2380
* HTTP tests now force off the use of http_proxy for the duration.
2381
Contributed by Gustavo Niemeyer.
2382
2383
* Fix problems in merging weave-based branches that have
2384
different partial views of history.
2385
2386
* Symlink support: working with symlinks when not in the root of a
2387
bzr tree was broken, patch from Scott James Remnant.
2388
2389
IMPROVEMENTS:
2390
2391
* 'branch' now accepts a --basis parameter which will take advantage
2392
of local history when making a new branch. This allows faster
2393
branching of remote branches. Contributed by Aaron Bentley.
2394
2395
* New tree format based on weave files, called version 5.
2396
Existing branches can be upgraded to this format using
2397
'bzr upgrade'.
2398
2399
* Symlinks are now versionable. Initial patch by
2400
Erik Toubro Nielsen, updated to head by Robert Collins.
2401
2402
* Executable bits are tracked on files. Patch from Gustavo
2403
Niemeyer.
2404
2405
* 'bzr status' now shows unknown files inside a selected directory.
2406
Patch from Heikki Paajanen.
2407
2408
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
2409
and 'resolve' have needed added, which list and remove those
2410
merge conflicts respectively. A conflicted tree cannot be committed
2411
in. Contributed by Aaron Bentley.
2412
2413
* 'rm' is now an alias for 'remove'.
2414
2415
* Stores now split out their content in a single byte prefixed hash,
2416
dropping the density of files per directory by 256. Contributed by
2417
Gustavo Niemeyer.
2418
2419
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
2420
Contributed by Robert Collins.
2421
2422
* 'bzr log' with the default formatter will show merged revisions,
2423
indented to the right. Initial implementation contributed by Gustavo
2424
Niemeyer, made incremental by Robert Collins.
2425
2426
2427
INTERNALS:
2428
2429
* Test case failures have the exception printed after the log
2430
for your viewing pleasure.
2431
2432
* InventoryEntry is now an abstract base class, use one of the
2433
concrete InventoryDirectory etc classes instead.
2434
2435
* Branch raises an UnsupportedFormatError when it detects a
2436
bzr branch it cannot understand. This allows for precise
2437
handling of such circumstances.
2438
2439
* Remove RevisionReference class; Revision.parent_ids is now simply a
2440
list of their ids and parent_sha1s is a list of their corresponding
2441
sha1s (for old branches only at the moment.)
2442
2443
* New method-object style interface for Commit() and Fetch().
2444
2445
* Renamed Branch.last_patch() to Branch.last_revision(), since
2446
we call them revisions not patches.
2447
2448
* Move copy_branch to bzrlib.clone.copy_branch. The destination
2449
directory is created if it doesn't exist.
2450
2451
* Inventories now identify the files which were present by
2452
giving the revision *of that file*.
2453
2454
* Inventory and Revision XML contains a version identifier.
2455
This must be consistent with the overall branch version
2456
but allows for more flexibility in future upgrades.
2457
2458
TESTING:
2459
2460
* Removed testsweet module so that tests can be run after
2461
bzr installed by 'bzr selftest'.
2462
2463
* 'bzr selftest' command-line arguments can now be partial ids
2464
of tests to run, e.g. 'bzr selftest test_weave'
2465
2466
2467
bzr 0.0.9 2005-09-23
2468
2469
BUG FIXES:
2470
2471
* Fixed "branch -r" option.
2472
2473
* Fix remote access to branches containing non-compressed history.
2474
(Robert Collins).
2475
2476
* Better reliability of http server tests. (John Arbash-Meinel)
2477
2478
* Merge graph maximum distance calculation fix. (Aaron Bentley)
2479
2480
* Various minor bug in windows support have been fixed, largely in the
2481
test suite. Contributed by Alexander Belchenko.
2482
2483
IMPROVEMENTS:
2484
2485
* Status now accepts a -r argument to give status between chosen
2486
revisions. Contributed by Heikki Paajanen.
2487
2488
* Revision arguments no longer use +/-/= to control ranges, instead
2489
there is a 'before' namespace, which limits the successive namespace.
2490
For example '$ bzr log -r date:yesterday..before:date:today' will
2491
select everything from yesterday and before today. Contributed by
2492
Robey Pointer
2493
2494
* There is now a bzr.bat file created by distutils when building on
2495
Windows. Contributed by Alexander Belchenko.
2496
2497
INTERNALS:
2498
2499
* Removed uuid() as it was unused.
2500
2501
* Improved 'fetch' code for pulling revisions from one branch into
2502
another (used by pull, merged, etc.)
2503
2504
2505
bzr 0.0.8 2005-09-20
2506
2507
IMPROVEMENTS:
2508
2509
* Adding a file whose parent directory is not versioned will
2510
implicitly add the parent, and so on up to the root. This means
2511
you should never need to explictly add a directory, they'll just
2512
get added when you add a file in the directory. Contributed by
2513
Michael Ellerman.
2514
2515
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
2516
Nir Soffer.
2517
2518
* If you set BZR_EDITOR in the environment, it is checked in
2519
preference to EDITOR and the config file for the interactive commit
2520
editing program. Related to this is a bugfix where a missing program
2521
set in EDITOR would cause editing to fail, now the fallback program
2522
for the operating system is still tried.
2523
2524
* Files that are not directories/symlinks/regular files will no longer
2525
cause bzr to fail, it will just ignore them by default. You cannot add
2526
them to the tree though - they are not versionable.
2527
2528
2529
INTERNALS:
2530
2531
* Refactor xml packing/unpacking.
2532
2533
BUG FIXES:
2534
2535
* Fixed 'bzr mv' by Ollie Rutherfurd.
2536
2537
* Fixed strange error when trying to access a nonexistent http
2538
branch.
2539
2540
* Make sure that the hashcache gets written out if it can't be
2541
read.
2542
2543
2544
PORTABILITY:
2545
2546
* Various Windows fixes from Ollie Rutherfurd.
2547
2548
* Quieten warnings about locking; patch from Matt Lavin.
2549
2550
2551
bzr-0.0.7 2005-09-02
2552
2553
NEW FEATURES:
2554
2555
* ``bzr shell-complete`` command contributed by Clint Adams to
2556
help with intelligent shell completion.
2557
2558
* New expert command ``bzr find-merge-base`` for debugging merges.
2559
2560
2561
ENHANCEMENTS:
2562
2563
* Much better merge support.
2564
2565
* merge3 conflicts are now reported with markers like '<<<<<<<'
2566
(seven characters) which is the same as CVS and pleases things
2567
like emacs smerge.
2568
2569
2570
BUG FIXES:
2571
2572
* ``bzr upgrade`` no longer fails when trying to fix trees that
2573
mention revisions that are not present.
2574
2575
* Fixed bugs in listing plugins from ``bzr plugins``.
2576
2577
* Fix case of $EDITOR containing options for the editor.
2578
2579
* Fix log -r refusing to show the last revision.
2580
(Patch from Goffredo Baroncelli.)
2581
2582
2583
CHANGES:
2584
2585
* ``bzr log --show-ids`` shows the revision ids of all parents.
2586
2587
* Externally provided commands on your $BZRPATH no longer need
2588
to recognize --bzr-usage to work properly, and can just handle
2589
--help themselves.
2590
2591
2592
LIBRARY:
2593
2594
* Changed trace messages to go through the standard logging
2595
framework, so that they can more easily be redirected by
2596
libraries.
2597
2598
2599
2600
bzr-0.0.6 2005-08-18
2601
2602
NEW FEATURES:
2603
2604
* Python plugins, automatically loaded from the directories on
2605
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
2606
2607
* New 'bzr mkdir' command.
2608
2609
* Commit mesage is fetched from an editor if not given on the
2610
command line; patch from Torsten Marek.
2611
2612
* ``bzr log -m FOO`` displays commits whose message matches regexp
2613
FOO.
2614
2615
* ``bzr add`` with no arguments adds everything under the current directory.
2616
2617
* ``bzr mv`` does move or rename depending on its arguments, like
2618
the Unix command.
2619
2620
* ``bzr missing`` command shows a summary of the differences
2621
between two trees. (Merged from John Arbash-Meinel.)
2622
2623
* An email address for commits to a particular tree can be
2624
specified by putting it into .bzr/email within a branch. (Based
2625
on a patch from Heikki Paajanen.)
2626
2627
2628
ENHANCEMENTS:
2629
2630
* Faster working tree operations.
2631
2632
2633
CHANGES:
2634
2635
* 3rd-party modules shipped with bzr are copied within the bzrlib
2636
python package, so that they can be installed by the setup
2637
script without clashing with anything already existing on the
2638
system. (Contributed by Gustavo Niemeyer.)
2639
2640
* Moved plugins directory to bzrlib/, so that there's a standard
2641
plugin directory which is not only installed with bzr itself but
2642
is also available when using bzr from the development tree.
2643
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
2644
standard plugins directory.
2645
2646
* When exporting to a tarball with ``bzr export --format tgz``, put
2647
everything under a top directory rather than dumping it into the
2648
current directory. This can be overridden with the ``--root``
2649
option. Patch from William Dodé and John Meinel.
2650
2651
* New ``bzr upgrade`` command to upgrade the format of a branch,
2652
replacing ``bzr check --update``.
2653
2654
* Files within store directories are no longer marked readonly on
2655
disk.
2656
2657
* Changed ``bzr log`` output to a more compact form suggested by
2658
John A Meinel. Old format is available with the ``--long`` or
2659
``-l`` option, patched by William Dodé.
2660
2661
* By default the commit command refuses to record a revision with
2662
no changes unless the ``--unchanged`` option is given.
2663
2664
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
2665
line options must come before the command name because they
2666
affect what commands are available; all other options must come
2667
after the command name because their interpretation depends on
2668
it.
2669
2670
* ``branch`` and ``clone`` added as aliases for ``branch``.
2671
2672
* Default log format is back to the long format; the compact one
2673
is available with ``--short``.
2674
2675
2676
BUG FIXES:
2677
2678
* Fix bugs in committing only selected files or within a subdirectory.
2679
2680
2681
bzr-0.0.5 2005-06-15
2682
2683
CHANGES:
2684
2685
* ``bzr`` with no command now shows help rather than giving an
2686
error. Suggested by Michael Ellerman.
2687
2688
* ``bzr status`` output format changed, because svn-style output
2689
doesn't really match the model of bzr. Now files are grouped by
2690
status and can be shown with their IDs. ``bzr status --all``
2691
shows all versioned files and unknown files but not ignored files.
2692
2693
* ``bzr log`` runs from most-recent to least-recent, the reverse
2694
of the previous order. The previous behaviour can be obtained
2695
with the ``--forward`` option.
2696
2697
* ``bzr inventory`` by default shows only filenames, and also ids
2698
if ``--show-ids`` is given, in which case the id is the second
2699
field.
2700
2701
2702
ENHANCEMENTS:
2703
2704
* New 'bzr whoami --email' option shows only the email component
2705
of the user identification, from Jo Vermeulen.
2706
2707
* New ``bzr ignore PATTERN`` command.
2708
2709
* Nicer error message for broken pipe, interrupt and similar
2710
conditions that don't indicate an internal error.
2711
2712
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
2713
2714
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
2715
either read or write mode.
2716
2717
* New option ``bzr log --show-ids`` shows revision and file ids.
2718
2719
* New usage ``bzr log FILENAME`` shows only revisions that
2720
affected that file.
2721
2722
* Changed format for describing changes in ``bzr log -v``.
2723
2724
* New option ``bzr commit --file`` to take a message from a file,
2725
suggested by LarstiQ.
2726
2727
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
2728
Oler. File may be in a branch other than the working directory.
2729
2730
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
2731
a filename.
2732
2733
* Commands can now be defined by external programs or scripts
2734
in a directory on $BZRPATH.
2735
2736
* New "stat cache" avoids reading the contents of files if they
2737
haven't changed since the previous time.
2738
2739
* If the Python interpreter is too old, try to find a better one
2740
or give an error. Based on a patch from Fredrik Lundh.
2741
2742
* New optional parameter ``bzr info [BRANCH]``.
2743
2744
* New form ``bzr commit SELECTED`` to commit only selected files.
2745
2746
* New form ``bzr log -r FROM:TO`` shows changes in selected
2747
range; contributed by John A Meinel.
2748
2749
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
2750
options through to an external GNU diff.
2751
2752
* New option ``bzr add --no-recurse`` to add a directory but not
2753
their contents.
2754
2755
* ``bzr --version`` now shows more information if bzr is being run
2756
from a branch.
2757
2758
2759
BUG FIXES:
2760
2761
* Fixed diff format so that added and removed files will be
2762
handled properly by patch. Fix from Lalo Martins.
2763
2764
* Various fixes for files whose names contain spaces or other
2765
metacharacters.
2766
2767
2768
TESTING:
2769
2770
* Converted black-box test suites from Bourne shell into Python;
2771
now run using ``./testbzr``. Various structural improvements to
2772
the tests.
2773
2774
* testbzr by default runs the version of bzr found in the same
2775
directory as the tests, or the one given as the first parameter.
2776
2777
* testbzr also runs the internal tests, so the only command
2778
required to check is just ``./testbzr``.
2779
2780
* testbzr requires python2.4, but can be used to test bzr running
2781
under a different version.
2782
2783
* Tests added for many other changes in this release.
2784
2785
2786
INTERNAL:
2787
2788
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
2789
2790
* Refactor command functions into Command objects based on HCT by
2791
Scott James Remnant.
2792
2793
* Better help messages for many commands.
2794
2795
* Expose bzrlib.open_tracefile() to start the tracefile; until
2796
this is called trace messages are just discarded.
2797
2798
* New internal function find_touching_revisions() and hidden
2799
command touching-revisions trace the changes to a given file.
2800
2801
* Simpler and faster compare_inventories() function.
2802
2803
* bzrlib.open_tracefile() takes a tracefilename parameter.
2804
2805
* New AtomicFile class.
2806
2807
* New developer commands ``added``, ``modified``.
2808
2809
2810
PORTABILITY:
2811
2812
* Cope on Windows on python2.3 by using the weaker random seed.
2813
2.4 is now only recommended.
2814
2815
2816
bzr-0.0.4 2005-04-22
2817
2818
ENHANCEMENTS:
2819
2820
* 'bzr diff' optionally takes a list of files to diff. Still a bit
2821
basic. Patch from QuantumG.
2822
2823
* More default ignore patterns.
2824
2825
* New 'bzr log --verbose' shows a list of files changed in the
2826
changeset. Patch from Sebastian Cote.
2827
2828
* Roll over ~/.bzr.log if it gets too large.
2829
2830
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
2831
by Jason Diamon.
2832
2833
* New 'bzr help commands' based on a patch from Denys Duchier.
2834
2835
2836
CHANGES:
2837
2838
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
2839
or $EMAIL. All are decoded by the locale preferred encoding.
2840
If none of these are present user@hostname is used. The host's
2841
fully-qualified name is not used because that tends to fail when
2842
there are DNS problems.
2843
2844
* New 'bzr whoami' command instead of username user-email.
2845
2846
2847
BUG FIXES:
2848
2849
* Make commit safe for hardlinked bzr trees.
2850
2851
* Some Unicode/locale fixes.
2852
2853
* Partial workaround for difflib.unified_diff not handling
2854
trailing newlines properly.
2855
2856
2857
INTERNAL:
2858
2859
* Allow docstrings for help to be in PEP0257 format. Patch from
2860
Matt Brubeck.
2861
2862
* More tests in test.sh.
2863
2864
* Write profile data to a temporary file not into working
2865
directory and delete it when done.
2866
2867
* Smaller .bzr.log with process ids.
2868
2869
2870
PORTABILITY:
2871
2872
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
2873
Bennetts.
2874
2875
* Some improvements in handling paths on Windows, based on a patch
2876
from QuantumG.
2877
2878
2879
bzr-0.0.3 2005-04-06
2880
2881
ENHANCEMENTS:
2882
2883
* New "directories" internal command lists versioned directories
2884
in the tree.
2885
2886
* Can now say "bzr commit --help".
2887
2888
* New "rename" command to rename one file to a different name
2889
and/or directory.
2890
2891
* New "move" command to move one or more files into a different
2892
directory.
2893
2894
* New "renames" command lists files renamed since base revision.
2895
2896
* New cat command contributed by janmar.
2897
2898
CHANGES:
2899
2900
* .bzr.log is placed in $HOME (not pwd) and is always written in
2901
UTF-8. (Probably not a completely good long-term solution, but
2902
will do for now.)
2903
2904
PORTABILITY:
2905
2906
* Workaround for difflib bug in Python 2.3 that causes an
2907
exception when comparing empty files. Reported by Erik Toubro
2908
Nielsen.
2909
2910
INTERNAL:
2911
2912
* Refactored inventory storage to insert a root entry at the top.
2913
2914
TESTING:
2915
2916
* Start of shell-based black-box testing in test.sh.
2917
2918
2919
bzr-0.0.2.1
2920
2921
PORTABILITY:
2922
2923
* Win32 fixes from Steve Brown.
2924
2925
2926
bzr-0.0.2 "black cube" 2005-03-31
2927
2928
ENHANCEMENTS:
2929
2930
* Default ignore list extended (see bzrlib/__init__.py).
2931
2932
* Patterns in .bzrignore are now added to the default ignore list,
2933
rather than replacing it.
2934
2935
* Ignore list isn't reread for every file.
2936
2937
* More help topics.
2938
2939
* Reinstate the 'bzr check' command to check invariants of the
2940
branch.
2941
2942
* New 'ignored' command lists which files are ignored and why;
2943
'deleted' lists files deleted in the current working tree.
2944
2945
* Performance improvements.
2946
2947
* New global --profile option.
2948
2949
* Ignore patterns like './config.h' now correctly match files in
2950
the root directory only.
2951
2952
2953
bzr-0.0.1 2005-03-26
2954
2955
ENHANCEMENTS:
2956
2957
* More information from info command.
2958
2959
* Can now say "bzr help COMMAND" for more detailed help.
2960
2961
* Less file flushing and faster performance when writing logs and
2962
committing to stores.
2963
2964
* More useful verbose output from some commands.
2965
2966
BUG FIXES:
2967
2968
* Fix inverted display of 'R' and 'M' during 'commit -v'.
2969
2970
PORTABILITY:
2971
2972
* Include a subset of ElementTree-1.2.20040618 to make
2973
installation easier.
2974
2975
* Fix time.localtime call to work with Python 2.3 (the minimum
2976
supported).
2977
2978
2979
bzr-0.0.0.69 2005-03-22
2980
2981
ENHANCEMENTS:
2982
2983
* First public release.
2984
2985
* Storage of local versions: init, add, remove, rm, info, log,
2986
diff, status, etc.
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0