11
* merge now takes a --show-base option to include the base text in
15
* The config files are now read using ConfigObj, so '=' should be used as
19
* New 'bzr commit --strict' option refuses to commit if there are
20
any unknown files in the tree. To commit, make sure all files are
21
either ignored, added, or deleted. (Michael Ellerman)
23
* The config directory is now ~/.bazaar, and there is a single file
24
~/.bazaar/bazaar.conf storing email, editor and other preferences.
27
* 'bzr add' no longer takes a --verbose option, and a --quiet option
28
has been added that suppresses all output.
30
* Improved zsh completion support in contrib/zsh, from Clint
33
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
36
* 'bzr check' now accepts -v for verbose reporting, and checks for
37
ghosts in the branch. (Robert Collins)
39
* New command 're-sign' which will regenerate the gpg signature for
40
a revision. (Robert Collins)
42
* If you set check_signatures=require for a path in
43
~/.bazaar/branches.conf then bzr will invoke your
44
gpg_signing_command (defaults to gpg) and record a digital signature
45
of your commit. (Robert Collins)
47
* New sftp transport, based on Paramiko. (Robey Pointer)
49
* 'bzr pull' now accepts '--clobber' which will discard local changes
50
and make this branch identical to the source branch. (Robert Collins)
52
* Just give a quieter warning if a plugin can't be loaded, and
53
put the details in .bzr.log. (Martin Pool)
55
* 'bzr branch' will now set the branch-name to the last component of the
56
output directory, if one was supplied.
58
* New sftp transport, based on Paramiko. (Robey Pointer)
60
* If the option 'post_commit' is set to one (or more) python function
61
names (must be in the bzrlib namespace), then they will be invoked
62
after the commit has completed, with the branch and revision_id as
63
parameters. (Robert Collins)
65
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
67
* --merge-type weave is now supported for file contents. Tree-shape
68
changes are still three-way based. (Martin Pool, Aaron Bentley)
70
* 'bzr check' allows the first revision on revision-history to have
71
parents - something that is expected for cheap checkouts, and occurs
72
when conversions from baz do not have all history. (Robert Collins).
74
* 'bzr merge' can now graft unrelated trees together, if your specify
75
0 as a base. (Aaron Bentley)
77
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
80
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
82
* 'bzr merge --reprocess' minimizes conflicts
86
* The 'bzr selftest --pattern' option for has been removed, now
87
test specifiers on the command line can be simple strings, or
88
regexps, or both. (Robert Collins)
90
* Passing -v to selftest will now show the time each test took to
91
complete, which will aid in analysing performance regressions and
92
related questions. (Robert Collins)
94
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
95
is given. (Martin Pool)
97
* There is a new method for TestCaseInTempDir, assertFileEqual, which
98
will check that a given content is equal to the content of the named
99
file. (Robert Collins)
101
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
106
* New 'testament' command and concept for making gpg-signatures
107
of revisions that are not tied to a particular internal
108
representation. (Martin Pool).
110
* Per-revision properties ('revprops') as key-value associated
111
strings on each revision created when the revision is committed.
112
Intended mainly for the use of external tools. (Martin Pool).
114
* Config options have moved from bzrlib.osutils to bzrlib.config.
117
* Improved command line option definitions allowing explanations
118
for individual options, among other things. Contributed by
121
* Config options have moved from bzrlib.osutils to bzrlib.config.
122
Configuration is now done via the config.Config interface:
123
Depending on whether you have a Branch, a Location or no information
124
available, construct a *Config, and use its signature_checking,
125
username and user_email methods. (Robert Collins)
127
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
128
they are made available for other plugins to use. You should not
129
import other plugins during the __init__ of your plugin though, as
130
no ordering is guaranteed, and the plugins directory is not on the
131
python path. (Robert Collins)
133
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
134
no longer takes an inventory, rather it takes an option branch
135
parameter, and if None is given will open the branch at basedir
136
implicitly. (Robert Collins)
138
* Cleaner exception structure and error reporting. Suggested by
139
Scott James Remnant. (Martin Pool)
141
* Branch.remove has been moved to WorkingTree, which has also gained
142
lock_read, lock_write and unlock methods for convenience. (Robert
145
* Two decorators, needs_read_lock and needs_write_lock have been added
146
to the branch module. Use these to cause a function to run in a
147
read or write lock respectively. (Robert Collins)
149
* Branch.open_containing now returns a tuple (Branch, relative-path),
150
which allows direct access to the common case of 'get me this file
151
from its branch'. (Robert Collins)
153
* Transports can register using register_lazy_transport, and they
154
will be loaded when first used. (Martin Pool)
156
* 'pull' has been factored out of the command as WorkingTree.pull().
157
A new option to WorkingTree.pull has been added, clobber, which will
158
ignore diverged history and pull anyway.
161
* config.Config has a 'get_user_option' call that accepts an option name.
162
This will be looked up in branches.conf and bazaar.conf as normal.
163
It is intended that this be used by plugins to support options -
164
options of built in programs should have specific methods on the config.
167
* merge.merge_inner now has tempdir as an optional parameter. (Robert
170
* Tree.kind is not recorded at the top level of the hierarchy, as it was
171
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
174
* WorkingTree.__del__ has been removed, it was non deterministic and not
175
doing what it was intended to. See WorkingTree.__init__ for a comment
176
about future directions. (Robert Collins/Martin Pool)
178
* bzrlib.transport.http has been modified so that only 404 urllib errors
179
are returned as NoSuchFile. Other exceptions will propogate as normal.
180
This allows debuging of actual errors. (Robert Collins)
182
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
183
to apis like 'put', 'get' and 'has'. This is to provide consistent
184
behaviour - it operates on url's only. (Robert Collins)
186
* Transports can register using register_lazy_transport, and they
187
will be loaded when first used. (Martin Pool)
189
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
190
is called by merge_inner. This is so that the conflict count can be
191
retrieved (and potentially manipulated) before returning to the caller
192
of merge_inner. Likewise 'merge' now returns the conflict count to the
193
caller. (Robert Collins)
195
* 'revision.revision_graph can handle having only partial history for
196
a revision - that is no revisions in the graph with no parents.
199
* New builtins.branch_files uses the standard file_list rules to produce
200
a branch and a list of paths, relative to that branch (Aaron Bentley)
202
* New TestCase.addCleanup facility.
204
* New bzrlib.version_info tuple (similar to sys.version_info), which can
205
be used by programs importing bzrlib.
209
* Better handling of branches in directories with non-ascii names.
210
(Joel Rosdahl, Panagiotis Papadakos)
216
* Fix problem in pulling over http from machines that do not
217
allow directories to be listed.
219
* Avoid harmless warning about invalid hash cache after
220
upgrading branch format.
224
* Avoid some unnecessary http operations in branch and pull.
231
* 'bzr branch' over http initially gives a very high estimate
232
of completion time but it should fall as the first few
233
revisions are pulled in. branch is still slow on
234
high-latency connections.
238
* bzr-man.py has been updated to work again. Contributed by
241
* Locking is now done with fcntl.lockf which works with NFS
242
file systems. Contributed by Harald Meland.
244
* When a merge encounters a file that has been deleted on
245
one side and modified on the other, the old contents are
246
written out to foo.BASE and foo.SIDE, where SIDE is this
247
or OTHER. Contributed by Aaron Bentley.
249
* Export was choosing incorrect file paths for the content of
250
the tarball, this has been fixed by Aaron Bentley.
252
* Commit will no longer commit without a log message, an
253
error is returned instead. Contributed by Jelmer Vernooij.
255
* If you commit a specific file in a sub directory, any of its
256
parent directories that are added but not listed will be
257
automatically included. Suggested by Michael Ellerman.
259
* bzr commit and upgrade did not correctly record new revisions
260
for files with only a change to their executable status.
261
bzr will correct this when it encounters it. Fixed by
264
* HTTP tests now force off the use of http_proxy for the duration.
265
Contributed by Gustavo Niemeyer.
267
* Fix problems in merging weave-based branches that have
268
different partial views of history.
270
* Symlink support: working with symlinks when not in the root of a
271
bzr tree was broken, patch from Scott James Remnant.
276
* 'branch' now accepts a --basis parameter which will take advantage
277
of local history when making a new branch. This allows faster
278
branching of remote branches. Contributed by Aaron Bentley.
280
* New tree format based on weave files, called version 5.
281
Existing branches can be upgraded to this format using
284
* Symlinks are now versionable. Initial patch by
285
Erik Toubro Nielsen, updated to head by Robert Collins.
287
* Executable bits are tracked on files. Patch from Gustavo
290
* 'bzr status' now shows unknown files inside a selected directory.
291
Patch from Heikki Paajanen.
293
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
294
and 'resolve' have needed added, which list and remove those
295
merge conflicts respectively. A conflicted tree cannot be committed
296
in. Contributed by Aaron Bentley.
298
* 'rm' is now an alias for 'remove'.
300
* Stores now split out their content in a single byte prefixed hash,
301
dropping the density of files per directory by 256. Contributed by
304
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
305
Contributed by Robert Collins.
307
* 'bzr log' with the default formatter will show merged revisions,
308
indented to the right. Initial implementation contributed by Gustavo
309
Niemeyer, made incremental by Robert Collins.
314
* Test case failures have the exception printed after the log
315
for your viewing pleasure.
317
* InventoryEntry is now an abstract base class, use one of the
318
concrete InventoryDirectory etc classes instead.
320
* Branch raises an UnsupportedFormatError when it detects a
321
bzr branch it cannot understand. This allows for precise
322
handling of such circumstances.
327
* Removed testsweet module so that tests can be run after
328
bzr installed by 'bzr selftest'.
330
* 'bzr selftest' command-line arguments can now be partial ids
331
of tests to run, e.g. 'bzr selftest test_weave'
338
* Fixed "branch -r" option.
340
* Fix remote access to branches containing non-compressed history.
343
* Better reliability of http server tests. (John Arbash-Meinel)
345
* Merge graph maximum distance calculation fix. (Aaron Bentley)
347
* Various minor bug in windows support have been fixed, largely in the
348
test suite. Contributed by Alexander Belchenko.
352
* Status now accepts a -r argument to give status between chosen
353
revisions. Contributed by Heikki Paajanen.
355
* Revision arguments no longer use +/-/= to control ranges, instead
356
there is a 'before' namespace, which limits the successive namespace.
357
For example '$ bzr log -r date:yesterday..before:date:today' will
358
select everything from yesterday and before today. Contributed by
361
* There is now a bzr.bat file created by distutils when building on
362
Windows. Contributed by Alexander Belchenko.
366
* Removed uuid() as it was unused.
368
* Improved 'fetch' code for pulling revisions from one branch into
369
another (used by pull, merged, etc.)
376
* Adding a file whose parent directory is not versioned will
377
implicitly add the parent, and so on up to the root. This means
378
you should never need to explictly add a directory, they'll just
379
get added when you add a file in the directory. Contributed by
382
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
385
* If you set BZR_EDITOR in the environment, it is checked in
386
preference to EDITOR and the config file for the interactive commit
387
editing program. Related to this is a bugfix where a missing program
388
set in EDITOR would cause editing to fail, now the fallback program
389
for the operating system is still tried.
391
* Files that are not directories/symlinks/regular files will no longer
392
cause bzr to fail, it will just ignore them by default. You cannot add
393
them to the tree though - they are not versionable.
398
* Refactor xml packing/unpacking.
402
* Fixed 'bzr mv' by Ollie Rutherfurd.
404
* Fixed strange error when trying to access a nonexistent http
407
* Make sure that the hashcache gets written out if it can't be
413
* Various Windows fixes from Ollie Rutherfurd.
415
* Quieten warnings about locking; patch from Matt Lavin.
422
* ``bzr shell-complete`` command contributed by Clint Adams to
423
help with intelligent shell completion.
425
* New expert command ``bzr find-merge-base`` for debugging merges.
430
* Much better merge support.
432
* merge3 conflicts are now reported with markers like '<<<<<<<'
433
(seven characters) which is the same as CVS and pleases things
439
* ``bzr upgrade`` no longer fails when trying to fix trees that
440
mention revisions that are not present.
442
* Fixed bugs in listing plugins from ``bzr plugins``.
444
* Fix case of $EDITOR containing options for the editor.
446
* Fix log -r refusing to show the last revision.
447
(Patch from Goffredo Baroncelli.)
452
* ``bzr log --show-ids`` shows the revision ids of all parents.
454
* Externally provided commands on your $BZRPATH no longer need
455
to recognize --bzr-usage to work properly, and can just handle
461
* Changed trace messages to go through the standard logging
462
framework, so that they can more easily be redirected by
471
* Python plugins, automatically loaded from the directories on
472
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
474
* New 'bzr mkdir' command.
476
* Commit mesage is fetched from an editor if not given on the
477
command line; patch from Torsten Marek.
479
* ``bzr log -m FOO`` displays commits whose message matches regexp
482
* ``bzr add`` with no arguments adds everything under the current directory.
484
* ``bzr mv`` does move or rename depending on its arguments, like
487
* ``bzr missing`` command shows a summary of the differences
488
between two trees. (Merged from John Arbash-Meinel.)
490
* An email address for commits to a particular tree can be
491
specified by putting it into .bzr/email within a branch. (Based
492
on a patch from Heikki Paajanen.)
497
* Faster working tree operations.
502
* 3rd-party modules shipped with bzr are copied within the bzrlib
503
python package, so that they can be installed by the setup
504
script without clashing with anything already existing on the
505
system. (Contributed by Gustavo Niemeyer.)
507
* Moved plugins directory to bzrlib/, so that there's a standard
508
plugin directory which is not only installed with bzr itself but
509
is also available when using bzr from the development tree.
510
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
511
standard plugins directory.
513
* When exporting to a tarball with ``bzr export --format tgz``, put
514
everything under a top directory rather than dumping it into the
515
current directory. This can be overridden with the ``--root``
516
option. Patch from William Dodé and John Meinel.
518
* New ``bzr upgrade`` command to upgrade the format of a branch,
519
replacing ``bzr check --update``.
521
* Files within store directories are no longer marked readonly on
524
* Changed ``bzr log`` output to a more compact form suggested by
525
John A Meinel. Old format is available with the ``--long`` or
526
``-l`` option, patched by William Dodé.
528
* By default the commit command refuses to record a revision with
529
no changes unless the ``--unchanged`` option is given.
531
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
532
line options must come before the command name because they
533
affect what commands are available; all other options must come
534
after the command name because their interpretation depends on
537
* ``branch`` and ``clone`` added as aliases for ``branch``.
539
* Default log format is back to the long format; the compact one
540
is available with ``--short``.
545
* Fix bugs in committing only selected files or within a subdirectory.
552
* ``bzr`` with no command now shows help rather than giving an
553
error. Suggested by Michael Ellerman.
555
* ``bzr status`` output format changed, because svn-style output
556
doesn't really match the model of bzr. Now files are grouped by
557
status and can be shown with their IDs. ``bzr status --all``
558
shows all versioned files and unknown files but not ignored files.
560
* ``bzr log`` runs from most-recent to least-recent, the reverse
561
of the previous order. The previous behaviour can be obtained
562
with the ``--forward`` option.
564
* ``bzr inventory`` by default shows only filenames, and also ids
565
if ``--show-ids`` is given, in which case the id is the second
571
* New 'bzr whoami --email' option shows only the email component
572
of the user identification, from Jo Vermeulen.
574
* New ``bzr ignore PATTERN`` command.
576
* Nicer error message for broken pipe, interrupt and similar
577
conditions that don't indicate an internal error.
579
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
581
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
582
either read or write mode.
584
* New option ``bzr log --show-ids`` shows revision and file ids.
586
* New usage ``bzr log FILENAME`` shows only revisions that
589
* Changed format for describing changes in ``bzr log -v``.
591
* New option ``bzr commit --file`` to take a message from a file,
592
suggested by LarstiQ.
594
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
595
Oler. File may be in a branch other than the working directory.
597
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
600
* Commands can now be defined by external programs or scripts
601
in a directory on $BZRPATH.
603
* New "stat cache" avoids reading the contents of files if they
604
haven't changed since the previous time.
606
* If the Python interpreter is too old, try to find a better one
607
or give an error. Based on a patch from Fredrik Lundh.
609
* New optional parameter ``bzr info [BRANCH]``.
611
* New form ``bzr commit SELECTED`` to commit only selected files.
613
* New form ``bzr log -r FROM:TO`` shows changes in selected
614
range; contributed by John A Meinel.
616
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
617
options through to an external GNU diff.
619
* New option ``bzr add --no-recurse`` to add a directory but not
622
* ``bzr --version`` now shows more information if bzr is being run
628
* Fixed diff format so that added and removed files will be
629
handled properly by patch. Fix from Lalo Martins.
631
* Various fixes for files whose names contain spaces or other
637
* Converted black-box test suites from Bourne shell into Python;
638
now run using ``./testbzr``. Various structural improvements to
641
* testbzr by default runs the version of bzr found in the same
642
directory as the tests, or the one given as the first parameter.
644
* testbzr also runs the internal tests, so the only command
645
required to check is just ``./testbzr``.
647
* testbzr requires python2.4, but can be used to test bzr running
648
under a different version.
650
* Tests added for many other changes in this release.
655
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
657
* Refactor command functions into Command objects based on HCT by
660
* Better help messages for many commands.
662
* Expose bzrlib.open_tracefile() to start the tracefile; until
663
this is called trace messages are just discarded.
665
* New internal function find_touching_revisions() and hidden
666
command touching-revisions trace the changes to a given file.
668
* Simpler and faster compare_inventories() function.
670
* bzrlib.open_tracefile() takes a tracefilename parameter.
672
* New AtomicFile class.
674
* New developer commands ``added``, ``modified``.
679
* Cope on Windows on python2.3 by using the weaker random seed.
680
2.4 is now only recommended.
687
* 'bzr diff' optionally takes a list of files to diff. Still a bit
688
basic. Patch from QuantumG.
690
* More default ignore patterns.
692
* New 'bzr log --verbose' shows a list of files changed in the
693
changeset. Patch from Sebastian Cote.
695
* Roll over ~/.bzr.log if it gets too large.
697
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
700
* New 'bzr help commands' based on a patch from Denys Duchier.
705
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
706
or $EMAIL. All are decoded by the locale preferred encoding.
707
If none of these are present user@hostname is used. The host's
708
fully-qualified name is not used because that tends to fail when
709
there are DNS problems.
711
* New 'bzr whoami' command instead of username user-email.
716
* Make commit safe for hardlinked bzr trees.
718
* Some Unicode/locale fixes.
720
* Partial workaround for difflib.unified_diff not handling
721
trailing newlines properly.
726
* Allow docstrings for help to be in PEP0257 format. Patch from
729
* More tests in test.sh.
731
* Write profile data to a temporary file not into working
732
directory and delete it when done.
734
* Smaller .bzr.log with process ids.
739
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
742
* Some improvements in handling paths on Windows, based on a patch
750
* New "directories" internal command lists versioned directories
753
* Can now say "bzr commit --help".
755
* New "rename" command to rename one file to a different name
758
* New "move" command to move one or more files into a different
761
* New "renames" command lists files renamed since base revision.
763
* New cat command contributed by janmar.
767
* .bzr.log is placed in $HOME (not pwd) and is always written in
768
UTF-8. (Probably not a completely good long-term solution, but
773
* Workaround for difflib bug in Python 2.3 that causes an
774
exception when comparing empty files. Reported by Erik Toubro
779
* Refactored inventory storage to insert a root entry at the top.
783
* Start of shell-based black-box testing in test.sh.
790
* Win32 fixes from Steve Brown.
793
bzr-0.0.2 "black cube" 2005-03-31
797
* Default ignore list extended (see bzrlib/__init__.py).
799
* Patterns in .bzrignore are now added to the default ignore list,
800
rather than replacing it.
802
* Ignore list isn't reread for every file.
806
* Reinstate the 'bzr check' command to check invariants of the
809
* New 'ignored' command lists which files are ignored and why;
810
'deleted' lists files deleted in the current working tree.
812
* Performance improvements.
814
* New global --profile option.
816
* Ignore patterns like './config.h' now correctly match files in
817
the root directory only.
824
* More information from info command.
826
* Can now say "bzr help COMMAND" for more detailed help.
828
* Less file flushing and faster performance when writing logs and
829
committing to stores.
831
* More useful verbose output from some commands.
835
* Fix inverted display of 'R' and 'M' during 'commit -v'.
839
* Include a subset of ElementTree-1.2.20040618 to make
842
* Fix time.localtime call to work with Python 2.3 (the minimum
846
bzr-0.0.0.69 2005-03-22
850
* First public release.
852
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
