1
bzr development version
5
* The FTP transport now tries to reconnect after a temporary
6
failure. ftp put is made atomic. (Matthieu Moy)
8
* The FTP transport now maintains a pool of connections, and
9
reuses them to avoid multiple connections to the same host (like
10
sftp did). (Daniel Silverstone)
12
* The bzr_man.py file has been removed. To create the man page now,
13
use ./generate_docs.py man. The new program can also create other files.
14
Run "python generate_docs.py --help" for usage information. (Hans
15
Ulrich Niedermann & James Blackwell).
17
* Man Page now gives full help (James Blackwell). Help also updated to
18
reflect user config now being stored in .bazaar (Hans Ulrich
21
* Upgrade can now upgrade over the network. (Robert Collins)
23
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
24
behaviour. They use the existing serverless-mode and store no data
25
locally. As such they are not suitable for use except in high bandwidth
26
low latency environments like LAN's or local disk. (Robert Collins)
30
* The internal storage of history, and logical branch identity have now
31
been split into Branch, and Repository. The common locking and file
32
management routines are now in bzrlib.lockablefiles.
33
(Aaron Bentley, Robert Collins, Martin Pool)
37
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
38
for testing SFTP protocol support. (Robey Pointer)
42
* pull now accepts a --revision argument (Erik Bågfors)
49
* .bzrignore is excluded from exports, on the grounds that it's a bzr
50
internal-use file and may not be wanted. (Jamie Wilkinson)
52
* The "bzr directories" command were removed in favor of the new
53
--kind option to the "bzr inventory" command. To list all
54
versioned directories, now use "bzr inventory --kind directory".
57
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
58
by default. (John Arbash Meinel)
60
* The parent of Bzr configuration directory can be set by BZR_HOME
61
environment variable. Now the path for it is searched in BZR_HOME, then
62
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
63
points to C:\Documents and Settings\User Name\Application Data), HOME.
66
* Plugins with the same name in different directories in the bzr plugin
67
path are no longer loaded: only the first successfully loaded one is
68
used. (Robert Collins)
70
* Use systems' external ssh command to open connections if possible.
71
This gives better integration with user settings such as ProxyCommand.
74
* Sftp paths can now be relative, or local, according to the lftp
75
convention. Paths now take the form:
76
sftp://user:pass@host:port/~/relative/path
78
sftp://user:pass@host:port/absolute/path
80
* Permissions on files underneath .bzr/ are inherited from the .bzr
81
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
82
will mean that future file will be created with group write permissions.
84
* configure.in and config.guess are no longer in the builtin default
87
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
88
files. (John Arbash Meinel, Martin Pool)
92
* "bzr INIT dir" now initializes the specified directory, and creates
93
it if it does not exist. (John Arbash Meinel)
95
* New remerge command (Aaron Bentley)
97
* Better zsh completion script. (Steve Borho)
99
* 'bzr diff' now returns 1 when there are changes in the working
100
tree. (Robert Collins)
102
* 'bzr push' now exists and can push changes to a remote location.
103
This uses the transport infrastructure, and can store the remote
104
location in the ~/.bazaar/branches.conf configuration file.
107
* Test directories are only kept if the test fails and the user requests
110
* Tweaks to short log printing
112
* Added branch nicks, new nick command, printing them in log output.
115
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
116
occurs. (Martin Pool)
118
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
119
the same as Subversion. (Martin Pool)
121
* New ftp transport support (on ftplib), for ftp:// and aftp://
122
URLs. (Daniel Silverstone)
124
* Commit editor temporary files now start with 'bzr_log.', to allow
125
text editors to match the file name and set up appropriate modes or
126
settings. (Magnus Therning)
128
* Improved performance when integrating changes from a remote weave.
129
(Goffredo Baroncelli)
131
* Sftp will attempt to cache the connection, so it is more likely that
132
a connection will be reused, rather than requiring multiple password
135
* bzr revno now takes an optional argument indicating the branch whose
136
revno should be printed. (Michael Ellerman)
138
* bzr cat defaults to printing the last version of the file.
139
(#3632, Matthieu Moy)
141
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
142
profiler. (Denys Duchier)
144
* Faster commits by reading only the headers of affected weave files.
147
* 'bzr add' now takes a --dry-run parameter which shows you what would be
148
added, but doesn't actually add anything. (Michael Ellerman)
150
* 'bzr add' now lists how many files were ignored per glob. add --verbose
151
lists the specific files. (Aaron Bentley)
153
* 'bzr missing' now supports displaying changes in diverged trees and can
154
be limited to show what either end of the comparison is missing.
155
(Aaron Bently, with a little prompting from Daniel Silverstone)
159
* SFTP can walk up to the root path without index errors. (Robert Collins)
161
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
163
* Error when run with -OO
165
* Fix bug in reporting http errors that don't have an http error code.
168
* Handle more cases of pipe errors in display commands
170
* Change status to 3 for all errors
172
* Files that are added and unlinked before committing are completely
173
ignored by diff and status
175
* Stores with some compressed texts and some uncompressed texts are now
176
able to be used. (John A Meinel)
178
* Fix for bzr pull failing sometimes under windows
180
* Fix for sftp transport under windows when using interactive auth
182
* Show files which are both renamed and modified as such in 'bzr
183
status' output. (#4503, Daniel Silverstone)
185
* Make annotate cope better with revisions committed without a valid
186
email address. (Marien Zwart)
188
* Fix representation of tab characters in commit messages. (Harald
191
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
192
now parsed properly under Windows. (Alexander Belchenko)
194
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
196
* Keep a cached copy of the basis inventory to speed up operations
197
that need to refer to it. (Johan Rydberg, Martin Pool)
199
* Fix bugs in bzr status display of non-ascii characters. (Martin
202
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
205
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
209
* Fix selftest asking for passwords when there are no SFTP keys.
210
(Robey Pointer, Jelmer Vernooij)
212
* Fix selftest run with 'python -O'. (Martin Pool)
214
* Fix HTTP tests under Windows. (John Arbash Meinel)
216
* Make tests work even if HOME is not set (Aaron Bentley)
218
* Updated build_tree to use fixed line-endings for tests which read
219
the file cotents and compare. Make some tests use this to pass under
220
Windows. (John Arbash Meinel)
222
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
224
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
227
* Use terminal width to align verbose test output. (Martin Pool)
229
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
230
If adding a new test script please add that to
231
bzrlib.tests.blackbox.__init__. (Robert Collins)
233
* Much better error message if one of the test suites can't be
234
imported. (Martin Pool)
236
* Make check now runs the test suite twice - once with the default locale,
237
and once with all locales forced to C, to expose bugs. This is not
238
trivially done within python, so for now its only triggered by running
239
Make check. Integrators and packagers who wish to check for full
240
platform support should run 'make check' to test the source.
243
* Tests can now run TestSkipped if they can't execute for any reason.
244
(Martin Pool) (NB: TestSkipped should only be raised for correctable
245
reasons - see the wiki spec ImprovingBzrTestSuite).
247
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
248
paths for the transport tests. Introduce blackbox remote sftp tests that
249
test the same permutations. (Robert Collins, Robey Pointer)
251
* Transport implementation tests are now independent of the local file
252
system, which allows tests for esoteric transports, and for features
253
not available in the local file system. They also repeat for variations
254
on the URL scheme that can introduce issues in the transport code,
255
see bzrlib.transport.TransportTestProviderAdapter() for this.
258
* TestCase.build_tree uses the transport interface to build trees, pass
259
in a transport parameter to give it an existing connection.
264
* WorkingTree.pull has been split across Branch and WorkingTree,
265
to allow Branch only pulls. (Robert Collins)
267
* commands.display_command now returns the result of the decorated
268
function. (Robert Collins)
270
* LocationConfig now has a set_user_option(key, value) call to save
271
a setting in its matching location section (a new one is created
272
if needed). (Robert Collins)
274
* Branch has two new methods, get_push_location and set_push_location
275
to respectively, get and set the push location. (Robert Collins)
277
* commands.register_command now takes an optional flag to signal that
278
the registrant is planning to decorate an existing command. When
279
given multiple plugins registering a command is not an error, and
280
the original command class (whether built in or a plugin based one) is
281
returned to the caller. There is a new error 'MustUseDecorated' for
282
signalling when a wrapping command should switch to the original
283
version. (Robert Collins)
285
* Some option parsing errors will raise 'BzrOptionError', allowing
286
granular detection for decorating commands. (Robert Collins).
288
* Branch.read_working_inventory has moved to
289
WorkingTree.read_working_inventory. This necessitated changes to
290
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
291
as well. To make it clear that a WorkingTree cannot always be obtained
292
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
293
be obtained. (Robert Collins)
295
* All pending merges operations from Branch are now on WorkingTree.
298
* The follow operations from Branch have moved to WorkingTree:
306
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
308
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
310
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
313
* bzrlib.plugin.all_plugins has been changed from an attribute to a
314
query method. (Robert Collins)
316
* New options to read only the table-of-contents of a weave.
319
* Raise NoSuchFile when someone tries to add a non-existant file.
322
* Simplify handling of DivergedBranches in cmd_pull().
326
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
327
is exposed as Branch().control_files. Also this has been altered with the
328
controlfile pre/suffix replaced by simple method names like 'get' and
329
'put'. (Aaron Bentley, Robert Collins).
331
* Deprecated functions and methods can now be marked as such using the
332
bzrlib.symbol_versioning module. Marked method have their docstring
333
updated and will issue a DeprecationWarning using the warnings module
334
when they are used. (Robert Collins)
336
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
337
for functions that need unicode strings. (Robert Collins)
343
* pull now takes --verbose to show you what revisions are added or removed
346
* merge now takes a --show-base option to include the base text in
350
* The config files are now read using ConfigObj, so '=' should be used as
351
a separator, not ':'.
354
* New 'bzr commit --strict' option refuses to commit if there are
355
any unknown files in the tree. To commit, make sure all files are
356
either ignored, added, or deleted. (Michael Ellerman)
358
* The config directory is now ~/.bazaar, and there is a single file
359
~/.bazaar/bazaar.conf storing email, editor and other preferences.
362
* 'bzr add' no longer takes a --verbose option, and a --quiet option
363
has been added that suppresses all output.
365
* Improved zsh completion support in contrib/zsh, from Clint
368
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
371
* 'bzr check' now accepts -v for verbose reporting, and checks for
372
ghosts in the branch. (Robert Collins)
374
* New command 're-sign' which will regenerate the gpg signature for
375
a revision. (Robert Collins)
377
* If you set check_signatures=require for a path in
378
~/.bazaar/branches.conf then bzr will invoke your
379
gpg_signing_command (defaults to gpg) and record a digital signature
380
of your commit. (Robert Collins)
382
* New sftp transport, based on Paramiko. (Robey Pointer)
384
* 'bzr pull' now accepts '--clobber' which will discard local changes
385
and make this branch identical to the source branch. (Robert Collins)
387
* Just give a quieter warning if a plugin can't be loaded, and
388
put the details in .bzr.log. (Martin Pool)
390
* 'bzr branch' will now set the branch-name to the last component of the
391
output directory, if one was supplied.
393
* If the option 'post_commit' is set to one (or more) python function
394
names (must be in the bzrlib namespace), then they will be invoked
395
after the commit has completed, with the branch and revision_id as
396
parameters. (Robert Collins)
398
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
400
* --merge-type weave is now supported for file contents. Tree-shape
401
changes are still three-way based. (Martin Pool, Aaron Bentley)
403
* 'bzr check' allows the first revision on revision-history to have
404
parents - something that is expected for cheap checkouts, and occurs
405
when conversions from baz do not have all history. (Robert Collins).
407
* 'bzr merge' can now graft unrelated trees together, if your specify
408
0 as a base. (Aaron Bentley)
410
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
413
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
415
* 'bzr merge --reprocess' minimizes conflicts
419
* The 'bzr selftest --pattern' option for has been removed, now
420
test specifiers on the command line can be simple strings, or
421
regexps, or both. (Robert Collins)
423
* Passing -v to selftest will now show the time each test took to
424
complete, which will aid in analysing performance regressions and
425
related questions. (Robert Collins)
427
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
428
is given. (Martin Pool)
430
* There is a new method for TestCaseInTempDir, assertFileEqual, which
431
will check that a given content is equal to the content of the named
432
file. (Robert Collins)
434
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
439
* New 'testament' command and concept for making gpg-signatures
440
of revisions that are not tied to a particular internal
441
representation. (Martin Pool).
443
* Per-revision properties ('revprops') as key-value associated
444
strings on each revision created when the revision is committed.
445
Intended mainly for the use of external tools. (Martin Pool).
447
* Config options have moved from bzrlib.osutils to bzrlib.config.
450
* Improved command line option definitions allowing explanations
451
for individual options, among other things. Contributed by
454
* Config options have moved from bzrlib.osutils to bzrlib.config.
455
Configuration is now done via the config.Config interface:
456
Depending on whether you have a Branch, a Location or no information
457
available, construct a *Config, and use its signature_checking,
458
username and user_email methods. (Robert Collins)
460
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
461
they are made available for other plugins to use. You should not
462
import other plugins during the __init__ of your plugin though, as
463
no ordering is guaranteed, and the plugins directory is not on the
464
python path. (Robert Collins)
466
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
467
no longer takes an inventory, rather it takes an option branch
468
parameter, and if None is given will open the branch at basedir
469
implicitly. (Robert Collins)
471
* Cleaner exception structure and error reporting. Suggested by
472
Scott James Remnant. (Martin Pool)
474
* Branch.remove has been moved to WorkingTree, which has also gained
475
lock_read, lock_write and unlock methods for convenience. (Robert
478
* Two decorators, needs_read_lock and needs_write_lock have been added
479
to the branch module. Use these to cause a function to run in a
480
read or write lock respectively. (Robert Collins)
482
* Branch.open_containing now returns a tuple (Branch, relative-path),
483
which allows direct access to the common case of 'get me this file
484
from its branch'. (Robert Collins)
486
* Transports can register using register_lazy_transport, and they
487
will be loaded when first used. (Martin Pool)
489
* 'pull' has been factored out of the command as WorkingTree.pull().
490
A new option to WorkingTree.pull has been added, clobber, which will
491
ignore diverged history and pull anyway.
494
* config.Config has a 'get_user_option' call that accepts an option name.
495
This will be looked up in branches.conf and bazaar.conf as normal.
496
It is intended that this be used by plugins to support options -
497
options of built in programs should have specific methods on the config.
500
* merge.merge_inner now has tempdir as an optional parameter. (Robert
503
* Tree.kind is not recorded at the top level of the hierarchy, as it was
504
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
507
* WorkingTree.__del__ has been removed, it was non deterministic and not
508
doing what it was intended to. See WorkingTree.__init__ for a comment
509
about future directions. (Robert Collins/Martin Pool)
511
* bzrlib.transport.http has been modified so that only 404 urllib errors
512
are returned as NoSuchFile. Other exceptions will propogate as normal.
513
This allows debuging of actual errors. (Robert Collins)
515
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
516
to apis like 'put', 'get' and 'has'. This is to provide consistent
517
behaviour - it operates on url's only. (Robert Collins)
519
* Transports can register using register_lazy_transport, and they
520
will be loaded when first used. (Martin Pool)
522
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
523
is called by merge_inner. This is so that the conflict count can be
524
retrieved (and potentially manipulated) before returning to the caller
525
of merge_inner. Likewise 'merge' now returns the conflict count to the
526
caller. (Robert Collins)
528
* 'revision.revision_graph can handle having only partial history for
529
a revision - that is no revisions in the graph with no parents.
532
* New builtins.branch_files uses the standard file_list rules to produce
533
a branch and a list of paths, relative to that branch (Aaron Bentley)
535
* New TestCase.addCleanup facility.
537
* New bzrlib.version_info tuple (similar to sys.version_info), which can
538
be used by programs importing bzrlib.
542
* Better handling of branches in directories with non-ascii names.
543
(Joel Rosdahl, Panagiotis Papadakos)
545
* Upgrades of trees with no commits will not fail due to accessing
546
[-1] in the revision-history. (Andres Salomon)
553
* Fix problem in pulling over http from machines that do not
554
allow directories to be listed.
556
* Avoid harmless warning about invalid hash cache after
557
upgrading branch format.
561
* Avoid some unnecessary http operations in branch and pull.
568
* 'bzr branch' over http initially gives a very high estimate
569
of completion time but it should fall as the first few
570
revisions are pulled in. branch is still slow on
571
high-latency connections.
575
* bzr-man.py has been updated to work again. Contributed by
578
* Locking is now done with fcntl.lockf which works with NFS
579
file systems. Contributed by Harald Meland.
581
* When a merge encounters a file that has been deleted on
582
one side and modified on the other, the old contents are
583
written out to foo.BASE and foo.SIDE, where SIDE is this
584
or OTHER. Contributed by Aaron Bentley.
586
* Export was choosing incorrect file paths for the content of
587
the tarball, this has been fixed by Aaron Bentley.
589
* Commit will no longer commit without a log message, an
590
error is returned instead. Contributed by Jelmer Vernooij.
592
* If you commit a specific file in a sub directory, any of its
593
parent directories that are added but not listed will be
594
automatically included. Suggested by Michael Ellerman.
596
* bzr commit and upgrade did not correctly record new revisions
597
for files with only a change to their executable status.
598
bzr will correct this when it encounters it. Fixed by
601
* HTTP tests now force off the use of http_proxy for the duration.
602
Contributed by Gustavo Niemeyer.
604
* Fix problems in merging weave-based branches that have
605
different partial views of history.
607
* Symlink support: working with symlinks when not in the root of a
608
bzr tree was broken, patch from Scott James Remnant.
613
* 'branch' now accepts a --basis parameter which will take advantage
614
of local history when making a new branch. This allows faster
615
branching of remote branches. Contributed by Aaron Bentley.
617
* New tree format based on weave files, called version 5.
618
Existing branches can be upgraded to this format using
621
* Symlinks are now versionable. Initial patch by
622
Erik Toubro Nielsen, updated to head by Robert Collins.
624
* Executable bits are tracked on files. Patch from Gustavo
627
* 'bzr status' now shows unknown files inside a selected directory.
628
Patch from Heikki Paajanen.
630
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
631
and 'resolve' have needed added, which list and remove those
632
merge conflicts respectively. A conflicted tree cannot be committed
633
in. Contributed by Aaron Bentley.
635
* 'rm' is now an alias for 'remove'.
637
* Stores now split out their content in a single byte prefixed hash,
638
dropping the density of files per directory by 256. Contributed by
641
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
642
Contributed by Robert Collins.
644
* 'bzr log' with the default formatter will show merged revisions,
645
indented to the right. Initial implementation contributed by Gustavo
646
Niemeyer, made incremental by Robert Collins.
651
* Test case failures have the exception printed after the log
652
for your viewing pleasure.
654
* InventoryEntry is now an abstract base class, use one of the
655
concrete InventoryDirectory etc classes instead.
657
* Branch raises an UnsupportedFormatError when it detects a
658
bzr branch it cannot understand. This allows for precise
659
handling of such circumstances.
664
* Removed testsweet module so that tests can be run after
665
bzr installed by 'bzr selftest'.
667
* 'bzr selftest' command-line arguments can now be partial ids
668
of tests to run, e.g. 'bzr selftest test_weave'
675
* Fixed "branch -r" option.
677
* Fix remote access to branches containing non-compressed history.
680
* Better reliability of http server tests. (John Arbash-Meinel)
682
* Merge graph maximum distance calculation fix. (Aaron Bentley)
684
* Various minor bug in windows support have been fixed, largely in the
685
test suite. Contributed by Alexander Belchenko.
689
* Status now accepts a -r argument to give status between chosen
690
revisions. Contributed by Heikki Paajanen.
692
* Revision arguments no longer use +/-/= to control ranges, instead
693
there is a 'before' namespace, which limits the successive namespace.
694
For example '$ bzr log -r date:yesterday..before:date:today' will
695
select everything from yesterday and before today. Contributed by
698
* There is now a bzr.bat file created by distutils when building on
699
Windows. Contributed by Alexander Belchenko.
703
* Removed uuid() as it was unused.
705
* Improved 'fetch' code for pulling revisions from one branch into
706
another (used by pull, merged, etc.)
713
* Adding a file whose parent directory is not versioned will
714
implicitly add the parent, and so on up to the root. This means
715
you should never need to explictly add a directory, they'll just
716
get added when you add a file in the directory. Contributed by
719
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
722
* If you set BZR_EDITOR in the environment, it is checked in
723
preference to EDITOR and the config file for the interactive commit
724
editing program. Related to this is a bugfix where a missing program
725
set in EDITOR would cause editing to fail, now the fallback program
726
for the operating system is still tried.
728
* Files that are not directories/symlinks/regular files will no longer
729
cause bzr to fail, it will just ignore them by default. You cannot add
730
them to the tree though - they are not versionable.
735
* Refactor xml packing/unpacking.
739
* Fixed 'bzr mv' by Ollie Rutherfurd.
741
* Fixed strange error when trying to access a nonexistent http
744
* Make sure that the hashcache gets written out if it can't be
750
* Various Windows fixes from Ollie Rutherfurd.
752
* Quieten warnings about locking; patch from Matt Lavin.
5
759
* ``bzr shell-complete`` command contributed by Clint Adams to
6
760
help with intelligent shell completion.
762
* New expert command ``bzr find-merge-base`` for debugging merges.
767
* Much better merge support.
769
* merge3 conflicts are now reported with markers like '<<<<<<<'
770
(seven characters) which is the same as CVS and pleases things
11
776
* ``bzr upgrade`` no longer fails when trying to fix trees that
12
777
mention revisions that are not present.
779
* Fixed bugs in listing plugins from ``bzr plugins``.
781
* Fix case of $EDITOR containing options for the editor.
783
* Fix log -r refusing to show the last revision.
784
(Patch from Goffredo Baroncelli.)
789
* ``bzr log --show-ids`` shows the revision ids of all parents.
791
* Externally provided commands on your $BZRPATH no longer need
792
to recognize --bzr-usage to work properly, and can just handle
added
removed
NEWS
