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)
8
* The "bzr directories" command were removed in favor of the new
9
--kind option to the "bzr inventory" command. To list all
10
versioned directories, now use "bzr inventory --kind directory".
13
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
14
by default. (John Arbash Meinel)
16
* The parent of Bzr configuration directory can be set by BZR_HOME
17
environment variable. Now the path for it is searched in BZR_HOME, then
18
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
19
points to C:\Documents and Settings\User Name\Application Data), HOME.
24
* "bzr INIT dir" now initializes the specified directory, and creates
25
it if it does not exist. (John Arbash Meinel)
27
* New remerge command (Aaron Bentley)
29
* Better zsh completion script. (Steve Borho)
31
* 'bzr diff' now returns 1 when there are changes in the working
32
tree. (Robert Collins)
34
* 'bzr push' now exists and can push changes to a remote location.
35
This uses the transport infrastructure, and can store the remote
36
location in the ~/.bazaar/branches.conf configuration file.
39
* Test directories are only kept if the test fails and the user requests
42
* Tweaks to short log printing
44
* Added branch nicks, new nick command, printing them in log output.
47
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
50
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
51
the same as Subversion. (Martin Pool)
53
* New ftp transport support (on ftplib), for ftp:// and aftp://
54
URLs. (Daniel Silverstone)
56
* Commit editor temporary files now start with 'bzr_log.', to allow
57
text editors to match the file name and set up appropriate modes or
58
settings. (Magnus Therning)
62
* SFTP can walk up to the root path without index errors. (Robert Collins)
64
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
66
* Error when run with -OO
68
* Fix bug in reporting http errors that don't have an http error code.
71
* Handle more cases of pipe errors in display commands
73
* Change status to 3 for all errors
75
* Files that are added and unlinked before committing are completely
76
ignored by diff and status
78
* Stores with some compressed texts and some uncompressed texts are now
79
able to be used. (John A Meinel)
81
* Fix for bzr pull failing sometimes under windows
83
* Fix for sftp transport under windows when using interactive auth
85
* Show files which are both renamed and modified as such in 'bzr
86
status' output. (#4503, Daniel Silverstone)
88
* Make annotate cope better with revisions committed without a valid
89
email address. (Marien Zwart)
91
* Fix representation of tab characters in commit messages. (Harald
94
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
95
now parsed properly under Windows. (Alexander Belchenko)
97
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
101
* Fix selftest asking for passwords when there are no SFTP keys.
102
(Robey Pointer, Jelmer Vernooij)
104
* Fix selftest run with 'python -O'. (Martin Pool)
106
* Fix HTTP tests under Windows. (John Arbash Meinel)
108
* Make tests work even if HOME is not set (Aaron Bentley)
110
* Updated build_tree to use fixed line-endings for tests which read
111
the file cotents and compare. Make some tests use this to pass under
112
Windows. (John Arbash Meinel)
114
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
116
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
121
* WorkingTree.pull has been split across Branch and WorkingTree,
122
to allow Branch only pulls. (Robert Collins)
124
* commands.display_command now returns the result of the decorated
125
function. (Robert Collins)
127
* LocationConfig now has a set_user_option(key, value) call to save
128
a setting in its matching location section (a new one is created
129
if needed). (Robert Collins)
131
* Branch has two new methods, get_push_location and set_push_location
132
to respectively, get and set the push location. (Robert Collins)
134
* commands.register_command now takes an optional flag to signal that
135
the registrant is planning to decorate an existing command. When
136
given multiple plugins registering a command is not an error, and
137
the original command class (whether built in or a plugin based one) is
138
returned to the caller. There is a new error 'MustUseDecorated' for
139
signalling when a wrapping command should switch to the original
140
version. (Robert Collins)
142
* Some option parsing errors will raise 'BzrOptionError', allowing
143
granular detection for decorating commands. (Robert Collins).
145
* Branch.read_working_inventory has moved to
146
WorkingTree.read_working_inventory. This necessitated changes to
147
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
148
as well. To make it clear that a WorkingTree cannot always be obtained
149
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
150
be obtained. (Robert Collins)
152
* All pending merges operations from Branch are now on WorkingTree.
155
* The follow operations from Branch have moved to WorkingTree:
163
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
165
* New basic_io serialization format. (Martin Pool)
167
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
174
* pull now takes --verbose to show you what revisions are added or removed
177
* merge now takes a --show-base option to include the base text in
181
* The config files are now read using ConfigObj, so '=' should be used as
182
a separator, not ':'.
185
* New 'bzr commit --strict' option refuses to commit if there are
186
any unknown files in the tree. To commit, make sure all files are
187
either ignored, added, or deleted. (Michael Ellerman)
189
* The config directory is now ~/.bazaar, and there is a single file
190
~/.bazaar/bazaar.conf storing email, editor and other preferences.
193
* 'bzr add' no longer takes a --verbose option, and a --quiet option
194
has been added that suppresses all output.
196
* Improved zsh completion support in contrib/zsh, from Clint
199
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
202
* 'bzr check' now accepts -v for verbose reporting, and checks for
203
ghosts in the branch. (Robert Collins)
205
* New command 're-sign' which will regenerate the gpg signature for
206
a revision. (Robert Collins)
208
* If you set check_signatures=require for a path in
209
~/.bazaar/branches.conf then bzr will invoke your
210
gpg_signing_command (defaults to gpg) and record a digital signature
211
of your commit. (Robert Collins)
213
* New sftp transport, based on Paramiko. (Robey Pointer)
215
* 'bzr pull' now accepts '--clobber' which will discard local changes
216
and make this branch identical to the source branch. (Robert Collins)
218
* Just give a quieter warning if a plugin can't be loaded, and
219
put the details in .bzr.log. (Martin Pool)
221
* 'bzr branch' will now set the branch-name to the last component of the
222
output directory, if one was supplied.
224
* If the option 'post_commit' is set to one (or more) python function
225
names (must be in the bzrlib namespace), then they will be invoked
226
after the commit has completed, with the branch and revision_id as
227
parameters. (Robert Collins)
229
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
231
* --merge-type weave is now supported for file contents. Tree-shape
232
changes are still three-way based. (Martin Pool, Aaron Bentley)
234
* 'bzr check' allows the first revision on revision-history to have
235
parents - something that is expected for cheap checkouts, and occurs
236
when conversions from baz do not have all history. (Robert Collins).
238
* 'bzr merge' can now graft unrelated trees together, if your specify
239
0 as a base. (Aaron Bentley)
241
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
244
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
246
* 'bzr merge --reprocess' minimizes conflicts
250
* The 'bzr selftest --pattern' option for has been removed, now
251
test specifiers on the command line can be simple strings, or
252
regexps, or both. (Robert Collins)
254
* Passing -v to selftest will now show the time each test took to
255
complete, which will aid in analysing performance regressions and
256
related questions. (Robert Collins)
258
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
259
is given. (Martin Pool)
261
* There is a new method for TestCaseInTempDir, assertFileEqual, which
262
will check that a given content is equal to the content of the named
263
file. (Robert Collins)
265
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
270
* New 'testament' command and concept for making gpg-signatures
271
of revisions that are not tied to a particular internal
272
representation. (Martin Pool).
274
* Per-revision properties ('revprops') as key-value associated
275
strings on each revision created when the revision is committed.
276
Intended mainly for the use of external tools. (Martin Pool).
278
* Config options have moved from bzrlib.osutils to bzrlib.config.
281
* Improved command line option definitions allowing explanations
282
for individual options, among other things. Contributed by
285
* Config options have moved from bzrlib.osutils to bzrlib.config.
286
Configuration is now done via the config.Config interface:
287
Depending on whether you have a Branch, a Location or no information
288
available, construct a *Config, and use its signature_checking,
289
username and user_email methods. (Robert Collins)
291
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
292
they are made available for other plugins to use. You should not
293
import other plugins during the __init__ of your plugin though, as
294
no ordering is guaranteed, and the plugins directory is not on the
295
python path. (Robert Collins)
297
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
298
no longer takes an inventory, rather it takes an option branch
299
parameter, and if None is given will open the branch at basedir
300
implicitly. (Robert Collins)
302
* Cleaner exception structure and error reporting. Suggested by
303
Scott James Remnant. (Martin Pool)
305
* Branch.remove has been moved to WorkingTree, which has also gained
306
lock_read, lock_write and unlock methods for convenience. (Robert
309
* Two decorators, needs_read_lock and needs_write_lock have been added
310
to the branch module. Use these to cause a function to run in a
311
read or write lock respectively. (Robert Collins)
313
* Branch.open_containing now returns a tuple (Branch, relative-path),
314
which allows direct access to the common case of 'get me this file
315
from its branch'. (Robert Collins)
317
* Transports can register using register_lazy_transport, and they
318
will be loaded when first used. (Martin Pool)
320
* 'pull' has been factored out of the command as WorkingTree.pull().
321
A new option to WorkingTree.pull has been added, clobber, which will
322
ignore diverged history and pull anyway.
325
* config.Config has a 'get_user_option' call that accepts an option name.
326
This will be looked up in branches.conf and bazaar.conf as normal.
327
It is intended that this be used by plugins to support options -
328
options of built in programs should have specific methods on the config.
331
* merge.merge_inner now has tempdir as an optional parameter. (Robert
334
* Tree.kind is not recorded at the top level of the hierarchy, as it was
335
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
338
* WorkingTree.__del__ has been removed, it was non deterministic and not
339
doing what it was intended to. See WorkingTree.__init__ for a comment
340
about future directions. (Robert Collins/Martin Pool)
342
* bzrlib.transport.http has been modified so that only 404 urllib errors
343
are returned as NoSuchFile. Other exceptions will propogate as normal.
344
This allows debuging of actual errors. (Robert Collins)
346
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
347
to apis like 'put', 'get' and 'has'. This is to provide consistent
348
behaviour - it operates on url's only. (Robert Collins)
350
* Transports can register using register_lazy_transport, and they
351
will be loaded when first used. (Martin Pool)
353
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
354
is called by merge_inner. This is so that the conflict count can be
355
retrieved (and potentially manipulated) before returning to the caller
356
of merge_inner. Likewise 'merge' now returns the conflict count to the
357
caller. (Robert Collins)
359
* 'revision.revision_graph can handle having only partial history for
360
a revision - that is no revisions in the graph with no parents.
363
* New builtins.branch_files uses the standard file_list rules to produce
364
a branch and a list of paths, relative to that branch (Aaron Bentley)
366
* New TestCase.addCleanup facility.
368
* New bzrlib.version_info tuple (similar to sys.version_info), which can
369
be used by programs importing bzrlib.
373
* Better handling of branches in directories with non-ascii names.
374
(Joel Rosdahl, Panagiotis Papadakos)
376
* Upgrades of trees with no commits will not fail due to accessing
377
[-1] in the revision-history. (Andres Salomon)
384
* Fix problem in pulling over http from machines that do not
385
allow directories to be listed.
387
* Avoid harmless warning about invalid hash cache after
388
upgrading branch format.
392
* Avoid some unnecessary http operations in branch and pull.
399
* 'bzr branch' over http initially gives a very high estimate
400
of completion time but it should fall as the first few
401
revisions are pulled in. branch is still slow on
402
high-latency connections.
406
* bzr-man.py has been updated to work again. Contributed by
409
* Locking is now done with fcntl.lockf which works with NFS
410
file systems. Contributed by Harald Meland.
412
* When a merge encounters a file that has been deleted on
413
one side and modified on the other, the old contents are
414
written out to foo.BASE and foo.SIDE, where SIDE is this
415
or OTHER. Contributed by Aaron Bentley.
417
* Export was choosing incorrect file paths for the content of
418
the tarball, this has been fixed by Aaron Bentley.
420
* Commit will no longer commit without a log message, an
421
error is returned instead. Contributed by Jelmer Vernooij.
423
* If you commit a specific file in a sub directory, any of its
424
parent directories that are added but not listed will be
425
automatically included. Suggested by Michael Ellerman.
427
* bzr commit and upgrade did not correctly record new revisions
428
for files with only a change to their executable status.
429
bzr will correct this when it encounters it. Fixed by
432
* HTTP tests now force off the use of http_proxy for the duration.
433
Contributed by Gustavo Niemeyer.
435
* Fix problems in merging weave-based branches that have
436
different partial views of history.
438
* Symlink support: working with symlinks when not in the root of a
439
bzr tree was broken, patch from Scott James Remnant.
444
* 'branch' now accepts a --basis parameter which will take advantage
445
of local history when making a new branch. This allows faster
446
branching of remote branches. Contributed by Aaron Bentley.
448
* New tree format based on weave files, called version 5.
449
Existing branches can be upgraded to this format using
452
* Symlinks are now versionable. Initial patch by
453
Erik Toubro Nielsen, updated to head by Robert Collins.
455
* Executable bits are tracked on files. Patch from Gustavo
458
* 'bzr status' now shows unknown files inside a selected directory.
459
Patch from Heikki Paajanen.
461
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
462
and 'resolve' have needed added, which list and remove those
463
merge conflicts respectively. A conflicted tree cannot be committed
464
in. Contributed by Aaron Bentley.
466
* 'rm' is now an alias for 'remove'.
468
* Stores now split out their content in a single byte prefixed hash,
469
dropping the density of files per directory by 256. Contributed by
472
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
473
Contributed by Robert Collins.
475
* 'bzr log' with the default formatter will show merged revisions,
476
indented to the right. Initial implementation contributed by Gustavo
477
Niemeyer, made incremental by Robert Collins.
482
* Test case failures have the exception printed after the log
483
for your viewing pleasure.
485
* InventoryEntry is now an abstract base class, use one of the
486
concrete InventoryDirectory etc classes instead.
488
* Branch raises an UnsupportedFormatError when it detects a
489
bzr branch it cannot understand. This allows for precise
490
handling of such circumstances.
495
* Removed testsweet module so that tests can be run after
496
bzr installed by 'bzr selftest'.
498
* 'bzr selftest' command-line arguments can now be partial ids
499
of tests to run, e.g. 'bzr selftest test_weave'
506
* Fixed "branch -r" option.
508
* Fix remote access to branches containing non-compressed history.
511
* Better reliability of http server tests. (John Arbash-Meinel)
513
* Merge graph maximum distance calculation fix. (Aaron Bentley)
515
* Various minor bug in windows support have been fixed, largely in the
516
test suite. Contributed by Alexander Belchenko.
520
* Status now accepts a -r argument to give status between chosen
521
revisions. Contributed by Heikki Paajanen.
523
* Revision arguments no longer use +/-/= to control ranges, instead
524
there is a 'before' namespace, which limits the successive namespace.
525
For example '$ bzr log -r date:yesterday..before:date:today' will
526
select everything from yesterday and before today. Contributed by
529
* There is now a bzr.bat file created by distutils when building on
530
Windows. Contributed by Alexander Belchenko.
534
* Removed uuid() as it was unused.
536
* Improved 'fetch' code for pulling revisions from one branch into
537
another (used by pull, merged, etc.)
544
* Adding a file whose parent directory is not versioned will
545
implicitly add the parent, and so on up to the root. This means
546
you should never need to explictly add a directory, they'll just
547
get added when you add a file in the directory. Contributed by
550
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
553
* If you set BZR_EDITOR in the environment, it is checked in
554
preference to EDITOR and the config file for the interactive commit
555
editing program. Related to this is a bugfix where a missing program
556
set in EDITOR would cause editing to fail, now the fallback program
557
for the operating system is still tried.
559
* Files that are not directories/symlinks/regular files will no longer
560
cause bzr to fail, it will just ignore them by default. You cannot add
561
them to the tree though - they are not versionable.
566
* Refactor xml packing/unpacking.
570
* Fixed 'bzr mv' by Ollie Rutherfurd.
572
* Fixed strange error when trying to access a nonexistent http
575
* Make sure that the hashcache gets written out if it can't be
581
* Various Windows fixes from Ollie Rutherfurd.
583
* Quieten warnings about locking; patch from Matt Lavin.
590
* ``bzr shell-complete`` command contributed by Clint Adams to
591
help with intelligent shell completion.
593
* New expert command ``bzr find-merge-base`` for debugging merges.
598
* Much better merge support.
600
* merge3 conflicts are now reported with markers like '<<<<<<<'
601
(seven characters) which is the same as CVS and pleases things
607
* ``bzr upgrade`` no longer fails when trying to fix trees that
608
mention revisions that are not present.
610
* Fixed bugs in listing plugins from ``bzr plugins``.
612
* Fix case of $EDITOR containing options for the editor.
614
* Fix log -r refusing to show the last revision.
615
(Patch from Goffredo Baroncelli.)
620
* ``bzr log --show-ids`` shows the revision ids of all parents.
622
* Externally provided commands on your $BZRPATH no longer need
623
to recognize --bzr-usage to work properly, and can just handle
629
* Changed trace messages to go through the standard logging
630
framework, so that they can more easily be redirected by
added
removed
NEWS
