5
* 'bzr diff' now returns 1 when there are changes in the working
8
* 'bzr push' now exists and can push changes to a remote location.
9
This uses the transport infrastructure, and can store the remote
10
location in the ~/.bazaar/branches.conf configuration file.
14
* WorkingTree.pull has been split across Branch and WorkingTree,
15
to allow Branch only pulls.
17
* commands.display_command now returns the result of the decorated
20
* LocationConfig now has a set_user_option(key, value) call to save
21
a setting in its matching location section (a new one is created
24
* Branch has two new methods, get_push_location and set_push_location
25
to respectively, get and set the push location.
32
* merge now takes a --show-base option to include the base text in
36
* The config files are now read using ConfigObj, so '=' should be used as
40
* New 'bzr commit --strict' option refuses to commit if there are
41
any unknown files in the tree. To commit, make sure all files are
42
either ignored, added, or deleted. (Michael Ellerman)
44
* The config directory is now ~/.bazaar, and there is a single file
45
~/.bazaar/bazaar.conf storing email, editor and other preferences.
48
* 'bzr add' no longer takes a --verbose option, and a --quiet option
49
has been added that suppresses all output.
51
* Improved zsh completion support in contrib/zsh, from Clint
54
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
57
* 'bzr check' now accepts -v for verbose reporting, and checks for
58
ghosts in the branch. (Robert Collins)
60
* New command 're-sign' which will regenerate the gpg signature for
61
a revision. (Robert Collins)
63
* If you set check_signatures=require for a path in
64
~/.bazaar/branches.conf then bzr will invoke your
65
gpg_signing_command (defaults to gpg) and record a digital signature
66
of your commit. (Robert Collins)
68
* New sftp transport, based on Paramiko. (Robey Pointer)
70
* 'bzr pull' now accepts '--clobber' which will discard local changes
71
and make this branch identical to the source branch. (Robert Collins)
73
* Just give a quieter warning if a plugin can't be loaded, and
74
put the details in .bzr.log. (Martin Pool)
76
* 'bzr branch' will now set the branch-name to the last component of the
77
output directory, if one was supplied.
79
* New sftp transport, based on Paramiko. (Robey Pointer)
81
* If the option 'post_commit' is set to one (or more) python function
82
names (must be in the bzrlib namespace), then they will be invoked
83
after the commit has completed, with the branch and revision_id as
84
parameters. (Robert Collins)
86
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
88
* --merge-type weave is now supported for file contents. Tree-shape
89
changes are still three-way based. (Martin Pool, Aaron Bentley)
91
* 'bzr check' allows the first revision on revision-history to have
92
parents - something that is expected for cheap checkouts, and occurs
93
when conversions from baz do not have all history. (Robert Collins).
95
* 'bzr merge' can now graft unrelated trees together, if your specify
96
0 as a base. (Aaron Bentley)
98
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
101
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
103
* 'bzr merge --reprocess' minimizes conflicts
107
* The 'bzr selftest --pattern' option for has been removed, now
108
test specifiers on the command line can be simple strings, or
109
regexps, or both. (Robert Collins)
111
* Passing -v to selftest will now show the time each test took to
112
complete, which will aid in analysing performance regressions and
113
related questions. (Robert Collins)
115
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
116
is given. (Martin Pool)
118
* There is a new method for TestCaseInTempDir, assertFileEqual, which
119
will check that a given content is equal to the content of the named
120
file. (Robert Collins)
122
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
127
* New 'testament' command and concept for making gpg-signatures
128
of revisions that are not tied to a particular internal
129
representation. (Martin Pool).
131
* Per-revision properties ('revprops') as key-value associated
132
strings on each revision created when the revision is committed.
133
Intended mainly for the use of external tools. (Martin Pool).
135
* Config options have moved from bzrlib.osutils to bzrlib.config.
138
* Improved command line option definitions allowing explanations
139
for individual options, among other things. Contributed by
142
* Config options have moved from bzrlib.osutils to bzrlib.config.
143
Configuration is now done via the config.Config interface:
144
Depending on whether you have a Branch, a Location or no information
145
available, construct a *Config, and use its signature_checking,
146
username and user_email methods. (Robert Collins)
148
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
149
they are made available for other plugins to use. You should not
150
import other plugins during the __init__ of your plugin though, as
151
no ordering is guaranteed, and the plugins directory is not on the
152
python path. (Robert Collins)
154
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
155
no longer takes an inventory, rather it takes an option branch
156
parameter, and if None is given will open the branch at basedir
157
implicitly. (Robert Collins)
159
* Cleaner exception structure and error reporting. Suggested by
160
Scott James Remnant. (Martin Pool)
162
* Branch.remove has been moved to WorkingTree, which has also gained
163
lock_read, lock_write and unlock methods for convenience. (Robert
166
* Two decorators, needs_read_lock and needs_write_lock have been added
167
to the branch module. Use these to cause a function to run in a
168
read or write lock respectively. (Robert Collins)
170
* Branch.open_containing now returns a tuple (Branch, relative-path),
171
which allows direct access to the common case of 'get me this file
172
from its branch'. (Robert Collins)
174
* Transports can register using register_lazy_transport, and they
175
will be loaded when first used. (Martin Pool)
177
* 'pull' has been factored out of the command as WorkingTree.pull().
178
A new option to WorkingTree.pull has been added, clobber, which will
179
ignore diverged history and pull anyway.
182
* config.Config has a 'get_user_option' call that accepts an option name.
183
This will be looked up in branches.conf and bazaar.conf as normal.
184
It is intended that this be used by plugins to support options -
185
options of built in programs should have specific methods on the config.
188
* merge.merge_inner now has tempdir as an optional parameter. (Robert
191
* Tree.kind is not recorded at the top level of the hierarchy, as it was
192
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
195
* WorkingTree.__del__ has been removed, it was non deterministic and not
196
doing what it was intended to. See WorkingTree.__init__ for a comment
197
about future directions. (Robert Collins/Martin Pool)
199
* bzrlib.transport.http has been modified so that only 404 urllib errors
200
are returned as NoSuchFile. Other exceptions will propogate as normal.
201
This allows debuging of actual errors. (Robert Collins)
203
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
204
to apis like 'put', 'get' and 'has'. This is to provide consistent
205
behaviour - it operates on url's only. (Robert Collins)
207
* Transports can register using register_lazy_transport, and they
208
will be loaded when first used. (Martin Pool)
210
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
211
is called by merge_inner. This is so that the conflict count can be
212
retrieved (and potentially manipulated) before returning to the caller
213
of merge_inner. Likewise 'merge' now returns the conflict count to the
214
caller. (Robert Collins)
216
* 'revision.revision_graph can handle having only partial history for
217
a revision - that is no revisions in the graph with no parents.
220
* New builtins.branch_files uses the standard file_list rules to produce
221
a branch and a list of paths, relative to that branch (Aaron Bentley)
223
* New TestCase.addCleanup facility.
225
* New bzrlib.version_info tuple (similar to sys.version_info), which can
226
be used by programs importing bzrlib.
230
* Better handling of branches in directories with non-ascii names.
231
(Joel Rosdahl, Panagiotis Papadakos)
233
* Upgrades of trees with no commits will not fail due to accessing
234
[-1] in the revision-history. (Andres Salomon)
241
* Fix problem in pulling over http from machines that do not
242
allow directories to be listed.
244
* Avoid harmless warning about invalid hash cache after
245
upgrading branch format.
249
* Avoid some unnecessary http operations in branch and pull.
256
* 'bzr branch' over http initially gives a very high estimate
257
of completion time but it should fall as the first few
258
revisions are pulled in. branch is still slow on
259
high-latency connections.
263
* bzr-man.py has been updated to work again. Contributed by
266
* Locking is now done with fcntl.lockf which works with NFS
267
file systems. Contributed by Harald Meland.
269
* When a merge encounters a file that has been deleted on
270
one side and modified on the other, the old contents are
271
written out to foo.BASE and foo.SIDE, where SIDE is this
272
or OTHER. Contributed by Aaron Bentley.
274
* Export was choosing incorrect file paths for the content of
275
the tarball, this has been fixed by Aaron Bentley.
277
* Commit will no longer commit without a log message, an
278
error is returned instead. Contributed by Jelmer Vernooij.
280
* If you commit a specific file in a sub directory, any of its
281
parent directories that are added but not listed will be
282
automatically included. Suggested by Michael Ellerman.
284
* bzr commit and upgrade did not correctly record new revisions
285
for files with only a change to their executable status.
286
bzr will correct this when it encounters it. Fixed by
289
* HTTP tests now force off the use of http_proxy for the duration.
290
Contributed by Gustavo Niemeyer.
292
* Fix problems in merging weave-based branches that have
293
different partial views of history.
295
* Symlink support: working with symlinks when not in the root of a
296
bzr tree was broken, patch from Scott James Remnant.
301
* 'branch' now accepts a --basis parameter which will take advantage
302
of local history when making a new branch. This allows faster
303
branching of remote branches. Contributed by Aaron Bentley.
305
* New tree format based on weave files, called version 5.
306
Existing branches can be upgraded to this format using
309
* Symlinks are now versionable. Initial patch by
310
Erik Toubro Nielsen, updated to head by Robert Collins.
312
* Executable bits are tracked on files. Patch from Gustavo
315
* 'bzr status' now shows unknown files inside a selected directory.
316
Patch from Heikki Paajanen.
318
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
319
and 'resolve' have needed added, which list and remove those
320
merge conflicts respectively. A conflicted tree cannot be committed
321
in. Contributed by Aaron Bentley.
323
* 'rm' is now an alias for 'remove'.
325
* Stores now split out their content in a single byte prefixed hash,
326
dropping the density of files per directory by 256. Contributed by
329
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
330
Contributed by Robert Collins.
332
* 'bzr log' with the default formatter will show merged revisions,
333
indented to the right. Initial implementation contributed by Gustavo
334
Niemeyer, made incremental by Robert Collins.
339
* Test case failures have the exception printed after the log
340
for your viewing pleasure.
342
* InventoryEntry is now an abstract base class, use one of the
343
concrete InventoryDirectory etc classes instead.
345
* Branch raises an UnsupportedFormatError when it detects a
346
bzr branch it cannot understand. This allows for precise
347
handling of such circumstances.
352
* Removed testsweet module so that tests can be run after
353
bzr installed by 'bzr selftest'.
355
* 'bzr selftest' command-line arguments can now be partial ids
356
of tests to run, e.g. 'bzr selftest test_weave'
363
* Fixed "branch -r" option.
365
* Fix remote access to branches containing non-compressed history.
368
* Better reliability of http server tests. (John Arbash-Meinel)
370
* Merge graph maximum distance calculation fix. (Aaron Bentley)
372
* Various minor bug in windows support have been fixed, largely in the
373
test suite. Contributed by Alexander Belchenko.
377
* Status now accepts a -r argument to give status between chosen
378
revisions. Contributed by Heikki Paajanen.
380
* Revision arguments no longer use +/-/= to control ranges, instead
381
there is a 'before' namespace, which limits the successive namespace.
382
For example '$ bzr log -r date:yesterday..before:date:today' will
383
select everything from yesterday and before today. Contributed by
386
* There is now a bzr.bat file created by distutils when building on
387
Windows. Contributed by Alexander Belchenko.
391
* Removed uuid() as it was unused.
393
* Improved 'fetch' code for pulling revisions from one branch into
394
another (used by pull, merged, etc.)
401
* Adding a file whose parent directory is not versioned will
402
implicitly add the parent, and so on up to the root. This means
403
you should never need to explictly add a directory, they'll just
404
get added when you add a file in the directory. Contributed by
407
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
410
* If you set BZR_EDITOR in the environment, it is checked in
411
preference to EDITOR and the config file for the interactive commit
412
editing program. Related to this is a bugfix where a missing program
413
set in EDITOR would cause editing to fail, now the fallback program
414
for the operating system is still tried.
416
* Files that are not directories/symlinks/regular files will no longer
417
cause bzr to fail, it will just ignore them by default. You cannot add
418
them to the tree though - they are not versionable.
423
* Refactor xml packing/unpacking.
427
* Fixed 'bzr mv' by Ollie Rutherfurd.
429
* Fixed strange error when trying to access a nonexistent http
432
* Make sure that the hashcache gets written out if it can't be
438
* Various Windows fixes from Ollie Rutherfurd.
440
* Quieten warnings about locking; patch from Matt Lavin.
447
* ``bzr shell-complete`` command contributed by Clint Adams to
448
help with intelligent shell completion.
450
* New expert command ``bzr find-merge-base`` for debugging merges.
455
* Much better merge support.
457
* merge3 conflicts are now reported with markers like '<<<<<<<'
458
(seven characters) which is the same as CVS and pleases things
464
* ``bzr upgrade`` no longer fails when trying to fix trees that
465
mention revisions that are not present.
467
* Fixed bugs in listing plugins from ``bzr plugins``.
469
* Fix case of $EDITOR containing options for the editor.
471
* Fix log -r refusing to show the last revision.
472
(Patch from Goffredo Baroncelli.)
477
* ``bzr log --show-ids`` shows the revision ids of all parents.
479
* Externally provided commands on your $BZRPATH no longer need
480
to recognize --bzr-usage to work properly, and can just handle
486
* Changed trace messages to go through the standard logging
487
framework, so that they can more easily be redirected by
496
* Python plugins, automatically loaded from the directories on
497
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
499
* New 'bzr mkdir' command.
501
* Commit mesage is fetched from an editor if not given on the
502
command line; patch from Torsten Marek.
504
* ``bzr log -m FOO`` displays commits whose message matches regexp
507
* ``bzr add`` with no arguments adds everything under the current directory.
509
* ``bzr mv`` does move or rename depending on its arguments, like
512
* ``bzr missing`` command shows a summary of the differences
513
between two trees. (Merged from John Arbash-Meinel.)
515
* An email address for commits to a particular tree can be
516
specified by putting it into .bzr/email within a branch. (Based
517
on a patch from Heikki Paajanen.)
522
* Faster working tree operations.
527
* 3rd-party modules shipped with bzr are copied within the bzrlib
528
python package, so that they can be installed by the setup
529
script without clashing with anything already existing on the
530
system. (Contributed by Gustavo Niemeyer.)
532
* Moved plugins directory to bzrlib/, so that there's a standard
533
plugin directory which is not only installed with bzr itself but
534
is also available when using bzr from the development tree.
535
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
536
standard plugins directory.
538
* When exporting to a tarball with ``bzr export --format tgz``, put
539
everything under a top directory rather than dumping it into the
540
current directory. This can be overridden with the ``--root``
541
option. Patch from William Dodé and John Meinel.
543
* New ``bzr upgrade`` command to upgrade the format of a branch,
544
replacing ``bzr check --update``.
546
* Files within store directories are no longer marked readonly on
549
* Changed ``bzr log`` output to a more compact form suggested by
550
John A Meinel. Old format is available with the ``--long`` or
551
``-l`` option, patched by William Dodé.
553
* By default the commit command refuses to record a revision with
554
no changes unless the ``--unchanged`` option is given.
556
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
557
line options must come before the command name because they
558
affect what commands are available; all other options must come
559
after the command name because their interpretation depends on
562
* ``branch`` and ``clone`` added as aliases for ``branch``.
564
* Default log format is back to the long format; the compact one
565
is available with ``--short``.
570
* Fix bugs in committing only selected files or within a subdirectory.
577
* ``bzr`` with no command now shows help rather than giving an
578
error. Suggested by Michael Ellerman.
580
* ``bzr status`` output format changed, because svn-style output
581
doesn't really match the model of bzr. Now files are grouped by
582
status and can be shown with their IDs. ``bzr status --all``
583
shows all versioned files and unknown files but not ignored files.
585
* ``bzr log`` runs from most-recent to least-recent, the reverse
586
of the previous order. The previous behaviour can be obtained
587
with the ``--forward`` option.
589
* ``bzr inventory`` by default shows only filenames, and also ids
590
if ``--show-ids`` is given, in which case the id is the second
596
* New 'bzr whoami --email' option shows only the email component
597
of the user identification, from Jo Vermeulen.
599
* New ``bzr ignore PATTERN`` command.
601
* Nicer error message for broken pipe, interrupt and similar
602
conditions that don't indicate an internal error.
604
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
606
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
607
either read or write mode.
609
* New option ``bzr log --show-ids`` shows revision and file ids.
611
* New usage ``bzr log FILENAME`` shows only revisions that
614
* Changed format for describing changes in ``bzr log -v``.
616
* New option ``bzr commit --file`` to take a message from a file,
617
suggested by LarstiQ.
619
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
620
Oler. File may be in a branch other than the working directory.
622
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
625
* Commands can now be defined by external programs or scripts
626
in a directory on $BZRPATH.
628
* New "stat cache" avoids reading the contents of files if they
629
haven't changed since the previous time.
631
* If the Python interpreter is too old, try to find a better one
632
or give an error. Based on a patch from Fredrik Lundh.
634
* New optional parameter ``bzr info [BRANCH]``.
636
* New form ``bzr commit SELECTED`` to commit only selected files.
638
* New form ``bzr log -r FROM:TO`` shows changes in selected
639
range; contributed by John A Meinel.
641
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
642
options through to an external GNU diff.
644
* New option ``bzr add --no-recurse`` to add a directory but not
647
* ``bzr --version`` now shows more information if bzr is being run
653
* Fixed diff format so that added and removed files will be
654
handled properly by patch. Fix from Lalo Martins.
656
* Various fixes for files whose names contain spaces or other
662
* Converted black-box test suites from Bourne shell into Python;
663
now run using ``./testbzr``. Various structural improvements to
666
* testbzr by default runs the version of bzr found in the same
667
directory as the tests, or the one given as the first parameter.
669
* testbzr also runs the internal tests, so the only command
670
required to check is just ``./testbzr``.
672
* testbzr requires python2.4, but can be used to test bzr running
673
under a different version.
675
* Tests added for many other changes in this release.
680
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
682
* Refactor command functions into Command objects based on HCT by
685
* Better help messages for many commands.
687
* Expose bzrlib.open_tracefile() to start the tracefile; until
688
this is called trace messages are just discarded.
690
* New internal function find_touching_revisions() and hidden
691
command touching-revisions trace the changes to a given file.
693
* Simpler and faster compare_inventories() function.
695
* bzrlib.open_tracefile() takes a tracefilename parameter.
697
* New AtomicFile class.
699
* New developer commands ``added``, ``modified``.
704
* Cope on Windows on python2.3 by using the weaker random seed.
705
2.4 is now only recommended.
1
bzr-0.0.4 NOT RELEASED YET
added
removed
NEWS
