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.
22
* Plugins with the same name in different directories in the bzr plugin
23
path are no longer loaded: only the first successfully loaded one is
24
used. (Robert Collins)
26
* Use systems' external ssh command to open connections if possible.
27
This gives better integration with user settings such as ProxyCommand.
30
* Sftp paths can now be relative, or local, according to the IETF draft spec.
31
Paths now take the form:
32
sftp://user:pass@host:port/relative/path
34
sftp://user:pass@host:port/%2Fabsolute/path
36
sftp://user:pass@host:port//absolute/path
40
* "bzr INIT dir" now initializes the specified directory, and creates
41
it if it does not exist. (John Arbash Meinel)
43
* New remerge command (Aaron Bentley)
45
* Better zsh completion script. (Steve Borho)
47
* 'bzr diff' now returns 1 when there are changes in the working
48
tree. (Robert Collins)
50
* 'bzr push' now exists and can push changes to a remote location.
51
This uses the transport infrastructure, and can store the remote
52
location in the ~/.bazaar/branches.conf configuration file.
55
* Test directories are only kept if the test fails and the user requests
58
* Tweaks to short log printing
60
* Added branch nicks, new nick command, printing them in log output.
63
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
66
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
67
the same as Subversion. (Martin Pool)
69
* New ftp transport support (on ftplib), for ftp:// and aftp://
70
URLs. (Daniel Silverstone)
72
* Commit editor temporary files now start with 'bzr_log.', to allow
73
text editors to match the file name and set up appropriate modes or
74
settings. (Magnus Therning)
76
* Improved performance when integrating changes from a remote weave.
79
* Sftp will attempt to cache the connection, so it is more likely that
80
a connection will be reused, rather than requiring multiple password
83
* bzr revno now takes an optional argument indicating the branch whose
84
revno should be printed. (Michael Ellerman)
86
* bzr cat defaults to printing the last version of the file.
89
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
90
profiler. (Denys Duchier)
92
* Faster commits by reading only the headers of affected weave files.
95
* 'bzr add' now takes a --dry-run parameter which shows you what would be
96
added, but doesn't actually add anything. (Michael Ellerman)
98
* bzr add now lists how many files were ignored per glob. add --verbose
99
lists the specific files. (Aaron Bentley)
103
* SFTP can walk up to the root path without index errors. (Robert Collins)
105
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
107
* Error when run with -OO
109
* Fix bug in reporting http errors that don't have an http error code.
112
* Handle more cases of pipe errors in display commands
114
* Change status to 3 for all errors
116
* Files that are added and unlinked before committing are completely
117
ignored by diff and status
119
* Stores with some compressed texts and some uncompressed texts are now
120
able to be used. (John A Meinel)
122
* Fix for bzr pull failing sometimes under windows
124
* Fix for sftp transport under windows when using interactive auth
126
* Show files which are both renamed and modified as such in 'bzr
127
status' output. (#4503, Daniel Silverstone)
129
* Make annotate cope better with revisions committed without a valid
130
email address. (Marien Zwart)
132
* Fix representation of tab characters in commit messages. (Harald
135
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
136
now parsed properly under Windows. (Alexander Belchenko)
138
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
140
* Keep a cached copy of the basis inventory to speed up operations
141
that need to refer to it. (Johan Rydberg, Martin Pool)
143
* Fix bugs in bzr status display of non-ascii characters. (Martin
148
* Fix selftest asking for passwords when there are no SFTP keys.
149
(Robey Pointer, Jelmer Vernooij)
151
* Fix selftest run with 'python -O'. (Martin Pool)
153
* Fix HTTP tests under Windows. (John Arbash Meinel)
155
* Make tests work even if HOME is not set (Aaron Bentley)
157
* Updated build_tree to use fixed line-endings for tests which read
158
the file cotents and compare. Make some tests use this to pass under
159
Windows. (John Arbash Meinel)
161
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
163
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
166
* Use terminal width to align verbose test output. (Martin Pool)
168
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
169
If adding a new test script please add that to
170
bzrlib.tests.blackbox.__init__. (Robert Collins)
172
* Much better error message if one of the test suites can't be
173
imported. (Martin Pool)
175
* Tests can now run TestSkipped if they can't execute for any reason.
180
* WorkingTree.pull has been split across Branch and WorkingTree,
181
to allow Branch only pulls. (Robert Collins)
183
* commands.display_command now returns the result of the decorated
184
function. (Robert Collins)
186
* LocationConfig now has a set_user_option(key, value) call to save
187
a setting in its matching location section (a new one is created
188
if needed). (Robert Collins)
190
* Branch has two new methods, get_push_location and set_push_location
191
to respectively, get and set the push location. (Robert Collins)
193
* commands.register_command now takes an optional flag to signal that
194
the registrant is planning to decorate an existing command. When
195
given multiple plugins registering a command is not an error, and
196
the original command class (whether built in or a plugin based one) is
197
returned to the caller. There is a new error 'MustUseDecorated' for
198
signalling when a wrapping command should switch to the original
199
version. (Robert Collins)
201
* Some option parsing errors will raise 'BzrOptionError', allowing
202
granular detection for decorating commands. (Robert Collins).
204
* Branch.read_working_inventory has moved to
205
WorkingTree.read_working_inventory. This necessitated changes to
206
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
207
as well. To make it clear that a WorkingTree cannot always be obtained
208
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
209
be obtained. (Robert Collins)
211
* All pending merges operations from Branch are now on WorkingTree.
214
* The follow operations from Branch have moved to WorkingTree:
222
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
224
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
226
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
229
* bzrlib.plugin.all_plugins has been changed from an attribute to a
230
query method. (Robert Collins)
232
* New options to read only the table-of-contents of a weave.
235
* Raise NoSuchFile when someone tries to add a non-existant file.
238
* Simplify handling of DivergedBranches in cmd_pull().
246
* pull now takes --verbose to show you what revisions are added or removed
249
* merge now takes a --show-base option to include the base text in
253
* The config files are now read using ConfigObj, so '=' should be used as
254
a separator, not ':'.
257
* New 'bzr commit --strict' option refuses to commit if there are
258
any unknown files in the tree. To commit, make sure all files are
259
either ignored, added, or deleted. (Michael Ellerman)
261
* The config directory is now ~/.bazaar, and there is a single file
262
~/.bazaar/bazaar.conf storing email, editor and other preferences.
265
* 'bzr add' no longer takes a --verbose option, and a --quiet option
266
has been added that suppresses all output.
268
* Improved zsh completion support in contrib/zsh, from Clint
271
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
274
* 'bzr check' now accepts -v for verbose reporting, and checks for
275
ghosts in the branch. (Robert Collins)
277
* New command 're-sign' which will regenerate the gpg signature for
278
a revision. (Robert Collins)
280
* If you set check_signatures=require for a path in
281
~/.bazaar/branches.conf then bzr will invoke your
282
gpg_signing_command (defaults to gpg) and record a digital signature
283
of your commit. (Robert Collins)
285
* New sftp transport, based on Paramiko. (Robey Pointer)
287
* 'bzr pull' now accepts '--clobber' which will discard local changes
288
and make this branch identical to the source branch. (Robert Collins)
290
* Just give a quieter warning if a plugin can't be loaded, and
291
put the details in .bzr.log. (Martin Pool)
293
* 'bzr branch' will now set the branch-name to the last component of the
294
output directory, if one was supplied.
296
* If the option 'post_commit' is set to one (or more) python function
297
names (must be in the bzrlib namespace), then they will be invoked
298
after the commit has completed, with the branch and revision_id as
299
parameters. (Robert Collins)
301
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
303
* --merge-type weave is now supported for file contents. Tree-shape
304
changes are still three-way based. (Martin Pool, Aaron Bentley)
306
* 'bzr check' allows the first revision on revision-history to have
307
parents - something that is expected for cheap checkouts, and occurs
308
when conversions from baz do not have all history. (Robert Collins).
310
* 'bzr merge' can now graft unrelated trees together, if your specify
311
0 as a base. (Aaron Bentley)
313
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
316
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
318
* 'bzr merge --reprocess' minimizes conflicts
322
* The 'bzr selftest --pattern' option for has been removed, now
323
test specifiers on the command line can be simple strings, or
324
regexps, or both. (Robert Collins)
326
* Passing -v to selftest will now show the time each test took to
327
complete, which will aid in analysing performance regressions and
328
related questions. (Robert Collins)
330
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
331
is given. (Martin Pool)
333
* There is a new method for TestCaseInTempDir, assertFileEqual, which
334
will check that a given content is equal to the content of the named
335
file. (Robert Collins)
337
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
342
* New 'testament' command and concept for making gpg-signatures
343
of revisions that are not tied to a particular internal
344
representation. (Martin Pool).
346
* Per-revision properties ('revprops') as key-value associated
347
strings on each revision created when the revision is committed.
348
Intended mainly for the use of external tools. (Martin Pool).
350
* Config options have moved from bzrlib.osutils to bzrlib.config.
353
* Improved command line option definitions allowing explanations
354
for individual options, among other things. Contributed by
357
* Config options have moved from bzrlib.osutils to bzrlib.config.
358
Configuration is now done via the config.Config interface:
359
Depending on whether you have a Branch, a Location or no information
360
available, construct a *Config, and use its signature_checking,
361
username and user_email methods. (Robert Collins)
363
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
364
they are made available for other plugins to use. You should not
365
import other plugins during the __init__ of your plugin though, as
366
no ordering is guaranteed, and the plugins directory is not on the
367
python path. (Robert Collins)
369
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
370
no longer takes an inventory, rather it takes an option branch
371
parameter, and if None is given will open the branch at basedir
372
implicitly. (Robert Collins)
374
* Cleaner exception structure and error reporting. Suggested by
375
Scott James Remnant. (Martin Pool)
377
* Branch.remove has been moved to WorkingTree, which has also gained
378
lock_read, lock_write and unlock methods for convenience. (Robert
381
* Two decorators, needs_read_lock and needs_write_lock have been added
382
to the branch module. Use these to cause a function to run in a
383
read or write lock respectively. (Robert Collins)
385
* Branch.open_containing now returns a tuple (Branch, relative-path),
386
which allows direct access to the common case of 'get me this file
387
from its branch'. (Robert Collins)
389
* Transports can register using register_lazy_transport, and they
390
will be loaded when first used. (Martin Pool)
392
* 'pull' has been factored out of the command as WorkingTree.pull().
393
A new option to WorkingTree.pull has been added, clobber, which will
394
ignore diverged history and pull anyway.
397
* config.Config has a 'get_user_option' call that accepts an option name.
398
This will be looked up in branches.conf and bazaar.conf as normal.
399
It is intended that this be used by plugins to support options -
400
options of built in programs should have specific methods on the config.
403
* merge.merge_inner now has tempdir as an optional parameter. (Robert
406
* Tree.kind is not recorded at the top level of the hierarchy, as it was
407
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
410
* WorkingTree.__del__ has been removed, it was non deterministic and not
411
doing what it was intended to. See WorkingTree.__init__ for a comment
412
about future directions. (Robert Collins/Martin Pool)
414
* bzrlib.transport.http has been modified so that only 404 urllib errors
415
are returned as NoSuchFile. Other exceptions will propogate as normal.
416
This allows debuging of actual errors. (Robert Collins)
418
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
419
to apis like 'put', 'get' and 'has'. This is to provide consistent
420
behaviour - it operates on url's only. (Robert Collins)
422
* Transports can register using register_lazy_transport, and they
423
will be loaded when first used. (Martin Pool)
425
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
426
is called by merge_inner. This is so that the conflict count can be
427
retrieved (and potentially manipulated) before returning to the caller
428
of merge_inner. Likewise 'merge' now returns the conflict count to the
429
caller. (Robert Collins)
431
* 'revision.revision_graph can handle having only partial history for
432
a revision - that is no revisions in the graph with no parents.
435
* New builtins.branch_files uses the standard file_list rules to produce
436
a branch and a list of paths, relative to that branch (Aaron Bentley)
438
* New TestCase.addCleanup facility.
440
* New bzrlib.version_info tuple (similar to sys.version_info), which can
441
be used by programs importing bzrlib.
445
* Better handling of branches in directories with non-ascii names.
446
(Joel Rosdahl, Panagiotis Papadakos)
448
* Upgrades of trees with no commits will not fail due to accessing
449
[-1] in the revision-history. (Andres Salomon)
456
* Fix problem in pulling over http from machines that do not
457
allow directories to be listed.
459
* Avoid harmless warning about invalid hash cache after
460
upgrading branch format.
464
* Avoid some unnecessary http operations in branch and pull.
471
* 'bzr branch' over http initially gives a very high estimate
472
of completion time but it should fall as the first few
473
revisions are pulled in. branch is still slow on
474
high-latency connections.
478
* bzr-man.py has been updated to work again. Contributed by
481
* Locking is now done with fcntl.lockf which works with NFS
482
file systems. Contributed by Harald Meland.
484
* When a merge encounters a file that has been deleted on
485
one side and modified on the other, the old contents are
486
written out to foo.BASE and foo.SIDE, where SIDE is this
487
or OTHER. Contributed by Aaron Bentley.
489
* Export was choosing incorrect file paths for the content of
490
the tarball, this has been fixed by Aaron Bentley.
492
* Commit will no longer commit without a log message, an
493
error is returned instead. Contributed by Jelmer Vernooij.
495
* If you commit a specific file in a sub directory, any of its
496
parent directories that are added but not listed will be
497
automatically included. Suggested by Michael Ellerman.
499
* bzr commit and upgrade did not correctly record new revisions
500
for files with only a change to their executable status.
501
bzr will correct this when it encounters it. Fixed by
504
* HTTP tests now force off the use of http_proxy for the duration.
505
Contributed by Gustavo Niemeyer.
507
* Fix problems in merging weave-based branches that have
508
different partial views of history.
510
* Symlink support: working with symlinks when not in the root of a
511
bzr tree was broken, patch from Scott James Remnant.
516
* 'branch' now accepts a --basis parameter which will take advantage
517
of local history when making a new branch. This allows faster
518
branching of remote branches. Contributed by Aaron Bentley.
520
* New tree format based on weave files, called version 5.
521
Existing branches can be upgraded to this format using
524
* Symlinks are now versionable. Initial patch by
525
Erik Toubro Nielsen, updated to head by Robert Collins.
527
* Executable bits are tracked on files. Patch from Gustavo
530
* 'bzr status' now shows unknown files inside a selected directory.
531
Patch from Heikki Paajanen.
533
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
534
and 'resolve' have needed added, which list and remove those
535
merge conflicts respectively. A conflicted tree cannot be committed
536
in. Contributed by Aaron Bentley.
538
* 'rm' is now an alias for 'remove'.
540
* Stores now split out their content in a single byte prefixed hash,
541
dropping the density of files per directory by 256. Contributed by
544
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
545
Contributed by Robert Collins.
547
* 'bzr log' with the default formatter will show merged revisions,
548
indented to the right. Initial implementation contributed by Gustavo
549
Niemeyer, made incremental by Robert Collins.
554
* Test case failures have the exception printed after the log
555
for your viewing pleasure.
557
* InventoryEntry is now an abstract base class, use one of the
558
concrete InventoryDirectory etc classes instead.
560
* Branch raises an UnsupportedFormatError when it detects a
561
bzr branch it cannot understand. This allows for precise
562
handling of such circumstances.
567
* Removed testsweet module so that tests can be run after
568
bzr installed by 'bzr selftest'.
570
* 'bzr selftest' command-line arguments can now be partial ids
571
of tests to run, e.g. 'bzr selftest test_weave'
578
* Fixed "branch -r" option.
580
* Fix remote access to branches containing non-compressed history.
583
* Better reliability of http server tests. (John Arbash-Meinel)
585
* Merge graph maximum distance calculation fix. (Aaron Bentley)
587
* Various minor bug in windows support have been fixed, largely in the
588
test suite. Contributed by Alexander Belchenko.
592
* Status now accepts a -r argument to give status between chosen
593
revisions. Contributed by Heikki Paajanen.
595
* Revision arguments no longer use +/-/= to control ranges, instead
596
there is a 'before' namespace, which limits the successive namespace.
597
For example '$ bzr log -r date:yesterday..before:date:today' will
598
select everything from yesterday and before today. Contributed by
601
* There is now a bzr.bat file created by distutils when building on
602
Windows. Contributed by Alexander Belchenko.
606
* Removed uuid() as it was unused.
608
* Improved 'fetch' code for pulling revisions from one branch into
609
another (used by pull, merged, etc.)
added
removed
NEWS
