1
bzr-0.0.5 NOT RELEASED YET
5
* merge now takes a --show-base option to include the base text in
9
* The config files are now read using ConfigObj, so '=' should be used as
13
* New 'bzr commit --strict' option refuses to commit if there are
14
any unknown files in the tree. To commit, make sure all files are
15
either ignored, added, or deleted. (Michael Ellerman)
17
* The config directory is now ~/.bazaar, and there is a single file
18
~/.bazaar/bazaar.conf storing email, editor and other preferences.
21
* 'bzr add' no longer takes a --verbose option, and a --quiet option
22
has been added that suppresses all output.
24
* Improved zsh completion support in contrib/zsh, from Clint
27
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
30
* 'bzr check' now accepts -v for verbose reporting, and checks for
31
ghosts in the branch. (Robert Collins)
33
* New command 're-sign' which will regenerate the gpg signature for
34
a revision. (Robert Collins)
36
* If you set check_signatures=require for a path in
37
~/.bazaar/branches.conf then bzr will invoke your
38
gpg_signing_command (defaults to gpg) and record a digital signature
39
of your commit. (Robert Collins)
41
* New sftp transport, based on Paramiko. (Robey Pointer)
43
* 'bzr pull' now accepts '--clobber' which will discard local changes
44
and make this branch identical to the source branch. (Robert Collins)
46
* Just give a quieter warning if a plugin can't be loaded, and
47
put the details in .bzr.log. (Martin Pool)
49
* 'bzr branch' will now set the branch-name to the last component of the
50
output directory, if one was supplied.
52
* New sftp transport, based on Paramiko. (Robey Pointer)
54
* If the option 'post_commit' is set to one (or more) python function
55
names (must be in the bzrlib namespace), then they will be invoked
56
after the commit has completed, with the branch and revision_id as
57
parameters. (Robert Collins)
59
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
61
* 'bzr check' allows the first revision on revision-history to have
62
parents - something that is expected for cheap checkouts, and occurs
63
when conversions from baz do not have all history. (Robert Collins).
67
* The 'bzr selftest --pattern' option for has been removed, now
68
test specifiers on the command line can be simple strings, or
69
regexps, or both. (Robert Collins)
71
* Passing -v to selftest will now show the time each test took to
72
complete, which will aid in analysing performance regressions and
73
related questions. (Robert Collins)
75
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
76
is given. (Martin Pool)
78
* There is a new method for TestCaseInTempDir, assertFileEqual, which
79
will check that a given content is equal to the content of the named
80
file. (Robert Collins)
84
* New 'testament' command and concept for making gpg-signatures
85
of revisions that are not tied to a particular internal
86
representation. (Martin Pool).
88
* Per-revision properties ('revprops') as key-value associated
89
strings on each revision created when the revision is committed.
90
Intended mainly for the use of external tools. (Martin Pool).
92
* Config options have moved from bzrlib.osutils to bzrlib.config.
95
* Improved command line option definitions allowing explanations
96
for individual options, among other things. Contributed by
99
* Config options have moved from bzrlib.osutils to bzrlib.config.
100
Configuration is now done via the config.Config interface:
101
Depending on whether you have a Branch, a Location or no information
102
available, construct a *Config, and use its signature_checking,
103
username and user_email methods. (Robert Collins)
105
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
106
they are made available for other plugins to use. You should not
107
import other plugins during the __init__ of your plugin though, as
108
no ordering is guaranteed, and the plugins directory is not on the
109
python path. (Robert Collins)
111
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
112
no longer takes an inventory, rather it takes an option branch
113
parameter, and if None is given will open the branch at basedir
114
implicitly. (Robert Collins)
116
* Cleaner exception structure and error reporting. Suggested by
117
Scott James Remnant. (Martin Pool)
119
* Branch.remove has been moved to WorkingTree, which has also gained
120
lock_read, lock_write and unlock methods for convenience. (Robert
123
* Two decorators, needs_read_lock and needs_write_lock have been added
124
to the branch module. Use these to cause a function to run in a
125
read or write lock respectively. (Robert Collins)
127
* Branch.open_containing now returns a tuple (Branch, relative-path),
128
which allows direct access to the common case of 'get me this file
129
from its branch'. (Robert Collins)
131
* Transports can register using register_lazy_transport, and they
132
will be loaded when first used. (Martin Pool)
134
* 'pull' has been factored out of the command as WorkingTree.pull().
135
A new option to WorkingTree.pull has been added, clobber, which will
136
ignore diverged history and pull anyway.
139
* config.Config has a 'get_user_option' call that accepts an option name.
140
This will be looked up in branches.conf and bazaar.conf as normal.
141
It is intended that this be used by plugins to support options -
142
options of built in programs should have specific methods on the config.
145
* merge.merge_inner now has tempdir as an optional parameter. (Robert
148
* Tree.kind is not recorded at the top level of the hierarchy, as it was
149
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
152
* WorkingTree.__del__ has been removed, it was non deterministic and not
153
doing what it was intended to. See WorkingTree.__init__ for a comment
154
about future directions. (Robert Collins/Martin Pool)
156
* bzrlib.transport.http has been modified so that only 404 urllib errors
157
are returned as NoSuchFile. Other exceptions will propogate as normal.
158
This allows debuging of actual errors. (Robert Collins)
160
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
161
to apis like 'put', 'get' and 'has'. This is to provide consistent
162
behaviour - it operates on url's only. (Robert Collins)
164
* Transports can register using register_lazy_transport, and they
165
will be loaded when first used. (Martin Pool)
167
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
168
is called by merge_inner. This is so that the conflict count can be
169
retrieved (and potentially manipulated) before returning to the caller
170
of merge_inner. Likewise 'merge' now returns the conflict count to the
171
caller. (Robert Collins)
173
* 'revision.revision_graph can handle having only partial history for
174
a revision - that is no revisions in the graph with no parents.
179
* Better handling of branches in directories with non-ascii names.
180
(Joel Rosdahl, Panagiotis Papadakos)
186
* Fix problem in pulling over http from machines that do not
187
allow directories to be listed.
189
* Avoid harmless warning about invalid hash cache after
190
upgrading branch format.
194
* Avoid some unnecessary http operations in branch and pull.
201
* 'bzr branch' over http initially gives a very high estimate
202
of completion time but it should fall as the first few
203
revisions are pulled in. branch is still slow on
204
high-latency connections.
208
* bzr-man.py has been updated to work again. Contributed by
211
* Locking is now done with fcntl.lockf which works with NFS
212
file systems. Contributed by Harald Meland.
214
* When a merge encounters a file that has been deleted on
215
one side and modified on the other, the old contents are
216
written out to foo.BASE and foo.SIDE, where SIDE is this
217
or OTHER. Contributed by Aaron Bentley.
219
* Export was choosing incorrect file paths for the content of
220
the tarball, this has been fixed by Aaron Bentley.
222
* Commit will no longer commit without a log message, an
223
error is returned instead. Contributed by Jelmer Vernooij.
225
* If you commit a specific file in a sub directory, any of its
226
parent directories that are added but not listed will be
227
automatically included. Suggested by Michael Ellerman.
229
* bzr commit and upgrade did not correctly record new revisions
230
for files with only a change to their executable status.
231
bzr will correct this when it encounters it. Fixed by
234
* HTTP tests now force off the use of http_proxy for the duration.
235
Contributed by Gustavo Niemeyer.
237
* Fix problems in merging weave-based branches that have
238
different partial views of history.
240
* Symlink support: working with symlinks when not in the root of a
241
bzr tree was broken, patch from Scott James Remnant.
246
* 'branch' now accepts a --basis parameter which will take advantage
247
of local history when making a new branch. This allows faster
248
branching of remote branches. Contributed by Aaron Bentley.
250
* New tree format based on weave files, called version 5.
251
Existing branches can be upgraded to this format using
254
* Symlinks are now versionable. Initial patch by
255
Erik Toubro Nielsen, updated to head by Robert Collins.
257
* Executable bits are tracked on files. Patch from Gustavo
260
* 'bzr status' now shows unknown files inside a selected directory.
261
Patch from Heikki Paajanen.
263
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
264
and 'resolve' have needed added, which list and remove those
265
merge conflicts respectively. A conflicted tree cannot be committed
266
in. Contributed by Aaron Bentley.
268
* 'rm' is now an alias for 'remove'.
270
* Stores now split out their content in a single byte prefixed hash,
271
dropping the density of files per directory by 256. Contributed by
274
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
275
Contributed by Robert Collins.
277
* 'bzr log' with the default formatter will show merged revisions,
278
indented to the right. Initial implementation contributed by Gustavo
279
Niemeyer, made incremental by Robert Collins.
284
* Test case failures have the exception printed after the log
285
for your viewing pleasure.
287
* InventoryEntry is now an abstract base class, use one of the
288
concrete InventoryDirectory etc classes instead.
290
* Branch raises an UnsupportedFormatError when it detects a
291
bzr branch it cannot understand. This allows for precise
292
handling of such circumstances.
297
* Removed testsweet module so that tests can be run after
298
bzr installed by 'bzr selftest'.
300
* 'bzr selftest' command-line arguments can now be partial ids
301
of tests to run, e.g. 'bzr selftest test_weave'
308
* Fixed "branch -r" option.
310
* Fix remote access to branches containing non-compressed history.
313
* Better reliability of http server tests. (John Arbash-Meinel)
315
* Merge graph maximum distance calculation fix. (Aaron Bentley)
317
* Various minor bug in windows support have been fixed, largely in the
318
test suite. Contributed by Alexander Belchenko.
322
* Status now accepts a -r argument to give status between chosen
323
revisions. Contributed by Heikki Paajanen.
325
* Revision arguments no longer use +/-/= to control ranges, instead
326
there is a 'before' namespace, which limits the successive namespace.
327
For example '$ bzr log -r date:yesterday..before:date:today' will
328
select everything from yesterday and before today. Contributed by
331
* There is now a bzr.bat file created by distutils when building on
332
Windows. Contributed by Alexander Belchenko.
336
* Removed uuid() as it was unused.
338
* Improved 'fetch' code for pulling revisions from one branch into
339
another (used by pull, merged, etc.)
346
* Adding a file whose parent directory is not versioned will
347
implicitly add the parent, and so on up to the root. This means
348
you should never need to explictly add a directory, they'll just
349
get added when you add a file in the directory. Contributed by
352
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
355
* If you set BZR_EDITOR in the environment, it is checked in
356
preference to EDITOR and the config file for the interactive commit
357
editing program. Related to this is a bugfix where a missing program
358
set in EDITOR would cause editing to fail, now the fallback program
359
for the operating system is still tried.
361
* Files that are not directories/symlinks/regular files will no longer
362
cause bzr to fail, it will just ignore them by default. You cannot add
363
them to the tree though - they are not versionable.
368
* Refactor xml packing/unpacking.
372
* Fixed 'bzr mv' by Ollie Rutherfurd.
374
* Fixed strange error when trying to access a nonexistent http
377
* Make sure that the hashcache gets written out if it can't be
383
* Various Windows fixes from Ollie Rutherfurd.
385
* Quieten warnings about locking; patch from Matt Lavin.
392
* ``bzr shell-complete`` command contributed by Clint Adams to
393
help with intelligent shell completion.
395
* New expert command ``bzr find-merge-base`` for debugging merges.
400
* Much better merge support.
402
* merge3 conflicts are now reported with markers like '<<<<<<<'
403
(seven characters) which is the same as CVS and pleases things
409
* ``bzr upgrade`` no longer fails when trying to fix trees that
410
mention revisions that are not present.
412
* Fixed bugs in listing plugins from ``bzr plugins``.
414
* Fix case of $EDITOR containing options for the editor.
416
* Fix log -r refusing to show the last revision.
417
(Patch from Goffredo Baroncelli.)
422
* ``bzr log --show-ids`` shows the revision ids of all parents.
424
* Externally provided commands on your $BZRPATH no longer need
425
to recognize --bzr-usage to work properly, and can just handle
431
* Changed trace messages to go through the standard logging
432
framework, so that they can more easily be redirected by
441
* Python plugins, automatically loaded from the directories on
442
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
444
* New 'bzr mkdir' command.
446
* Commit mesage is fetched from an editor if not given on the
447
command line; patch from Torsten Marek.
449
* ``bzr log -m FOO`` displays commits whose message matches regexp
452
* ``bzr add`` with no arguments adds everything under the current directory.
454
* ``bzr mv`` does move or rename depending on its arguments, like
457
* ``bzr missing`` command shows a summary of the differences
458
between two trees. (Merged from John Arbash-Meinel.)
460
* An email address for commits to a particular tree can be
461
specified by putting it into .bzr/email within a branch. (Based
462
on a patch from Heikki Paajanen.)
467
* Faster working tree operations.
472
* 3rd-party modules shipped with bzr are copied within the bzrlib
473
python package, so that they can be installed by the setup
474
script without clashing with anything already existing on the
475
system. (Contributed by Gustavo Niemeyer.)
477
* Moved plugins directory to bzrlib/, so that there's a standard
478
plugin directory which is not only installed with bzr itself but
479
is also available when using bzr from the development tree.
480
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
481
standard plugins directory.
483
* When exporting to a tarball with ``bzr export --format tgz``, put
484
everything under a top directory rather than dumping it into the
485
current directory. This can be overridden with the ``--root``
486
option. Patch from William Dodé and John Meinel.
488
* New ``bzr upgrade`` command to upgrade the format of a branch,
489
replacing ``bzr check --update``.
491
* Files within store directories are no longer marked readonly on
494
* Changed ``bzr log`` output to a more compact form suggested by
495
John A Meinel. Old format is available with the ``--long`` or
496
``-l`` option, patched by William Dodé.
498
* By default the commit command refuses to record a revision with
499
no changes unless the ``--unchanged`` option is given.
501
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
502
line options must come before the command name because they
503
affect what commands are available; all other options must come
504
after the command name because their interpretation depends on
507
* ``branch`` and ``clone`` added as aliases for ``branch``.
509
* Default log format is back to the long format; the compact one
510
is available with ``--short``.
515
* Fix bugs in committing only selected files or within a subdirectory.
522
* ``bzr`` with no command now shows help rather than giving an
523
error. Suggested by Michael Ellerman.
525
* ``bzr status`` output format changed, because svn-style output
526
doesn't really match the model of bzr. Now files are grouped by
527
status and can be shown with their IDs. ``bzr status --all``
528
shows all versioned files and unknown files but not ignored files.
530
* ``bzr log`` runs from most-recent to least-recent, the reverse
531
of the previous order. The previous behaviour can be obtained
532
with the ``--forward`` option.
534
* ``bzr inventory`` by default shows only filenames, and also ids
535
if ``--show-ids`` is given, in which case the id is the second
5
541
* New 'bzr whoami --email' option shows only the email component
6
542
of the user identification, from Jo Vermeulen.
544
* New ``bzr ignore PATTERN`` command.
546
* Nicer error message for broken pipe, interrupt and similar
547
conditions that don't indicate an internal error.
549
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
551
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
552
either read or write mode.
554
* New option ``bzr log --show-ids`` shows revision and file ids.
556
* New usage ``bzr log FILENAME`` shows only revisions that
559
* Changed format for describing changes in ``bzr log -v``.
561
* New option ``bzr commit --file`` to take a message from a file,
562
suggested by LarstiQ.
564
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
565
Oler. File may be in a branch other than the working directory.
567
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
570
* Commands can now be defined by external programs or scripts
571
in a directory on $BZRPATH.
573
* New "stat cache" avoids reading the contents of files if they
574
haven't changed since the previous time.
576
* If the Python interpreter is too old, try to find a better one
577
or give an error. Based on a patch from Fredrik Lundh.
579
* New optional parameter ``bzr info [BRANCH]``.
581
* New form ``bzr commit SELECTED`` to commit only selected files.
583
* New form ``bzr log -r FROM:TO`` shows changes in selected
584
range; contributed by John A Meinel.
586
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
587
options through to an external GNU diff.
589
* New option ``bzr add --no-recurse`` to add a directory but not
592
* ``bzr --version`` now shows more information if bzr is being run
598
* Fixed diff format so that added and removed files will be
599
handled properly by patch. Fix from Lalo Martins.
601
* Various fixes for files whose names contain spaces or other
607
* Converted black-box test suites from Bourne shell into Python;
608
now run using ``./testbzr``. Various structural improvements to
611
* testbzr by default runs the version of bzr found in the same
612
directory as the tests, or the one given as the first parameter.
614
* testbzr also runs the internal tests, so the only command
615
required to check is just ``./testbzr``.
617
* testbzr requires python2.4, but can be used to test bzr running
618
under a different version.
620
* Tests added for many other changes in this release.
625
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
627
* Refactor command functions into Command objects based on HCT by
630
* Better help messages for many commands.
632
* Expose bzrlib.open_tracefile() to start the tracefile; until
633
this is called trace messages are just discarded.
635
* New internal function find_touching_revisions() and hidden
636
command touching-revisions trace the changes to a given file.
638
* Simpler and faster compare_inventories() function.
640
* bzrlib.open_tracefile() takes a tracefilename parameter.
642
* New AtomicFile class.
644
* New developer commands ``added``, ``modified``.
649
* Cope on Windows on python2.3 by using the weaker random seed.
650
2.4 is now only recommended.
9
653
bzr-0.0.4 2005-04-22
added
removed
NEWS
