4
* merge now takes a --show-base option to include the base text in
8
* The config files are now read using ConfigObj, so '=' should be used as
12
* New 'bzr commit --strict' option refuses to commit if there are
13
any unknown files in the tree. To commit, make sure all files are
14
either ignored, added, or deleted. (Michael Ellerman)
16
* The config directory is now ~/.bazaar, and there is a single file
17
~/.bazaar/bazaar.conf storing email, editor and other preferences.
20
* 'bzr add' no longer takes a --verbose option, and a --quiet option
21
has been added that suppresses all output.
23
* Improved zsh completion support in contrib/zsh, from Clint
26
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
29
* 'bzr check' now accepts -v for verbose reporting, and checks for
30
ghosts in the branch. (Robert Collins)
32
* New command 're-sign' which will regenerate the gpg signature for
33
a revision. (Robert Collins)
35
* If you set check_signatures=require for a path in
36
~/.bazaar/branches.conf then bzr will invoke your
37
gpg_signing_command (defaults to gpg) and record a digital signature
38
of your commit. (Robert Collins)
40
* 'bzr pull' now accepts '--clobber' which will discard local changes
41
and make this branch identical to the source branch. (Robert Collins)
43
* New sftp transport, based on Paramiko. (Robey Pointer)
45
* If the option 'post_commit' is set to one (or more) python function
46
names (must be in the bzrlib namespace), then they will be invoked
47
after the commit has completed, with the branch and revision_id as
48
parameters. (Robert Collins)
50
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
54
* The 'bzr selftest --pattern' option for has been removed, now
55
test specifiers on the command line can be simple strings, or
56
regexps, or both. (Robert Collins)
58
* Passing -v to selftest will now show the time each test took to
59
complete, which will aid in analysing performance regressions and
60
related questions. (Robert Collins)
62
* 'bzr selftest' runs all tests, even if one feels, unless '--one'
63
is given. (Martin Pool)
65
* There is a new method for TestCaseInTempDir, assertFileEqual, which
66
will check that a given content is equal to the content of the named
67
file. (Robert Collins)
71
* New 'testament' command and concept for making gpg-signatures
72
of revisions that are not tied to a particular internal
73
representation. (Martin Pool).
75
* Per-revision properties ('revprops') as key-value associated
76
strings on each revision created when the revision is committed.
77
Intended mainly for the use of external tools. (Martin Pool).
79
* Config options have moved from bzrlib.osutils to bzrlib.config.
82
* Improved command line option definitions allowing explanations
83
for individual options, among other things. Contributed by
86
* Config options have moved from bzrlib.osutils to bzrlib.config.
87
Configuration is now done via the config.Config interface:
88
Depending on whether you have a Branch, a Location or no information
89
available, construct a *Config, and use its signature_checking,
90
username and user_email methods. (Robert Collins)
92
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
93
they are made available for other plugins to use. You should not
94
import other plugins during the __init__ of your plugin though, as
95
no ordering is guaranteed, and the plugins directory is not on the
96
python path. (Robert Collins)
98
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
99
no longer takes an inventory, rather it takes an option branch
100
parameter, and if None is given will open the branch at basedir
101
implicitly. (Robert Collins)
103
* Cleaner exception structure and error reporting. Suggested by
104
Scott James Remnant. (Martin Pool)
106
* Branch.remove has been moved to WorkingTree, which has also gained
107
lock_read, lock_write and unlock methods for convenience. (Robert
110
* Two decorators, needs_read_lock and needs_write_lock have been added
111
to the branch module. Use these to cause a function to run in a
112
read or write lock respectively. (Robert Collins)
114
* Branch.open_containing now returns a tuple (Branch, relative-path),
115
which allows direct access to the common case of 'get me this file
116
from its branch'. (Robert Collins)
118
* 'pull' has been factored out of the command as WorkingTree.pull().
119
A new option to WorkingTree.pull has been added, clobber, which will
120
ignore diverged history and pull anyway.
123
* config.Config has a 'get_user_option' call that accepts an option name.
124
This will be looked up in branches.conf and bazaar.conf as normal.
125
It is intended that this be used by plugins to support options -
126
options of built in programs should have specific methods on the config.
129
* merge.merge_inner now has tempdir as an optional parameter. (Robert
132
* Tree.kind is not recorded at the top level of the hierarchy, as it was
133
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
136
* WorkingTree.__del__ has been removed, it was non deterministic and not
137
doing what it was intended to. See WorkingTree.__init__ for a comment
138
about future directions. (Robert Collins/Martin Pool)
140
* bzrlib.transport.http has been modified so that only 404 urllib errors
141
are returned as NoSuchFile. Other exceptions will propogate as normal.
142
This allows debuging of actual errors. (Robert Collins)
144
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
145
to apis like 'put', 'get' and 'has'. This is to provide consistent
146
behaviour - it operates on url's only. (Robert Collins)
148
* Transports can register using register_lazy_transport, and they
149
will be loaded when first used. (Martin Pool)
151
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
152
is called by merge_inner. This is so that the conflict count can be
153
retrieved (and potentially manipulated) before returning to the caller
154
of merge_inner. Likewise 'merge' now returns the conflict count to the
155
caller. (Robert Collins)
159
* Better handling of branches in directories with non-ascii names.
160
(Joel Rosdahl, Panagiotis Papadakos)
166
* Fix problem in pulling over http from machines that do not
167
allow directories to be listed.
169
* Avoid harmless warning about invalid hash cache after
170
upgrading branch format.
174
* Avoid some unnecessary http operations in branch and pull.
181
* 'bzr branch' over http initially gives a very high estimate
182
of completion time but it should fall as the first few
183
revisions are pulled in. branch is still slow on
184
high-latency connections.
188
* bzr-man.py has been updated to work again. Contributed by
191
* Locking is now done with fcntl.lockf which works with NFS
192
file systems. Contributed by Harald Meland.
194
* When a merge encounters a file that has been deleted on
195
one side and modified on the other, the old contents are
196
written out to foo.BASE and foo.SIDE, where SIDE is this
197
or OTHER. Contributed by Aaron Bentley.
199
* Export was choosing incorrect file paths for the content of
200
the tarball, this has been fixed by Aaron Bentley.
202
* Commit will no longer commit without a log message, an
203
error is returned instead. Contributed by Jelmer Vernooij.
205
* If you commit a specific file in a sub directory, any of its
206
parent directories that are added but not listed will be
207
automatically included. Suggested by Michael Ellerman.
209
* bzr commit and upgrade did not correctly record new revisions
210
for files with only a change to their executable status.
211
bzr will correct this when it encounters it. Fixed by
214
* HTTP tests now force off the use of http_proxy for the duration.
215
Contributed by Gustavo Niemeyer.
217
* Fix problems in merging weave-based branches that have
218
different partial views of history.
220
* Symlink support: working with symlinks when not in the root of a
221
bzr tree was broken, patch from Scott James Remnant.
226
* 'branch' now accepts a --basis parameter which will take advantage
227
of local history when making a new branch. This allows faster
228
branching of remote branches. Contributed by Aaron Bentley.
230
* New tree format based on weave files, called version 5.
231
Existing branches can be upgraded to this format using
234
* Symlinks are now versionable. Initial patch by
235
Erik Toubro Nielsen, updated to head by Robert Collins.
237
* Executable bits are tracked on files. Patch from Gustavo
240
* 'bzr status' now shows unknown files inside a selected directory.
241
Patch from Heikki Paajanen.
243
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
244
and 'resolve' have needed added, which list and remove those
245
merge conflicts respectively. A conflicted tree cannot be committed
246
in. Contributed by Aaron Bentley.
248
* 'rm' is now an alias for 'remove'.
250
* Stores now split out their content in a single byte prefixed hash,
251
dropping the density of files per directory by 256. Contributed by
254
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
255
Contributed by Robert Collins.
257
* 'bzr log' with the default formatter will show merged revisions,
258
indented to the right. Initial implementation contributed by Gustavo
259
Niemeyer, made incremental by Robert Collins.
264
* Test case failures have the exception printed after the log
265
for your viewing pleasure.
267
* InventoryEntry is now an abstract base class, use one of the
268
concrete InventoryDirectory etc classes instead.
270
* Branch raises an UnsupportedFormatError when it detects a
271
bzr branch it cannot understand. This allows for precise
272
handling of such circumstances.
277
* Removed testsweet module so that tests can be run after
278
bzr installed by 'bzr selftest'.
280
* 'bzr selftest' command-line arguments can now be partial ids
281
of tests to run, e.g. 'bzr selftest test_weave'
288
* Fixed "branch -r" option.
290
* Fix remote access to branches containing non-compressed history.
293
* Better reliability of http server tests. (John Arbash-Meinel)
295
* Merge graph maximum distance calculation fix. (Aaron Bentley)
297
* Various minor bug in windows support have been fixed, largely in the
298
test suite. Contributed by Alexander Belchenko.
302
* Status now accepts a -r argument to give status between chosen
303
revisions. Contributed by Heikki Paajanen.
305
* Revision arguments no longer use +/-/= to control ranges, instead
306
there is a 'before' namespace, which limits the successive namespace.
307
For example '$ bzr log -r date:yesterday..before:date:today' will
308
select everything from yesterday and before today. Contributed by
311
* There is now a bzr.bat file created by distutils when building on
312
Windows. Contributed by Alexander Belchenko.
316
* Removed uuid() as it was unused.
318
* Improved 'fetch' code for pulling revisions from one branch into
319
another (used by pull, merged, etc.)
326
* Adding a file whose parent directory is not versioned will
327
implicitly add the parent, and so on up to the root. This means
328
you should never need to explictly add a directory, they'll just
329
get added when you add a file in the directory. Contributed by
332
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
335
* If you set BZR_EDITOR in the environment, it is checked in
336
preference to EDITOR and the config file for the interactive commit
337
editing program. Related to this is a bugfix where a missing program
338
set in EDITOR would cause editing to fail, now the fallback program
339
for the operating system is still tried.
341
* Files that are not directories/symlinks/regular files will no longer
342
cause bzr to fail, it will just ignore them by default. You cannot add
343
them to the tree though - they are not versionable.
348
* Refactor xml packing/unpacking.
352
* Fixed 'bzr mv' by Ollie Rutherfurd.
354
* Fixed strange error when trying to access a nonexistent http
357
* Make sure that the hashcache gets written out if it can't be
363
* Various Windows fixes from Ollie Rutherfurd.
365
* Quieten warnings about locking; patch from Matt Lavin.
372
* ``bzr shell-complete`` command contributed by Clint Adams to
373
help with intelligent shell completion.
375
* New expert command ``bzr find-merge-base`` for debugging merges.
380
* Much better merge support.
382
* merge3 conflicts are now reported with markers like '<<<<<<<'
383
(seven characters) which is the same as CVS and pleases things
389
* ``bzr upgrade`` no longer fails when trying to fix trees that
390
mention revisions that are not present.
392
* Fixed bugs in listing plugins from ``bzr plugins``.
394
* Fix case of $EDITOR containing options for the editor.
396
* Fix log -r refusing to show the last revision.
397
(Patch from Goffredo Baroncelli.)
402
* ``bzr log --show-ids`` shows the revision ids of all parents.
404
* Externally provided commands on your $BZRPATH no longer need
405
to recognize --bzr-usage to work properly, and can just handle
411
* Changed trace messages to go through the standard logging
412
framework, so that they can more easily be redirected by
421
* Python plugins, automatically loaded from the directories on
422
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
424
* New 'bzr mkdir' command.
426
* Commit mesage is fetched from an editor if not given on the
427
command line; patch from Torsten Marek.
429
* ``bzr log -m FOO`` displays commits whose message matches regexp
432
* ``bzr add`` with no arguments adds everything under the current directory.
434
* ``bzr mv`` does move or rename depending on its arguments, like
437
* ``bzr missing`` command shows a summary of the differences
438
between two trees. (Merged from John Arbash-Meinel.)
440
* An email address for commits to a particular tree can be
441
specified by putting it into .bzr/email within a branch. (Based
442
on a patch from Heikki Paajanen.)
447
* Faster working tree operations.
452
* 3rd-party modules shipped with bzr are copied within the bzrlib
453
python package, so that they can be installed by the setup
454
script without clashing with anything already existing on the
455
system. (Contributed by Gustavo Niemeyer.)
457
* Moved plugins directory to bzrlib/, so that there's a standard
458
plugin directory which is not only installed with bzr itself but
459
is also available when using bzr from the development tree.
460
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
461
standard plugins directory.
463
* When exporting to a tarball with ``bzr export --format tgz``, put
464
everything under a top directory rather than dumping it into the
465
current directory. This can be overridden with the ``--root``
466
option. Patch from William Dodé and John Meinel.
468
* New ``bzr upgrade`` command to upgrade the format of a branch,
469
replacing ``bzr check --update``.
471
* Files within store directories are no longer marked readonly on
474
* Changed ``bzr log`` output to a more compact form suggested by
475
John A Meinel. Old format is available with the ``--long`` or
476
``-l`` option, patched by William Dodé.
478
* By default the commit command refuses to record a revision with
479
no changes unless the ``--unchanged`` option is given.
481
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
482
line options must come before the command name because they
483
affect what commands are available; all other options must come
484
after the command name because their interpretation depends on
487
* ``branch`` and ``clone`` added as aliases for ``branch``.
489
* Default log format is back to the long format; the compact one
490
is available with ``--short``.
495
* Fix bugs in committing only selected files or within a subdirectory.
502
* ``bzr`` with no command now shows help rather than giving an
503
error. Suggested by Michael Ellerman.
505
* ``bzr status`` output format changed, because svn-style output
506
doesn't really match the model of bzr. Now files are grouped by
507
status and can be shown with their IDs. ``bzr status --all``
508
shows all versioned files and unknown files but not ignored files.
510
* ``bzr log`` runs from most-recent to least-recent, the reverse
511
of the previous order. The previous behaviour can be obtained
512
with the ``--forward`` option.
514
* ``bzr inventory`` by default shows only filenames, and also ids
515
if ``--show-ids`` is given, in which case the id is the second
521
* New 'bzr whoami --email' option shows only the email component
522
of the user identification, from Jo Vermeulen.
524
* New ``bzr ignore PATTERN`` command.
526
* Nicer error message for broken pipe, interrupt and similar
527
conditions that don't indicate an internal error.
529
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
531
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
532
either read or write mode.
534
* New option ``bzr log --show-ids`` shows revision and file ids.
536
* New usage ``bzr log FILENAME`` shows only revisions that
539
* Changed format for describing changes in ``bzr log -v``.
541
* New option ``bzr commit --file`` to take a message from a file,
542
suggested by LarstiQ.
544
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
545
Oler. File may be in a branch other than the working directory.
547
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
550
* Commands can now be defined by external programs or scripts
551
in a directory on $BZRPATH.
553
* New "stat cache" avoids reading the contents of files if they
554
haven't changed since the previous time.
556
* If the Python interpreter is too old, try to find a better one
557
or give an error. Based on a patch from Fredrik Lundh.
559
* New optional parameter ``bzr info [BRANCH]``.
561
* New form ``bzr commit SELECTED`` to commit only selected files.
563
* New form ``bzr log -r FROM:TO`` shows changes in selected
564
range; contributed by John A Meinel.
566
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
567
options through to an external GNU diff.
569
* New option ``bzr add --no-recurse`` to add a directory but not
572
* ``bzr --version`` now shows more information if bzr is being run
578
* Fixed diff format so that added and removed files will be
579
handled properly by patch. Fix from Lalo Martins.
581
* Various fixes for files whose names contain spaces or other
587
* Converted black-box test suites from Bourne shell into Python;
588
now run using ``./testbzr``. Various structural improvements to
591
* testbzr by default runs the version of bzr found in the same
592
directory as the tests, or the one given as the first parameter.
594
* testbzr also runs the internal tests, so the only command
595
required to check is just ``./testbzr``.
597
* testbzr requires python2.4, but can be used to test bzr running
598
under a different version.
600
* Tests added for many other changes in this release.
605
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
607
* Refactor command functions into Command objects based on HCT by
610
* Better help messages for many commands.
612
* Expose bzrlib.open_tracefile() to start the tracefile; until
613
this is called trace messages are just discarded.
615
* New internal function find_touching_revisions() and hidden
616
command touching-revisions trace the changes to a given file.
618
* Simpler and faster compare_inventories() function.
620
* bzrlib.open_tracefile() takes a tracefilename parameter.
622
* New AtomicFile class.
624
* New developer commands ``added``, ``modified``.
629
* Cope on Windows on python2.3 by using the weaker random seed.
630
2.4 is now only recommended.
637
* 'bzr diff' optionally takes a list of files to diff. Still a bit
638
basic. Patch from QuantumG.
640
* More default ignore patterns.
642
* New 'bzr log --verbose' shows a list of files changed in the
643
changeset. Patch from Sebastian Cote.
645
* Roll over ~/.bzr.log if it gets too large.
647
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
650
* New 'bzr help commands' based on a patch from Denys Duchier.
655
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
656
or $EMAIL. All are decoded by the locale preferred encoding.
657
If none of these are present user@hostname is used. The host's
658
fully-qualified name is not used because that tends to fail when
659
there are DNS problems.
661
* New 'bzr whoami' command instead of username user-email.
666
* Make commit safe for hardlinked bzr trees.
668
* Some Unicode/locale fixes.
670
* Partial workaround for difflib.unified_diff not handling
671
trailing newlines properly.
676
* Allow docstrings for help to be in PEP0257 format. Patch from
679
* More tests in test.sh.
681
* Write profile data to a temporary file not into working
682
directory and delete it when done.
684
* Smaller .bzr.log with process ids.
689
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
692
* Some improvements in handling paths on Windows, based on a patch
700
* New "directories" internal command lists versioned directories
703
* Can now say "bzr commit --help".
705
* New "rename" command to rename one file to a different name
708
* New "move" command to move one or more files into a different
711
* New "renames" command lists files renamed since base revision.
713
* New cat command contributed by janmar.
717
* .bzr.log is placed in $HOME (not pwd) and is always written in
718
UTF-8. (Probably not a completely good long-term solution, but
723
* Workaround for difflib bug in Python 2.3 that causes an
724
exception when comparing empty files. Reported by Erik Toubro
729
* Refactored inventory storage to insert a root entry at the top.
733
* Start of shell-based black-box testing in test.sh.
740
* Win32 fixes from Steve Brown.
743
bzr-0.0.2 "black cube" 2005-03-31
747
* Default ignore list extended (see bzrlib/__init__.py).
749
* Patterns in .bzrignore are now added to the default ignore list,
750
rather than replacing it.
752
* Ignore list isn't reread for every file.
756
* Reinstate the 'bzr check' command to check invariants of the
759
* New 'ignored' command lists which files are ignored and why;
760
'deleted' lists files deleted in the current working tree.
762
* Performance improvements.
764
* New global --profile option.
766
* Ignore patterns like './config.h' now correctly match files in
767
the root directory only.
774
* More information from info command.
776
* Can now say "bzr help COMMAND" for more detailed help.
778
* Less file flushing and faster performance when writing logs and
779
committing to stores.
781
* More useful verbose output from some commands.
785
* Fix inverted display of 'R' and 'M' during 'commit -v'.
789
* Include a subset of ElementTree-1.2.20040618 to make
792
* Fix time.localtime call to work with Python 2.3 (the minimum
796
bzr-0.0.0.69 2005-03-22
800
* First public release.
802
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
