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.
91
* SFTP can walk up to the root path without index errors. (Robert Collins)
93
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
95
* Error when run with -OO
97
* Fix bug in reporting http errors that don't have an http error code.
100
* Handle more cases of pipe errors in display commands
102
* Change status to 3 for all errors
104
* Files that are added and unlinked before committing are completely
105
ignored by diff and status
107
* Stores with some compressed texts and some uncompressed texts are now
108
able to be used. (John A Meinel)
110
* Fix for bzr pull failing sometimes under windows
112
* Fix for sftp transport under windows when using interactive auth
114
* Show files which are both renamed and modified as such in 'bzr
115
status' output. (#4503, Daniel Silverstone)
117
* Make annotate cope better with revisions committed without a valid
118
email address. (Marien Zwart)
120
* Fix representation of tab characters in commit messages. (Harald
123
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
124
now parsed properly under Windows. (Alexander Belchenko)
126
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
128
* Keep a cached copy of the basis inventory to speed up operations
129
that need to refer to it. (Johan Rydberg, Martin Pool)
131
* Fix bugs in bzr status display of non-ascii characters. (Martin
136
* Fix selftest asking for passwords when there are no SFTP keys.
137
(Robey Pointer, Jelmer Vernooij)
139
* Fix selftest run with 'python -O'. (Martin Pool)
141
* Fix HTTP tests under Windows. (John Arbash Meinel)
143
* Make tests work even if HOME is not set (Aaron Bentley)
145
* Updated build_tree to use fixed line-endings for tests which read
146
the file cotents and compare. Make some tests use this to pass under
147
Windows. (John Arbash Meinel)
149
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
151
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
154
* Use terminal width to align verbose test output. (Martin Pool)
156
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
157
If adding a new test script please add that to
158
bzrlib.tests.blackbox.__init__. (Robert Collins)
160
* Much better error message if one of the test suites can't be
161
imported. (Martin Pool)
165
* WorkingTree.pull has been split across Branch and WorkingTree,
166
to allow Branch only pulls. (Robert Collins)
168
* commands.display_command now returns the result of the decorated
169
function. (Robert Collins)
171
* LocationConfig now has a set_user_option(key, value) call to save
172
a setting in its matching location section (a new one is created
173
if needed). (Robert Collins)
175
* Branch has two new methods, get_push_location and set_push_location
176
to respectively, get and set the push location. (Robert Collins)
178
* commands.register_command now takes an optional flag to signal that
179
the registrant is planning to decorate an existing command. When
180
given multiple plugins registering a command is not an error, and
181
the original command class (whether built in or a plugin based one) is
182
returned to the caller. There is a new error 'MustUseDecorated' for
183
signalling when a wrapping command should switch to the original
184
version. (Robert Collins)
186
* Some option parsing errors will raise 'BzrOptionError', allowing
187
granular detection for decorating commands. (Robert Collins).
189
* Branch.read_working_inventory has moved to
190
WorkingTree.read_working_inventory. This necessitated changes to
191
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
192
as well. To make it clear that a WorkingTree cannot always be obtained
193
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
194
be obtained. (Robert Collins)
196
* All pending merges operations from Branch are now on WorkingTree.
199
* The follow operations from Branch have moved to WorkingTree:
207
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
209
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
211
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
214
* bzrlib.plugin.all_plugins has been changed from an attribute to a
215
query method. (Robert Collins)
221
* pull now takes --verbose to show you what revisions are added or removed
224
* merge now takes a --show-base option to include the base text in
228
* The config files are now read using ConfigObj, so '=' should be used as
229
a separator, not ':'.
232
* New 'bzr commit --strict' option refuses to commit if there are
233
any unknown files in the tree. To commit, make sure all files are
234
either ignored, added, or deleted. (Michael Ellerman)
236
* The config directory is now ~/.bazaar, and there is a single file
237
~/.bazaar/bazaar.conf storing email, editor and other preferences.
240
* 'bzr add' no longer takes a --verbose option, and a --quiet option
241
has been added that suppresses all output.
243
* Improved zsh completion support in contrib/zsh, from Clint
246
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
249
* 'bzr check' now accepts -v for verbose reporting, and checks for
250
ghosts in the branch. (Robert Collins)
252
* New command 're-sign' which will regenerate the gpg signature for
253
a revision. (Robert Collins)
255
* If you set check_signatures=require for a path in
256
~/.bazaar/branches.conf then bzr will invoke your
257
gpg_signing_command (defaults to gpg) and record a digital signature
258
of your commit. (Robert Collins)
260
* New sftp transport, based on Paramiko. (Robey Pointer)
262
* 'bzr pull' now accepts '--clobber' which will discard local changes
263
and make this branch identical to the source branch. (Robert Collins)
265
* Just give a quieter warning if a plugin can't be loaded, and
266
put the details in .bzr.log. (Martin Pool)
268
* 'bzr branch' will now set the branch-name to the last component of the
269
output directory, if one was supplied.
271
* If the option 'post_commit' is set to one (or more) python function
272
names (must be in the bzrlib namespace), then they will be invoked
273
after the commit has completed, with the branch and revision_id as
274
parameters. (Robert Collins)
276
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
278
* --merge-type weave is now supported for file contents. Tree-shape
279
changes are still three-way based. (Martin Pool, Aaron Bentley)
281
* 'bzr check' allows the first revision on revision-history to have
282
parents - something that is expected for cheap checkouts, and occurs
283
when conversions from baz do not have all history. (Robert Collins).
285
* 'bzr merge' can now graft unrelated trees together, if your specify
286
0 as a base. (Aaron Bentley)
288
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
291
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
293
* 'bzr merge --reprocess' minimizes conflicts
297
* The 'bzr selftest --pattern' option for has been removed, now
298
test specifiers on the command line can be simple strings, or
299
regexps, or both. (Robert Collins)
301
* Passing -v to selftest will now show the time each test took to
302
complete, which will aid in analysing performance regressions and
303
related questions. (Robert Collins)
305
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
306
is given. (Martin Pool)
308
* There is a new method for TestCaseInTempDir, assertFileEqual, which
309
will check that a given content is equal to the content of the named
310
file. (Robert Collins)
312
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
317
* New 'testament' command and concept for making gpg-signatures
318
of revisions that are not tied to a particular internal
319
representation. (Martin Pool).
321
* Per-revision properties ('revprops') as key-value associated
322
strings on each revision created when the revision is committed.
323
Intended mainly for the use of external tools. (Martin Pool).
325
* Config options have moved from bzrlib.osutils to bzrlib.config.
328
* Improved command line option definitions allowing explanations
329
for individual options, among other things. Contributed by
332
* Config options have moved from bzrlib.osutils to bzrlib.config.
333
Configuration is now done via the config.Config interface:
334
Depending on whether you have a Branch, a Location or no information
335
available, construct a *Config, and use its signature_checking,
336
username and user_email methods. (Robert Collins)
338
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
339
they are made available for other plugins to use. You should not
340
import other plugins during the __init__ of your plugin though, as
341
no ordering is guaranteed, and the plugins directory is not on the
342
python path. (Robert Collins)
344
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
345
no longer takes an inventory, rather it takes an option branch
346
parameter, and if None is given will open the branch at basedir
347
implicitly. (Robert Collins)
349
* Cleaner exception structure and error reporting. Suggested by
350
Scott James Remnant. (Martin Pool)
352
* Branch.remove has been moved to WorkingTree, which has also gained
353
lock_read, lock_write and unlock methods for convenience. (Robert
356
* Two decorators, needs_read_lock and needs_write_lock have been added
357
to the branch module. Use these to cause a function to run in a
358
read or write lock respectively. (Robert Collins)
360
* Branch.open_containing now returns a tuple (Branch, relative-path),
361
which allows direct access to the common case of 'get me this file
362
from its branch'. (Robert Collins)
364
* Transports can register using register_lazy_transport, and they
365
will be loaded when first used. (Martin Pool)
367
* 'pull' has been factored out of the command as WorkingTree.pull().
368
A new option to WorkingTree.pull has been added, clobber, which will
369
ignore diverged history and pull anyway.
372
* config.Config has a 'get_user_option' call that accepts an option name.
373
This will be looked up in branches.conf and bazaar.conf as normal.
374
It is intended that this be used by plugins to support options -
375
options of built in programs should have specific methods on the config.
378
* merge.merge_inner now has tempdir as an optional parameter. (Robert
381
* Tree.kind is not recorded at the top level of the hierarchy, as it was
382
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
385
* WorkingTree.__del__ has been removed, it was non deterministic and not
386
doing what it was intended to. See WorkingTree.__init__ for a comment
387
about future directions. (Robert Collins/Martin Pool)
389
* bzrlib.transport.http has been modified so that only 404 urllib errors
390
are returned as NoSuchFile. Other exceptions will propogate as normal.
391
This allows debuging of actual errors. (Robert Collins)
393
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
394
to apis like 'put', 'get' and 'has'. This is to provide consistent
395
behaviour - it operates on url's only. (Robert Collins)
397
* Transports can register using register_lazy_transport, and they
398
will be loaded when first used. (Martin Pool)
400
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
401
is called by merge_inner. This is so that the conflict count can be
402
retrieved (and potentially manipulated) before returning to the caller
403
of merge_inner. Likewise 'merge' now returns the conflict count to the
404
caller. (Robert Collins)
406
* 'revision.revision_graph can handle having only partial history for
407
a revision - that is no revisions in the graph with no parents.
410
* New builtins.branch_files uses the standard file_list rules to produce
411
a branch and a list of paths, relative to that branch (Aaron Bentley)
413
* New TestCase.addCleanup facility.
415
* New bzrlib.version_info tuple (similar to sys.version_info), which can
416
be used by programs importing bzrlib.
420
* Better handling of branches in directories with non-ascii names.
421
(Joel Rosdahl, Panagiotis Papadakos)
423
* Upgrades of trees with no commits will not fail due to accessing
424
[-1] in the revision-history. (Andres Salomon)
431
* Fix problem in pulling over http from machines that do not
432
allow directories to be listed.
434
* Avoid harmless warning about invalid hash cache after
435
upgrading branch format.
439
* Avoid some unnecessary http operations in branch and pull.
446
* 'bzr branch' over http initially gives a very high estimate
447
of completion time but it should fall as the first few
448
revisions are pulled in. branch is still slow on
449
high-latency connections.
453
* bzr-man.py has been updated to work again. Contributed by
456
* Locking is now done with fcntl.lockf which works with NFS
457
file systems. Contributed by Harald Meland.
459
* When a merge encounters a file that has been deleted on
460
one side and modified on the other, the old contents are
461
written out to foo.BASE and foo.SIDE, where SIDE is this
462
or OTHER. Contributed by Aaron Bentley.
464
* Export was choosing incorrect file paths for the content of
465
the tarball, this has been fixed by Aaron Bentley.
467
* Commit will no longer commit without a log message, an
468
error is returned instead. Contributed by Jelmer Vernooij.
470
* If you commit a specific file in a sub directory, any of its
471
parent directories that are added but not listed will be
472
automatically included. Suggested by Michael Ellerman.
474
* bzr commit and upgrade did not correctly record new revisions
475
for files with only a change to their executable status.
476
bzr will correct this when it encounters it. Fixed by
479
* HTTP tests now force off the use of http_proxy for the duration.
480
Contributed by Gustavo Niemeyer.
482
* Fix problems in merging weave-based branches that have
483
different partial views of history.
485
* Symlink support: working with symlinks when not in the root of a
486
bzr tree was broken, patch from Scott James Remnant.
491
* 'branch' now accepts a --basis parameter which will take advantage
492
of local history when making a new branch. This allows faster
493
branching of remote branches. Contributed by Aaron Bentley.
495
* New tree format based on weave files, called version 5.
496
Existing branches can be upgraded to this format using
499
* Symlinks are now versionable. Initial patch by
500
Erik Toubro Nielsen, updated to head by Robert Collins.
502
* Executable bits are tracked on files. Patch from Gustavo
505
* 'bzr status' now shows unknown files inside a selected directory.
506
Patch from Heikki Paajanen.
508
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
509
and 'resolve' have needed added, which list and remove those
510
merge conflicts respectively. A conflicted tree cannot be committed
511
in. Contributed by Aaron Bentley.
513
* 'rm' is now an alias for 'remove'.
515
* Stores now split out their content in a single byte prefixed hash,
516
dropping the density of files per directory by 256. Contributed by
519
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
520
Contributed by Robert Collins.
522
* 'bzr log' with the default formatter will show merged revisions,
523
indented to the right. Initial implementation contributed by Gustavo
524
Niemeyer, made incremental by Robert Collins.
529
* Test case failures have the exception printed after the log
530
for your viewing pleasure.
532
* InventoryEntry is now an abstract base class, use one of the
533
concrete InventoryDirectory etc classes instead.
535
* Branch raises an UnsupportedFormatError when it detects a
536
bzr branch it cannot understand. This allows for precise
537
handling of such circumstances.
542
* Removed testsweet module so that tests can be run after
543
bzr installed by 'bzr selftest'.
545
* 'bzr selftest' command-line arguments can now be partial ids
546
of tests to run, e.g. 'bzr selftest test_weave'
553
* Fixed "branch -r" option.
555
* Fix remote access to branches containing non-compressed history.
558
* Better reliability of http server tests. (John Arbash-Meinel)
560
* Merge graph maximum distance calculation fix. (Aaron Bentley)
562
* Various minor bug in windows support have been fixed, largely in the
563
test suite. Contributed by Alexander Belchenko.
567
* Status now accepts a -r argument to give status between chosen
568
revisions. Contributed by Heikki Paajanen.
570
* Revision arguments no longer use +/-/= to control ranges, instead
571
there is a 'before' namespace, which limits the successive namespace.
572
For example '$ bzr log -r date:yesterday..before:date:today' will
573
select everything from yesterday and before today. Contributed by
576
* There is now a bzr.bat file created by distutils when building on
577
Windows. Contributed by Alexander Belchenko.
581
* Removed uuid() as it was unused.
583
* Improved 'fetch' code for pulling revisions from one branch into
584
another (used by pull, merged, etc.)
591
* Adding a file whose parent directory is not versioned will
592
implicitly add the parent, and so on up to the root. This means
593
you should never need to explictly add a directory, they'll just
594
get added when you add a file in the directory. Contributed by
597
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
600
* If you set BZR_EDITOR in the environment, it is checked in
601
preference to EDITOR and the config file for the interactive commit
602
editing program. Related to this is a bugfix where a missing program
603
set in EDITOR would cause editing to fail, now the fallback program
604
for the operating system is still tried.
606
* Files that are not directories/symlinks/regular files will no longer
607
cause bzr to fail, it will just ignore them by default. You cannot add
608
them to the tree though - they are not versionable.
613
* Refactor xml packing/unpacking.
617
* Fixed 'bzr mv' by Ollie Rutherfurd.
619
* Fixed strange error when trying to access a nonexistent http
622
* Make sure that the hashcache gets written out if it can't be
628
* Various Windows fixes from Ollie Rutherfurd.
630
* Quieten warnings about locking; patch from Matt Lavin.
637
* ``bzr shell-complete`` command contributed by Clint Adams to
638
help with intelligent shell completion.
640
* New expert command ``bzr find-merge-base`` for debugging merges.
645
* Much better merge support.
647
* merge3 conflicts are now reported with markers like '<<<<<<<'
648
(seven characters) which is the same as CVS and pleases things
654
* ``bzr upgrade`` no longer fails when trying to fix trees that
655
mention revisions that are not present.
657
* Fixed bugs in listing plugins from ``bzr plugins``.
659
* Fix case of $EDITOR containing options for the editor.
661
* Fix log -r refusing to show the last revision.
662
(Patch from Goffredo Baroncelli.)
667
* ``bzr log --show-ids`` shows the revision ids of all parents.
669
* Externally provided commands on your $BZRPATH no longer need
670
to recognize --bzr-usage to work properly, and can just handle
676
* Changed trace messages to go through the standard logging
677
framework, so that they can more easily be redirected by
added
removed
NEWS
