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)
58
* SFTP can walk up to the root path without index errors. (Robert Collins)
60
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
62
* Error when run with -OO
64
* Fix bug in reporting http errors that don't have an http error code.
67
* Handle more cases of pipe errors in display commands
69
* Change status to 3 for all errors
71
* Files that are added and unlinked before committing are completely
72
ignored by diff and status
74
* Stores with some compressed texts and some uncompressed texts are now
75
able to be used. (John A Meinel)
77
* Show files which are both renamed and modified as such in 'bzr
78
status' output. (#4503, Daniel Silverstone)
80
* Make annotate cope better with revisions committed without a valid
81
email address. (Marien Zwart)
83
* Fix representation of tab characters in commit messages. (Harald
86
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
87
now parsed properly under Windows. (Alexander Belchenko)
89
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
93
* Fix selftest asking for passwords when there are no SFTP keys.
94
(Robey Pointer, Jelmer Vernooij)
96
* Fix selftest run with 'python -O'. (Martin Pool)
98
* Fix HTTP tests under Windows. (John Arbash Meinel)
100
* Make tests work even if HOME is not set (Aaron Bentley)
102
* Updated build_tree to use fixed line-endings for tests which read
103
the file cotents and compare. Make some tests use this to pass under
104
Windows. (John Arbash Meinel)
106
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
108
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
113
* WorkingTree.pull has been split across Branch and WorkingTree,
114
to allow Branch only pulls. (Robert Collins)
116
* commands.display_command now returns the result of the decorated
117
function. (Robert Collins)
119
* LocationConfig now has a set_user_option(key, value) call to save
120
a setting in its matching location section (a new one is created
121
if needed). (Robert Collins)
123
* Branch has two new methods, get_push_location and set_push_location
124
to respectively, get and set the push location. (Robert Collins)
126
* commands.register_command now takes an optional flag to signal that
127
the registrant is planning to decorate an existing command. When
128
given multiple plugins registering a command is not an error, and
129
the original command class (whether built in or a plugin based one) is
130
returned to the caller. There is a new error 'MustUseDecorated' for
131
signalling when a wrapping command should switch to the original
132
version. (Robert Collins)
134
* Some option parsing errors will raise 'BzrOptionError', allowing
135
granular detection for decorating commands. (Robert Collins).
137
* Branch.read_working_inventory has moved to
138
WorkingTree.read_working_inventory. This necessitated changes to
139
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
140
as well. To make it clear that a WorkingTree cannot always be obtained
141
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
142
be obtained. (Robert Collins)
144
* All pending merges operations from Branch are now on WorkingTree.
147
* The follow operations from Branch have moved to WorkingTree:
155
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
162
* pull now takes --verbose to show you what revisions are added or removed
165
* merge now takes a --show-base option to include the base text in
169
* The config files are now read using ConfigObj, so '=' should be used as
170
a separator, not ':'.
173
* New 'bzr commit --strict' option refuses to commit if there are
174
any unknown files in the tree. To commit, make sure all files are
175
either ignored, added, or deleted. (Michael Ellerman)
177
* The config directory is now ~/.bazaar, and there is a single file
178
~/.bazaar/bazaar.conf storing email, editor and other preferences.
181
* 'bzr add' no longer takes a --verbose option, and a --quiet option
182
has been added that suppresses all output.
184
* Improved zsh completion support in contrib/zsh, from Clint
187
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
190
* 'bzr check' now accepts -v for verbose reporting, and checks for
191
ghosts in the branch. (Robert Collins)
193
* New command 're-sign' which will regenerate the gpg signature for
194
a revision. (Robert Collins)
196
* If you set check_signatures=require for a path in
197
~/.bazaar/branches.conf then bzr will invoke your
198
gpg_signing_command (defaults to gpg) and record a digital signature
199
of your commit. (Robert Collins)
201
* New sftp transport, based on Paramiko. (Robey Pointer)
203
* 'bzr pull' now accepts '--clobber' which will discard local changes
204
and make this branch identical to the source branch. (Robert Collins)
206
* Just give a quieter warning if a plugin can't be loaded, and
207
put the details in .bzr.log. (Martin Pool)
209
* 'bzr branch' will now set the branch-name to the last component of the
210
output directory, if one was supplied.
212
* If the option 'post_commit' is set to one (or more) python function
213
names (must be in the bzrlib namespace), then they will be invoked
214
after the commit has completed, with the branch and revision_id as
215
parameters. (Robert Collins)
217
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
219
* --merge-type weave is now supported for file contents. Tree-shape
220
changes are still three-way based. (Martin Pool, Aaron Bentley)
222
* 'bzr check' allows the first revision on revision-history to have
223
parents - something that is expected for cheap checkouts, and occurs
224
when conversions from baz do not have all history. (Robert Collins).
226
* 'bzr merge' can now graft unrelated trees together, if your specify
227
0 as a base. (Aaron Bentley)
229
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
232
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
234
* 'bzr merge --reprocess' minimizes conflicts
238
* The 'bzr selftest --pattern' option for has been removed, now
239
test specifiers on the command line can be simple strings, or
240
regexps, or both. (Robert Collins)
242
* Passing -v to selftest will now show the time each test took to
243
complete, which will aid in analysing performance regressions and
244
related questions. (Robert Collins)
246
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
247
is given. (Martin Pool)
249
* There is a new method for TestCaseInTempDir, assertFileEqual, which
250
will check that a given content is equal to the content of the named
251
file. (Robert Collins)
253
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
258
* New 'testament' command and concept for making gpg-signatures
259
of revisions that are not tied to a particular internal
260
representation. (Martin Pool).
262
* Per-revision properties ('revprops') as key-value associated
263
strings on each revision created when the revision is committed.
264
Intended mainly for the use of external tools. (Martin Pool).
266
* Config options have moved from bzrlib.osutils to bzrlib.config.
269
* Improved command line option definitions allowing explanations
270
for individual options, among other things. Contributed by
273
* Config options have moved from bzrlib.osutils to bzrlib.config.
274
Configuration is now done via the config.Config interface:
275
Depending on whether you have a Branch, a Location or no information
276
available, construct a *Config, and use its signature_checking,
277
username and user_email methods. (Robert Collins)
279
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
280
they are made available for other plugins to use. You should not
281
import other plugins during the __init__ of your plugin though, as
282
no ordering is guaranteed, and the plugins directory is not on the
283
python path. (Robert Collins)
285
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
286
no longer takes an inventory, rather it takes an option branch
287
parameter, and if None is given will open the branch at basedir
288
implicitly. (Robert Collins)
290
* Cleaner exception structure and error reporting. Suggested by
291
Scott James Remnant. (Martin Pool)
293
* Branch.remove has been moved to WorkingTree, which has also gained
294
lock_read, lock_write and unlock methods for convenience. (Robert
297
* Two decorators, needs_read_lock and needs_write_lock have been added
298
to the branch module. Use these to cause a function to run in a
299
read or write lock respectively. (Robert Collins)
301
* Branch.open_containing now returns a tuple (Branch, relative-path),
302
which allows direct access to the common case of 'get me this file
303
from its branch'. (Robert Collins)
305
* Transports can register using register_lazy_transport, and they
306
will be loaded when first used. (Martin Pool)
308
* 'pull' has been factored out of the command as WorkingTree.pull().
309
A new option to WorkingTree.pull has been added, clobber, which will
310
ignore diverged history and pull anyway.
313
* config.Config has a 'get_user_option' call that accepts an option name.
314
This will be looked up in branches.conf and bazaar.conf as normal.
315
It is intended that this be used by plugins to support options -
316
options of built in programs should have specific methods on the config.
319
* merge.merge_inner now has tempdir as an optional parameter. (Robert
322
* Tree.kind is not recorded at the top level of the hierarchy, as it was
323
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
326
* WorkingTree.__del__ has been removed, it was non deterministic and not
327
doing what it was intended to. See WorkingTree.__init__ for a comment
328
about future directions. (Robert Collins/Martin Pool)
330
* bzrlib.transport.http has been modified so that only 404 urllib errors
331
are returned as NoSuchFile. Other exceptions will propogate as normal.
332
This allows debuging of actual errors. (Robert Collins)
334
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
335
to apis like 'put', 'get' and 'has'. This is to provide consistent
336
behaviour - it operates on url's only. (Robert Collins)
338
* Transports can register using register_lazy_transport, and they
339
will be loaded when first used. (Martin Pool)
341
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
342
is called by merge_inner. This is so that the conflict count can be
343
retrieved (and potentially manipulated) before returning to the caller
344
of merge_inner. Likewise 'merge' now returns the conflict count to the
345
caller. (Robert Collins)
347
* 'revision.revision_graph can handle having only partial history for
348
a revision - that is no revisions in the graph with no parents.
351
* New builtins.branch_files uses the standard file_list rules to produce
352
a branch and a list of paths, relative to that branch (Aaron Bentley)
354
* New TestCase.addCleanup facility.
356
* New bzrlib.version_info tuple (similar to sys.version_info), which can
357
be used by programs importing bzrlib.
361
* Better handling of branches in directories with non-ascii names.
362
(Joel Rosdahl, Panagiotis Papadakos)
364
* Upgrades of trees with no commits will not fail due to accessing
365
[-1] in the revision-history. (Andres Salomon)
372
* Fix problem in pulling over http from machines that do not
373
allow directories to be listed.
375
* Avoid harmless warning about invalid hash cache after
376
upgrading branch format.
380
* Avoid some unnecessary http operations in branch and pull.
387
* 'bzr branch' over http initially gives a very high estimate
388
of completion time but it should fall as the first few
389
revisions are pulled in. branch is still slow on
390
high-latency connections.
394
* bzr-man.py has been updated to work again. Contributed by
397
* Locking is now done with fcntl.lockf which works with NFS
398
file systems. Contributed by Harald Meland.
400
* When a merge encounters a file that has been deleted on
401
one side and modified on the other, the old contents are
402
written out to foo.BASE and foo.SIDE, where SIDE is this
403
or OTHER. Contributed by Aaron Bentley.
405
* Export was choosing incorrect file paths for the content of
406
the tarball, this has been fixed by Aaron Bentley.
408
* Commit will no longer commit without a log message, an
409
error is returned instead. Contributed by Jelmer Vernooij.
411
* If you commit a specific file in a sub directory, any of its
412
parent directories that are added but not listed will be
413
automatically included. Suggested by Michael Ellerman.
415
* bzr commit and upgrade did not correctly record new revisions
416
for files with only a change to their executable status.
417
bzr will correct this when it encounters it. Fixed by
420
* HTTP tests now force off the use of http_proxy for the duration.
421
Contributed by Gustavo Niemeyer.
423
* Fix problems in merging weave-based branches that have
424
different partial views of history.
426
* Symlink support: working with symlinks when not in the root of a
427
bzr tree was broken, patch from Scott James Remnant.
432
* 'branch' now accepts a --basis parameter which will take advantage
433
of local history when making a new branch. This allows faster
434
branching of remote branches. Contributed by Aaron Bentley.
436
* New tree format based on weave files, called version 5.
437
Existing branches can be upgraded to this format using
440
* Symlinks are now versionable. Initial patch by
441
Erik Toubro Nielsen, updated to head by Robert Collins.
443
* Executable bits are tracked on files. Patch from Gustavo
446
* 'bzr status' now shows unknown files inside a selected directory.
447
Patch from Heikki Paajanen.
449
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
450
and 'resolve' have needed added, which list and remove those
451
merge conflicts respectively. A conflicted tree cannot be committed
452
in. Contributed by Aaron Bentley.
454
* 'rm' is now an alias for 'remove'.
456
* Stores now split out their content in a single byte prefixed hash,
457
dropping the density of files per directory by 256. Contributed by
460
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
461
Contributed by Robert Collins.
463
* 'bzr log' with the default formatter will show merged revisions,
464
indented to the right. Initial implementation contributed by Gustavo
465
Niemeyer, made incremental by Robert Collins.
470
* Test case failures have the exception printed after the log
471
for your viewing pleasure.
473
* InventoryEntry is now an abstract base class, use one of the
474
concrete InventoryDirectory etc classes instead.
476
* Branch raises an UnsupportedFormatError when it detects a
477
bzr branch it cannot understand. This allows for precise
478
handling of such circumstances.
483
* Removed testsweet module so that tests can be run after
484
bzr installed by 'bzr selftest'.
486
* 'bzr selftest' command-line arguments can now be partial ids
487
of tests to run, e.g. 'bzr selftest test_weave'
494
* Fixed "branch -r" option.
496
* Fix remote access to branches containing non-compressed history.
499
* Better reliability of http server tests. (John Arbash-Meinel)
501
* Merge graph maximum distance calculation fix. (Aaron Bentley)
503
* Various minor bug in windows support have been fixed, largely in the
504
test suite. Contributed by Alexander Belchenko.
508
* Status now accepts a -r argument to give status between chosen
509
revisions. Contributed by Heikki Paajanen.
511
* Revision arguments no longer use +/-/= to control ranges, instead
512
there is a 'before' namespace, which limits the successive namespace.
513
For example '$ bzr log -r date:yesterday..before:date:today' will
514
select everything from yesterday and before today. Contributed by
517
* There is now a bzr.bat file created by distutils when building on
518
Windows. Contributed by Alexander Belchenko.
522
* Removed uuid() as it was unused.
524
* Improved 'fetch' code for pulling revisions from one branch into
525
another (used by pull, merged, etc.)
532
* Adding a file whose parent directory is not versioned will
533
implicitly add the parent, and so on up to the root. This means
534
you should never need to explictly add a directory, they'll just
535
get added when you add a file in the directory. Contributed by
538
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
541
* If you set BZR_EDITOR in the environment, it is checked in
542
preference to EDITOR and the config file for the interactive commit
543
editing program. Related to this is a bugfix where a missing program
544
set in EDITOR would cause editing to fail, now the fallback program
545
for the operating system is still tried.
547
* Files that are not directories/symlinks/regular files will no longer
548
cause bzr to fail, it will just ignore them by default. You cannot add
549
them to the tree though - they are not versionable.
added
removed
NEWS
