5
* .bzrignore is excluded from exports, on the grounds that it's a bzr
6
internal-use file and may not be wanted. (Jamie Wilkinson)
10
* "bzr INIT dir" now initializes the specified directory, and creates
11
it if it does not exist. (John Arbash Meinel)
13
* New remerge command (Aaron Bentley)
15
* Better zsh completion script. (Steve Borho)
17
* 'bzr diff' now returns 1 when there are changes in the working
18
tree. (Robert Collins)
20
* 'bzr push' now exists and can push changes to a remote location.
21
This uses the transport infrastructure, and can store the remote
22
location in the ~/.bazaar/branches.conf configuration file.
25
* Test directories are only kept if the test fails and the user requests
28
* Tweaks to short log printing
30
* Added branch nicks, new nick command, printing them in log output.
33
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
36
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
37
the same as Subversion. (Martin Pool)
39
* New ftp transport support (on ftplib), for ftp:// and aftp://
40
URLs. (Daniel Silverstone)
44
* SFTP can walk up to the root path without index errors. (Robert Collins)
46
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
48
* Error when run with -OO
50
* Fix bug in reporting http errors that don't have an http error code.
53
* Handle more cases of pipe errors in display commands
55
* Change status to 3 for all errors
57
* Files that are added and unlinked before committing are completely
58
ignored by diff and status
60
* Stores with some compressed texts and some uncompressed texts are now
61
able to be used. (John A Meinel)
63
* Show files which are both renamed and modified as such in 'bzr
64
status' output. (#4503, Daniel Silverstone)
66
* Make annotate cope better with revisions committed without a valid
67
email address. (Marien Zwart)
69
* Fix representation of tab characters in commit messages. (Harald
74
* Fix selftest asking for passwords when there are no SFTP keys.
75
(Robey Pointer, Jelmer Vernooij)
77
* Fix selftest run with 'python -O'. (Martin Pool)
81
* WorkingTree.pull has been split across Branch and WorkingTree,
82
to allow Branch only pulls. (Robert Collins)
84
* commands.display_command now returns the result of the decorated
85
function. (Robert Collins)
87
* LocationConfig now has a set_user_option(key, value) call to save
88
a setting in its matching location section (a new one is created
89
if needed). (Robert Collins)
91
* Branch has two new methods, get_push_location and set_push_location
92
to respectively, get and set the push location. (Robert Collins)
94
* commands.register_command now takes an optional flag to signal that
95
the registrant is planning to decorate an existing command. When
96
given multiple plugins registering a command is not an error, and
97
the original command class (whether built in or a plugin based one) is
98
returned to the caller. There is a new error 'MustUseDecorated' for
99
signalling when a wrapping command should switch to the original
100
version. (Robert Collins)
102
* Some option parsing errors will raise 'BzrOptionError', allowing
103
granular detection for decorating commands. (Robert Collins).
105
* Branch.read_working_inventory has moved to
106
WorkingTree.read_working_inventory. This necessitated changes to
107
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
108
as well. To make it clear that a WorkingTree cannot always be obtained
109
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
110
be obtained. (Robert Collins)
112
* All pending merges operations from Branch are now on WorkingTree.
115
* Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
121
* pull now takes --verbose to show you what revisions are added or removed
124
* merge now takes a --show-base option to include the base text in
128
* The config files are now read using ConfigObj, so '=' should be used as
129
a separator, not ':'.
132
* New 'bzr commit --strict' option refuses to commit if there are
133
any unknown files in the tree. To commit, make sure all files are
134
either ignored, added, or deleted. (Michael Ellerman)
136
* The config directory is now ~/.bazaar, and there is a single file
137
~/.bazaar/bazaar.conf storing email, editor and other preferences.
140
* 'bzr add' no longer takes a --verbose option, and a --quiet option
141
has been added that suppresses all output.
143
* Improved zsh completion support in contrib/zsh, from Clint
146
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
149
* 'bzr check' now accepts -v for verbose reporting, and checks for
150
ghosts in the branch. (Robert Collins)
152
* New command 're-sign' which will regenerate the gpg signature for
153
a revision. (Robert Collins)
155
* If you set check_signatures=require for a path in
156
~/.bazaar/branches.conf then bzr will invoke your
157
gpg_signing_command (defaults to gpg) and record a digital signature
158
of your commit. (Robert Collins)
160
* New sftp transport, based on Paramiko. (Robey Pointer)
162
* 'bzr pull' now accepts '--clobber' which will discard local changes
163
and make this branch identical to the source branch. (Robert Collins)
165
* Just give a quieter warning if a plugin can't be loaded, and
166
put the details in .bzr.log. (Martin Pool)
168
* 'bzr branch' will now set the branch-name to the last component of the
169
output directory, if one was supplied.
171
* If the option 'post_commit' is set to one (or more) python function
172
names (must be in the bzrlib namespace), then they will be invoked
173
after the commit has completed, with the branch and revision_id as
174
parameters. (Robert Collins)
176
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
178
* --merge-type weave is now supported for file contents. Tree-shape
179
changes are still three-way based. (Martin Pool, Aaron Bentley)
181
* 'bzr check' allows the first revision on revision-history to have
182
parents - something that is expected for cheap checkouts, and occurs
183
when conversions from baz do not have all history. (Robert Collins).
185
* 'bzr merge' can now graft unrelated trees together, if your specify
186
0 as a base. (Aaron Bentley)
188
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
191
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
193
* 'bzr merge --reprocess' minimizes conflicts
197
* The 'bzr selftest --pattern' option for has been removed, now
198
test specifiers on the command line can be simple strings, or
199
regexps, or both. (Robert Collins)
201
* Passing -v to selftest will now show the time each test took to
202
complete, which will aid in analysing performance regressions and
203
related questions. (Robert Collins)
205
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
206
is given. (Martin Pool)
208
* There is a new method for TestCaseInTempDir, assertFileEqual, which
209
will check that a given content is equal to the content of the named
210
file. (Robert Collins)
212
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
217
* New 'testament' command and concept for making gpg-signatures
218
of revisions that are not tied to a particular internal
219
representation. (Martin Pool).
221
* Per-revision properties ('revprops') as key-value associated
222
strings on each revision created when the revision is committed.
223
Intended mainly for the use of external tools. (Martin Pool).
225
* Config options have moved from bzrlib.osutils to bzrlib.config.
228
* Improved command line option definitions allowing explanations
229
for individual options, among other things. Contributed by
232
* Config options have moved from bzrlib.osutils to bzrlib.config.
233
Configuration is now done via the config.Config interface:
234
Depending on whether you have a Branch, a Location or no information
235
available, construct a *Config, and use its signature_checking,
236
username and user_email methods. (Robert Collins)
238
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
239
they are made available for other plugins to use. You should not
240
import other plugins during the __init__ of your plugin though, as
241
no ordering is guaranteed, and the plugins directory is not on the
242
python path. (Robert Collins)
244
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
245
no longer takes an inventory, rather it takes an option branch
246
parameter, and if None is given will open the branch at basedir
247
implicitly. (Robert Collins)
249
* Cleaner exception structure and error reporting. Suggested by
250
Scott James Remnant. (Martin Pool)
252
* Branch.remove has been moved to WorkingTree, which has also gained
253
lock_read, lock_write and unlock methods for convenience. (Robert
256
* Two decorators, needs_read_lock and needs_write_lock have been added
257
to the branch module. Use these to cause a function to run in a
258
read or write lock respectively. (Robert Collins)
260
* Branch.open_containing now returns a tuple (Branch, relative-path),
261
which allows direct access to the common case of 'get me this file
262
from its branch'. (Robert Collins)
264
* Transports can register using register_lazy_transport, and they
265
will be loaded when first used. (Martin Pool)
267
* 'pull' has been factored out of the command as WorkingTree.pull().
268
A new option to WorkingTree.pull has been added, clobber, which will
269
ignore diverged history and pull anyway.
272
* config.Config has a 'get_user_option' call that accepts an option name.
273
This will be looked up in branches.conf and bazaar.conf as normal.
274
It is intended that this be used by plugins to support options -
275
options of built in programs should have specific methods on the config.
278
* merge.merge_inner now has tempdir as an optional parameter. (Robert
281
* Tree.kind is not recorded at the top level of the hierarchy, as it was
282
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
285
* WorkingTree.__del__ has been removed, it was non deterministic and not
286
doing what it was intended to. See WorkingTree.__init__ for a comment
287
about future directions. (Robert Collins/Martin Pool)
289
* bzrlib.transport.http has been modified so that only 404 urllib errors
290
are returned as NoSuchFile. Other exceptions will propogate as normal.
291
This allows debuging of actual errors. (Robert Collins)
293
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
294
to apis like 'put', 'get' and 'has'. This is to provide consistent
295
behaviour - it operates on url's only. (Robert Collins)
297
* Transports can register using register_lazy_transport, and they
298
will be loaded when first used. (Martin Pool)
300
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
301
is called by merge_inner. This is so that the conflict count can be
302
retrieved (and potentially manipulated) before returning to the caller
303
of merge_inner. Likewise 'merge' now returns the conflict count to the
304
caller. (Robert Collins)
306
* 'revision.revision_graph can handle having only partial history for
307
a revision - that is no revisions in the graph with no parents.
310
* New builtins.branch_files uses the standard file_list rules to produce
311
a branch and a list of paths, relative to that branch (Aaron Bentley)
313
* New TestCase.addCleanup facility.
315
* New bzrlib.version_info tuple (similar to sys.version_info), which can
316
be used by programs importing bzrlib.
320
* Better handling of branches in directories with non-ascii names.
321
(Joel Rosdahl, Panagiotis Papadakos)
323
* Upgrades of trees with no commits will not fail due to accessing
324
[-1] in the revision-history. (Andres Salomon)
331
* Fix problem in pulling over http from machines that do not
332
allow directories to be listed.
334
* Avoid harmless warning about invalid hash cache after
335
upgrading branch format.
339
* Avoid some unnecessary http operations in branch and pull.
346
* 'bzr branch' over http initially gives a very high estimate
347
of completion time but it should fall as the first few
348
revisions are pulled in. branch is still slow on
349
high-latency connections.
353
* bzr-man.py has been updated to work again. Contributed by
356
* Locking is now done with fcntl.lockf which works with NFS
357
file systems. Contributed by Harald Meland.
359
* When a merge encounters a file that has been deleted on
360
one side and modified on the other, the old contents are
361
written out to foo.BASE and foo.SIDE, where SIDE is this
362
or OTHER. Contributed by Aaron Bentley.
364
* Export was choosing incorrect file paths for the content of
365
the tarball, this has been fixed by Aaron Bentley.
367
* Commit will no longer commit without a log message, an
368
error is returned instead. Contributed by Jelmer Vernooij.
370
* If you commit a specific file in a sub directory, any of its
371
parent directories that are added but not listed will be
372
automatically included. Suggested by Michael Ellerman.
374
* bzr commit and upgrade did not correctly record new revisions
375
for files with only a change to their executable status.
376
bzr will correct this when it encounters it. Fixed by
379
* HTTP tests now force off the use of http_proxy for the duration.
380
Contributed by Gustavo Niemeyer.
382
* Fix problems in merging weave-based branches that have
383
different partial views of history.
385
* Symlink support: working with symlinks when not in the root of a
386
bzr tree was broken, patch from Scott James Remnant.
391
* 'branch' now accepts a --basis parameter which will take advantage
392
of local history when making a new branch. This allows faster
393
branching of remote branches. Contributed by Aaron Bentley.
395
* New tree format based on weave files, called version 5.
396
Existing branches can be upgraded to this format using
399
* Symlinks are now versionable. Initial patch by
400
Erik Toubro Nielsen, updated to head by Robert Collins.
402
* Executable bits are tracked on files. Patch from Gustavo
405
* 'bzr status' now shows unknown files inside a selected directory.
406
Patch from Heikki Paajanen.
408
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
409
and 'resolve' have needed added, which list and remove those
410
merge conflicts respectively. A conflicted tree cannot be committed
411
in. Contributed by Aaron Bentley.
413
* 'rm' is now an alias for 'remove'.
415
* Stores now split out their content in a single byte prefixed hash,
416
dropping the density of files per directory by 256. Contributed by
419
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
420
Contributed by Robert Collins.
422
* 'bzr log' with the default formatter will show merged revisions,
423
indented to the right. Initial implementation contributed by Gustavo
424
Niemeyer, made incremental by Robert Collins.
429
* Test case failures have the exception printed after the log
430
for your viewing pleasure.
432
* InventoryEntry is now an abstract base class, use one of the
433
concrete InventoryDirectory etc classes instead.
435
* Branch raises an UnsupportedFormatError when it detects a
436
bzr branch it cannot understand. This allows for precise
437
handling of such circumstances.
442
* Removed testsweet module so that tests can be run after
443
bzr installed by 'bzr selftest'.
445
* 'bzr selftest' command-line arguments can now be partial ids
446
of tests to run, e.g. 'bzr selftest test_weave'
453
* Fixed "branch -r" option.
455
* Fix remote access to branches containing non-compressed history.
458
* Better reliability of http server tests. (John Arbash-Meinel)
460
* Merge graph maximum distance calculation fix. (Aaron Bentley)
462
* Various minor bug in windows support have been fixed, largely in the
463
test suite. Contributed by Alexander Belchenko.
467
* Status now accepts a -r argument to give status between chosen
468
revisions. Contributed by Heikki Paajanen.
470
* Revision arguments no longer use +/-/= to control ranges, instead
471
there is a 'before' namespace, which limits the successive namespace.
472
For example '$ bzr log -r date:yesterday..before:date:today' will
473
select everything from yesterday and before today. Contributed by
476
* There is now a bzr.bat file created by distutils when building on
477
Windows. Contributed by Alexander Belchenko.
481
* Removed uuid() as it was unused.
483
* Improved 'fetch' code for pulling revisions from one branch into
484
another (used by pull, merged, etc.)
491
* Adding a file whose parent directory is not versioned will
492
implicitly add the parent, and so on up to the root. This means
493
you should never need to explictly add a directory, they'll just
494
get added when you add a file in the directory. Contributed by
497
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
500
* If you set BZR_EDITOR in the environment, it is checked in
501
preference to EDITOR and the config file for the interactive commit
502
editing program. Related to this is a bugfix where a missing program
503
set in EDITOR would cause editing to fail, now the fallback program
504
for the operating system is still tried.
506
* Files that are not directories/symlinks/regular files will no longer
507
cause bzr to fail, it will just ignore them by default. You cannot add
508
them to the tree though - they are not versionable.
513
* Refactor xml packing/unpacking.
517
* Fixed 'bzr mv' by Ollie Rutherfurd.
519
* Fixed strange error when trying to access a nonexistent http
522
* Make sure that the hashcache gets written out if it can't be
528
* Various Windows fixes from Ollie Rutherfurd.
530
* Quieten warnings about locking; patch from Matt Lavin.
537
* ``bzr shell-complete`` command contributed by Clint Adams to
538
help with intelligent shell completion.
540
* New expert command ``bzr find-merge-base`` for debugging merges.
545
* Much better merge support.
547
* merge3 conflicts are now reported with markers like '<<<<<<<'
548
(seven characters) which is the same as CVS and pleases things
554
* ``bzr upgrade`` no longer fails when trying to fix trees that
555
mention revisions that are not present.
557
* Fixed bugs in listing plugins from ``bzr plugins``.
559
* Fix case of $EDITOR containing options for the editor.
561
* Fix log -r refusing to show the last revision.
562
(Patch from Goffredo Baroncelli.)
567
* ``bzr log --show-ids`` shows the revision ids of all parents.
569
* Externally provided commands on your $BZRPATH no longer need
570
to recognize --bzr-usage to work properly, and can just handle
576
* Changed trace messages to go through the standard logging
577
framework, so that they can more easily be redirected by
586
* Python plugins, automatically loaded from the directories on
587
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
589
* New 'bzr mkdir' command.
591
* Commit mesage is fetched from an editor if not given on the
592
command line; patch from Torsten Marek.
594
* ``bzr log -m FOO`` displays commits whose message matches regexp
597
* ``bzr add`` with no arguments adds everything under the current directory.
599
* ``bzr mv`` does move or rename depending on its arguments, like
602
* ``bzr missing`` command shows a summary of the differences
603
between two trees. (Merged from John Arbash-Meinel.)
605
* An email address for commits to a particular tree can be
606
specified by putting it into .bzr/email within a branch. (Based
607
on a patch from Heikki Paajanen.)
612
* Faster working tree operations.
617
* 3rd-party modules shipped with bzr are copied within the bzrlib
618
python package, so that they can be installed by the setup
619
script without clashing with anything already existing on the
620
system. (Contributed by Gustavo Niemeyer.)
622
* Moved plugins directory to bzrlib/, so that there's a standard
623
plugin directory which is not only installed with bzr itself but
624
is also available when using bzr from the development tree.
625
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
626
standard plugins directory.
628
* When exporting to a tarball with ``bzr export --format tgz``, put
629
everything under a top directory rather than dumping it into the
630
current directory. This can be overridden with the ``--root``
631
option. Patch from William Dodé and John Meinel.
633
* New ``bzr upgrade`` command to upgrade the format of a branch,
634
replacing ``bzr check --update``.
636
* Files within store directories are no longer marked readonly on
639
* Changed ``bzr log`` output to a more compact form suggested by
640
John A Meinel. Old format is available with the ``--long`` or
641
``-l`` option, patched by William Dodé.
643
* By default the commit command refuses to record a revision with
644
no changes unless the ``--unchanged`` option is given.
646
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
647
line options must come before the command name because they
648
affect what commands are available; all other options must come
649
after the command name because their interpretation depends on
652
* ``branch`` and ``clone`` added as aliases for ``branch``.
654
* Default log format is back to the long format; the compact one
655
is available with ``--short``.
660
* Fix bugs in committing only selected files or within a subdirectory.
667
* ``bzr`` with no command now shows help rather than giving an
668
error. Suggested by Michael Ellerman.
670
* ``bzr status`` output format changed, because svn-style output
671
doesn't really match the model of bzr. Now files are grouped by
672
status and can be shown with their IDs. ``bzr status --all``
673
shows all versioned files and unknown files but not ignored files.
675
* ``bzr log`` runs from most-recent to least-recent, the reverse
676
of the previous order. The previous behaviour can be obtained
677
with the ``--forward`` option.
679
* ``bzr inventory`` by default shows only filenames, and also ids
680
if ``--show-ids`` is given, in which case the id is the second
686
* New 'bzr whoami --email' option shows only the email component
687
of the user identification, from Jo Vermeulen.
689
* New ``bzr ignore PATTERN`` command.
691
* Nicer error message for broken pipe, interrupt and similar
692
conditions that don't indicate an internal error.
694
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
696
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
697
either read or write mode.
699
* New option ``bzr log --show-ids`` shows revision and file ids.
701
* New usage ``bzr log FILENAME`` shows only revisions that
704
* Changed format for describing changes in ``bzr log -v``.
706
* New option ``bzr commit --file`` to take a message from a file,
707
suggested by LarstiQ.
709
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
710
Oler. File may be in a branch other than the working directory.
712
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
715
* Commands can now be defined by external programs or scripts
716
in a directory on $BZRPATH.
718
* New "stat cache" avoids reading the contents of files if they
719
haven't changed since the previous time.
721
* If the Python interpreter is too old, try to find a better one
722
or give an error. Based on a patch from Fredrik Lundh.
724
* New optional parameter ``bzr info [BRANCH]``.
726
* New form ``bzr commit SELECTED`` to commit only selected files.
728
* New form ``bzr log -r FROM:TO`` shows changes in selected
729
range; contributed by John A Meinel.
731
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
732
options through to an external GNU diff.
734
* New option ``bzr add --no-recurse`` to add a directory but not
737
* ``bzr --version`` now shows more information if bzr is being run
743
* Fixed diff format so that added and removed files will be
744
handled properly by patch. Fix from Lalo Martins.
746
* Various fixes for files whose names contain spaces or other
752
* Converted black-box test suites from Bourne shell into Python;
753
now run using ``./testbzr``. Various structural improvements to
756
* testbzr by default runs the version of bzr found in the same
757
directory as the tests, or the one given as the first parameter.
759
* testbzr also runs the internal tests, so the only command
760
required to check is just ``./testbzr``.
762
* testbzr requires python2.4, but can be used to test bzr running
763
under a different version.
765
* Tests added for many other changes in this release.
770
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
772
* Refactor command functions into Command objects based on HCT by
775
* Better help messages for many commands.
777
* Expose bzrlib.open_tracefile() to start the tracefile; until
778
this is called trace messages are just discarded.
780
* New internal function find_touching_revisions() and hidden
781
command touching-revisions trace the changes to a given file.
783
* Simpler and faster compare_inventories() function.
785
* bzrlib.open_tracefile() takes a tracefilename parameter.
787
* New AtomicFile class.
789
* New developer commands ``added``, ``modified``.
794
* Cope on Windows on python2.3 by using the weaker random seed.
795
2.4 is now only recommended.
1
bzr-0.0.4 NOT RELEASED YET
added
removed
NEWS
