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)
65
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
69
* The 'bzr selftest --pattern' option for has been removed, now
70
test specifiers on the command line can be simple strings, or
71
regexps, or both. (Robert Collins)
73
* Passing -v to selftest will now show the time each test took to
74
complete, which will aid in analysing performance regressions and
75
related questions. (Robert Collins)
77
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
78
is given. (Martin Pool)
80
* There is a new method for TestCaseInTempDir, assertFileEqual, which
81
will check that a given content is equal to the content of the named
82
file. (Robert Collins)
84
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
89
* New 'testament' command and concept for making gpg-signatures
90
of revisions that are not tied to a particular internal
91
representation. (Martin Pool).
93
* Per-revision properties ('revprops') as key-value associated
94
strings on each revision created when the revision is committed.
95
Intended mainly for the use of external tools. (Martin Pool).
97
* Config options have moved from bzrlib.osutils to bzrlib.config.
100
* Improved command line option definitions allowing explanations
101
for individual options, among other things. Contributed by
104
* Config options have moved from bzrlib.osutils to bzrlib.config.
105
Configuration is now done via the config.Config interface:
106
Depending on whether you have a Branch, a Location or no information
107
available, construct a *Config, and use its signature_checking,
108
username and user_email methods. (Robert Collins)
110
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
111
they are made available for other plugins to use. You should not
112
import other plugins during the __init__ of your plugin though, as
113
no ordering is guaranteed, and the plugins directory is not on the
114
python path. (Robert Collins)
116
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
117
no longer takes an inventory, rather it takes an option branch
118
parameter, and if None is given will open the branch at basedir
119
implicitly. (Robert Collins)
121
* Cleaner exception structure and error reporting. Suggested by
122
Scott James Remnant. (Martin Pool)
124
* Branch.remove has been moved to WorkingTree, which has also gained
125
lock_read, lock_write and unlock methods for convenience. (Robert
128
* Two decorators, needs_read_lock and needs_write_lock have been added
129
to the branch module. Use these to cause a function to run in a
130
read or write lock respectively. (Robert Collins)
132
* Branch.open_containing now returns a tuple (Branch, relative-path),
133
which allows direct access to the common case of 'get me this file
134
from its branch'. (Robert Collins)
136
* Transports can register using register_lazy_transport, and they
137
will be loaded when first used. (Martin Pool)
139
* 'pull' has been factored out of the command as WorkingTree.pull().
140
A new option to WorkingTree.pull has been added, clobber, which will
141
ignore diverged history and pull anyway.
144
* config.Config has a 'get_user_option' call that accepts an option name.
145
This will be looked up in branches.conf and bazaar.conf as normal.
146
It is intended that this be used by plugins to support options -
147
options of built in programs should have specific methods on the config.
150
* merge.merge_inner now has tempdir as an optional parameter. (Robert
153
* Tree.kind is not recorded at the top level of the hierarchy, as it was
154
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
157
* WorkingTree.__del__ has been removed, it was non deterministic and not
158
doing what it was intended to. See WorkingTree.__init__ for a comment
159
about future directions. (Robert Collins/Martin Pool)
161
* bzrlib.transport.http has been modified so that only 404 urllib errors
162
are returned as NoSuchFile. Other exceptions will propogate as normal.
163
This allows debuging of actual errors. (Robert Collins)
165
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
166
to apis like 'put', 'get' and 'has'. This is to provide consistent
167
behaviour - it operates on url's only. (Robert Collins)
169
* Transports can register using register_lazy_transport, and they
170
will be loaded when first used. (Martin Pool)
172
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
173
is called by merge_inner. This is so that the conflict count can be
174
retrieved (and potentially manipulated) before returning to the caller
175
of merge_inner. Likewise 'merge' now returns the conflict count to the
176
caller. (Robert Collins)
178
* 'revision.revision_graph can handle having only partial history for
179
a revision - that is no revisions in the graph with no parents.
182
* New TestCase.addCleanup facility.
186
* Better handling of branches in directories with non-ascii names.
187
(Joel Rosdahl, Panagiotis Papadakos)
193
* Fix problem in pulling over http from machines that do not
194
allow directories to be listed.
196
* Avoid harmless warning about invalid hash cache after
197
upgrading branch format.
201
* Avoid some unnecessary http operations in branch and pull.
208
* 'bzr branch' over http initially gives a very high estimate
209
of completion time but it should fall as the first few
210
revisions are pulled in. branch is still slow on
211
high-latency connections.
215
* bzr-man.py has been updated to work again. Contributed by
218
* Locking is now done with fcntl.lockf which works with NFS
219
file systems. Contributed by Harald Meland.
221
* When a merge encounters a file that has been deleted on
222
one side and modified on the other, the old contents are
223
written out to foo.BASE and foo.SIDE, where SIDE is this
224
or OTHER. Contributed by Aaron Bentley.
226
* Export was choosing incorrect file paths for the content of
227
the tarball, this has been fixed by Aaron Bentley.
229
* Commit will no longer commit without a log message, an
230
error is returned instead. Contributed by Jelmer Vernooij.
232
* If you commit a specific file in a sub directory, any of its
233
parent directories that are added but not listed will be
234
automatically included. Suggested by Michael Ellerman.
236
* bzr commit and upgrade did not correctly record new revisions
237
for files with only a change to their executable status.
238
bzr will correct this when it encounters it. Fixed by
241
* HTTP tests now force off the use of http_proxy for the duration.
242
Contributed by Gustavo Niemeyer.
244
* Fix problems in merging weave-based branches that have
245
different partial views of history.
247
* Symlink support: working with symlinks when not in the root of a
248
bzr tree was broken, patch from Scott James Remnant.
253
* 'branch' now accepts a --basis parameter which will take advantage
254
of local history when making a new branch. This allows faster
255
branching of remote branches. Contributed by Aaron Bentley.
257
* New tree format based on weave files, called version 5.
258
Existing branches can be upgraded to this format using
261
* Symlinks are now versionable. Initial patch by
262
Erik Toubro Nielsen, updated to head by Robert Collins.
264
* Executable bits are tracked on files. Patch from Gustavo
267
* 'bzr status' now shows unknown files inside a selected directory.
268
Patch from Heikki Paajanen.
270
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
271
and 'resolve' have needed added, which list and remove those
272
merge conflicts respectively. A conflicted tree cannot be committed
273
in. Contributed by Aaron Bentley.
275
* 'rm' is now an alias for 'remove'.
277
* Stores now split out their content in a single byte prefixed hash,
278
dropping the density of files per directory by 256. Contributed by
281
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
282
Contributed by Robert Collins.
284
* 'bzr log' with the default formatter will show merged revisions,
285
indented to the right. Initial implementation contributed by Gustavo
286
Niemeyer, made incremental by Robert Collins.
291
* Test case failures have the exception printed after the log
292
for your viewing pleasure.
294
* InventoryEntry is now an abstract base class, use one of the
295
concrete InventoryDirectory etc classes instead.
297
* Branch raises an UnsupportedFormatError when it detects a
298
bzr branch it cannot understand. This allows for precise
299
handling of such circumstances.
304
* Removed testsweet module so that tests can be run after
305
bzr installed by 'bzr selftest'.
307
* 'bzr selftest' command-line arguments can now be partial ids
308
of tests to run, e.g. 'bzr selftest test_weave'
315
* Fixed "branch -r" option.
317
* Fix remote access to branches containing non-compressed history.
320
* Better reliability of http server tests. (John Arbash-Meinel)
322
* Merge graph maximum distance calculation fix. (Aaron Bentley)
324
* Various minor bug in windows support have been fixed, largely in the
325
test suite. Contributed by Alexander Belchenko.
329
* Status now accepts a -r argument to give status between chosen
330
revisions. Contributed by Heikki Paajanen.
332
* Revision arguments no longer use +/-/= to control ranges, instead
333
there is a 'before' namespace, which limits the successive namespace.
334
For example '$ bzr log -r date:yesterday..before:date:today' will
335
select everything from yesterday and before today. Contributed by
338
* There is now a bzr.bat file created by distutils when building on
339
Windows. Contributed by Alexander Belchenko.
343
* Removed uuid() as it was unused.
345
* Improved 'fetch' code for pulling revisions from one branch into
346
another (used by pull, merged, etc.)
353
* Adding a file whose parent directory is not versioned will
354
implicitly add the parent, and so on up to the root. This means
355
you should never need to explictly add a directory, they'll just
356
get added when you add a file in the directory. Contributed by
359
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
362
* If you set BZR_EDITOR in the environment, it is checked in
363
preference to EDITOR and the config file for the interactive commit
364
editing program. Related to this is a bugfix where a missing program
365
set in EDITOR would cause editing to fail, now the fallback program
366
for the operating system is still tried.
368
* Files that are not directories/symlinks/regular files will no longer
369
cause bzr to fail, it will just ignore them by default. You cannot add
370
them to the tree though - they are not versionable.
375
* Refactor xml packing/unpacking.
379
* Fixed 'bzr mv' by Ollie Rutherfurd.
381
* Fixed strange error when trying to access a nonexistent http
384
* Make sure that the hashcache gets written out if it can't be
390
* Various Windows fixes from Ollie Rutherfurd.
392
* Quieten warnings about locking; patch from Matt Lavin.
399
* ``bzr shell-complete`` command contributed by Clint Adams to
400
help with intelligent shell completion.
402
* New expert command ``bzr find-merge-base`` for debugging merges.
407
* Much better merge support.
409
* merge3 conflicts are now reported with markers like '<<<<<<<'
410
(seven characters) which is the same as CVS and pleases things
416
* ``bzr upgrade`` no longer fails when trying to fix trees that
417
mention revisions that are not present.
419
* Fixed bugs in listing plugins from ``bzr plugins``.
421
* Fix case of $EDITOR containing options for the editor.
423
* Fix log -r refusing to show the last revision.
424
(Patch from Goffredo Baroncelli.)
429
* ``bzr log --show-ids`` shows the revision ids of all parents.
431
* Externally provided commands on your $BZRPATH no longer need
432
to recognize --bzr-usage to work properly, and can just handle
438
* Changed trace messages to go through the standard logging
439
framework, so that they can more easily be redirected by
448
* Python plugins, automatically loaded from the directories on
449
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
451
* New 'bzr mkdir' command.
453
* Commit mesage is fetched from an editor if not given on the
454
command line; patch from Torsten Marek.
456
* ``bzr log -m FOO`` displays commits whose message matches regexp
459
* ``bzr add`` with no arguments adds everything under the current directory.
461
* ``bzr mv`` does move or rename depending on its arguments, like
464
* ``bzr missing`` command shows a summary of the differences
465
between two trees. (Merged from John Arbash-Meinel.)
467
* An email address for commits to a particular tree can be
468
specified by putting it into .bzr/email within a branch. (Based
469
on a patch from Heikki Paajanen.)
474
* Faster working tree operations.
479
* 3rd-party modules shipped with bzr are copied within the bzrlib
480
python package, so that they can be installed by the setup
481
script without clashing with anything already existing on the
482
system. (Contributed by Gustavo Niemeyer.)
484
* Moved plugins directory to bzrlib/, so that there's a standard
485
plugin directory which is not only installed with bzr itself but
486
is also available when using bzr from the development tree.
487
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
488
standard plugins directory.
490
* When exporting to a tarball with ``bzr export --format tgz``, put
491
everything under a top directory rather than dumping it into the
492
current directory. This can be overridden with the ``--root``
493
option. Patch from William Dodé and John Meinel.
495
* New ``bzr upgrade`` command to upgrade the format of a branch,
496
replacing ``bzr check --update``.
498
* Files within store directories are no longer marked readonly on
501
* Changed ``bzr log`` output to a more compact form suggested by
502
John A Meinel. Old format is available with the ``--long`` or
503
``-l`` option, patched by William Dodé.
505
* By default the commit command refuses to record a revision with
506
no changes unless the ``--unchanged`` option is given.
508
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
509
line options must come before the command name because they
510
affect what commands are available; all other options must come
511
after the command name because their interpretation depends on
514
* ``branch`` and ``clone`` added as aliases for ``branch``.
516
* Default log format is back to the long format; the compact one
517
is available with ``--short``.
522
* Fix bugs in committing only selected files or within a subdirectory.
529
* ``bzr`` with no command now shows help rather than giving an
530
error. Suggested by Michael Ellerman.
532
* ``bzr status`` output format changed, because svn-style output
533
doesn't really match the model of bzr. Now files are grouped by
534
status and can be shown with their IDs. ``bzr status --all``
535
shows all versioned files and unknown files but not ignored files.
537
* ``bzr log`` runs from most-recent to least-recent, the reverse
538
of the previous order. The previous behaviour can be obtained
539
with the ``--forward`` option.
541
* ``bzr inventory`` by default shows only filenames, and also ids
542
if ``--show-ids`` is given, in which case the id is the second
548
* New 'bzr whoami --email' option shows only the email component
549
of the user identification, from Jo Vermeulen.
551
* New ``bzr ignore PATTERN`` command.
553
* Nicer error message for broken pipe, interrupt and similar
554
conditions that don't indicate an internal error.
556
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
558
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
559
either read or write mode.
561
* New option ``bzr log --show-ids`` shows revision and file ids.
563
* New usage ``bzr log FILENAME`` shows only revisions that
566
* Changed format for describing changes in ``bzr log -v``.
568
* New option ``bzr commit --file`` to take a message from a file,
569
suggested by LarstiQ.
571
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
572
Oler. File may be in a branch other than the working directory.
574
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
577
* Commands can now be defined by external programs or scripts
578
in a directory on $BZRPATH.
580
* New "stat cache" avoids reading the contents of files if they
581
haven't changed since the previous time.
583
* If the Python interpreter is too old, try to find a better one
584
or give an error. Based on a patch from Fredrik Lundh.
586
* New optional parameter ``bzr info [BRANCH]``.
588
* New form ``bzr commit SELECTED`` to commit only selected files.
590
* New form ``bzr log -r FROM:TO`` shows changes in selected
591
range; contributed by John A Meinel.
593
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
594
options through to an external GNU diff.
596
* New option ``bzr add --no-recurse`` to add a directory but not
599
* ``bzr --version`` now shows more information if bzr is being run
605
* Fixed diff format so that added and removed files will be
606
handled properly by patch. Fix from Lalo Martins.
608
* Various fixes for files whose names contain spaces or other
614
* Converted black-box test suites from Bourne shell into Python;
615
now run using ``./testbzr``. Various structural improvements to
618
* testbzr by default runs the version of bzr found in the same
619
directory as the tests, or the one given as the first parameter.
621
* testbzr also runs the internal tests, so the only command
622
required to check is just ``./testbzr``.
624
* testbzr requires python2.4, but can be used to test bzr running
625
under a different version.
627
* Tests added for many other changes in this release.
632
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
634
* Refactor command functions into Command objects based on HCT by
637
* Better help messages for many commands.
639
* Expose bzrlib.open_tracefile() to start the tracefile; until
640
this is called trace messages are just discarded.
642
* New internal function find_touching_revisions() and hidden
643
command touching-revisions trace the changes to a given file.
645
* Simpler and faster compare_inventories() function.
647
* bzrlib.open_tracefile() takes a tracefilename parameter.
649
* New AtomicFile class.
651
* New developer commands ``added``, ``modified``.
656
* Cope on Windows on python2.3 by using the weaker random seed.
657
2.4 is now only recommended.
664
* 'bzr diff' optionally takes a list of files to diff. Still a bit
665
basic. Patch from QuantumG.
667
* More default ignore patterns.
669
* New 'bzr log --verbose' shows a list of files changed in the
670
changeset. Patch from Sebastian Cote.
672
* Roll over ~/.bzr.log if it gets too large.
674
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
677
* New 'bzr help commands' based on a patch from Denys Duchier.
682
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
683
or $EMAIL. All are decoded by the locale preferred encoding.
684
If none of these are present user@hostname is used. The host's
685
fully-qualified name is not used because that tends to fail when
686
there are DNS problems.
688
* New 'bzr whoami' command instead of username user-email.
693
* Make commit safe for hardlinked bzr trees.
695
* Some Unicode/locale fixes.
697
* Partial workaround for difflib.unified_diff not handling
698
trailing newlines properly.
703
* Allow docstrings for help to be in PEP0257 format. Patch from
706
* More tests in test.sh.
708
* Write profile data to a temporary file not into working
709
directory and delete it when done.
711
* Smaller .bzr.log with process ids.
716
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
719
* Some improvements in handling paths on Windows, based on a patch
727
* New "directories" internal command lists versioned directories
730
* Can now say "bzr commit --help".
732
* New "rename" command to rename one file to a different name
735
* New "move" command to move one or more files into a different
738
* New "renames" command lists files renamed since base revision.
740
* New cat command contributed by janmar.
744
* .bzr.log is placed in $HOME (not pwd) and is always written in
745
UTF-8. (Probably not a completely good long-term solution, but
750
* Workaround for difflib bug in Python 2.3 that causes an
751
exception when comparing empty files. Reported by Erik Toubro
756
* Refactored inventory storage to insert a root entry at the top.
760
* Start of shell-based black-box testing in test.sh.
767
* Win32 fixes from Steve Brown.
770
bzr-0.0.2 "black cube" 2005-03-31
774
* Default ignore list extended (see bzrlib/__init__.py).
776
* Patterns in .bzrignore are now added to the default ignore list,
777
rather than replacing it.
779
* Ignore list isn't reread for every file.
783
* Reinstate the 'bzr check' command to check invariants of the
786
* New 'ignored' command lists which files are ignored and why;
787
'deleted' lists files deleted in the current working tree.
789
* Performance improvements.
791
* New global --profile option.
793
* Ignore patterns like './config.h' now correctly match files in
794
the root directory only.
801
* More information from info command.
803
* Can now say "bzr help COMMAND" for more detailed help.
805
* Less file flushing and faster performance when writing logs and
806
committing to stores.
808
* More useful verbose output from some commands.
812
* Fix inverted display of 'R' and 'M' during 'commit -v'.
816
* Include a subset of ElementTree-1.2.20040618 to make
819
* Fix time.localtime call to work with Python 2.3 (the minimum
823
bzr-0.0.0.69 2005-03-22
827
* First public release.
829
* Storage of local versions: init, add, remove, rm, info, log,