5
* Tests updates to ensure proper URL handling, UNICODE support, and
6
proper printing when the user's terminal encoding cannot display
7
the path of a file that has been versioned.
8
``bzr branch`` can take a target URL rather than only a local directory.
9
Branch.get_parent()/set_parent() now save a relative path if possible,
10
and normalize the parent based on root, allowing access across
11
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
12
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
15
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
16
Use terminal width for single-line logs from ``bzr log --line`` and
17
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
20
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
23
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
25
* Show the correct number of revisions pushed when pushing a new branch.
28
* 'bzr selftest' now shows a progress bar with the number of tests, and
29
progress made. 'make check' shows tests in -v mode, to be more useful
30
for the PQM status window. (Robert Collins).
32
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
33
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
34
profile data for the individual profiled calls, allowing for fine
35
grained analysis of performance.
36
(Robert Collins, Martin Pool).
38
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
39
where commit can take an appreciable time. (Robert Collins)
41
* 'bzr add' is now less verbose in telling you what ignore globs were
42
matched by files being ignored. Instead it just tells you how many
43
were ignored (because you might reasonably be expecting none to be
44
ignored). 'bzr add -v' is unchanged and will report every ignored
45
file. (Robert Collins).
47
* ftp now has a test server if medusa is installed. As part of testing,
48
ftp support has been improved, including support for supplying a
49
non-standard port. (John Arbash Meinel).
51
* 'bzr log --line' shows the revision number, and uses only the
52
first line of the log message (#5162, Alexander Belchenko;
58
* Fix shadowed definition of TestLocationConfig that caused some
59
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
64
* Combine the ignore rules into a single regex rather than looping over
65
them to reduce the threshold where N^2 behaviour occurs in operations
66
like status. (Jan Hudec, Robert Collins).
68
* 'bzr push' should only push the ancestry of the current revision, not
69
all of the history in the repository. This is especially important for
70
shared repositories. (John Arbash Meinel)
72
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
73
rather than randomly walking the inventories. (John Arbash Meinel)
79
* setup.py failed to install launchpad plugin. (Martin Pool)
85
* Fix failure to commit a merge in a checkout. (Martin Pool,
86
Robert Collins, Erik Bågfors, #43959)
88
* Nicer messages from 'commit' in the case of renames, and correct
89
messages when a merge has occured. (Robert Collins, Martin Pool)
91
* Separate functionality from assert statements as they are skipped in
92
optimized mode of python. Add the same check to pending merges.
93
(#44443, Olaf Conradi)
97
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
99
* Add info on standalone branches without a working tree.
100
(#44155, Olaf Conradi)
102
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
106
* Make editor invocation comply with Debian Policy. First check
107
environment variables VISUAL and EDITOR, then try editor from
108
alternatives system. If that all fails, fall back to the pre-defined
109
list of editors. (#42904, Olaf Conradi)
113
* New 'register-branch' command registers a public branch into
114
Launchpad.net, where it can be associated with bugs, etc.
115
(Martin Pool, Bjorn Tillenius, Robert Collins)
119
* New public api in InventoryEntry - 'describe_change(old, new)' which
120
provides a human description of the changes between two old and
121
new. (Robert Collins, Martin Pool)
125
* Fix test case for bzr info in upgrading a standalone branch to metadir,
126
uses bzrlib api now. (Olaf Conradi)
130
NOTES WHEN UPGRADING:
132
Release 0.8 of bzr introduces a new format for history storage, called
133
'knit', as an evolution of to the 'weave' format used in 0.7. Local
134
and remote operations are faster using knits than weaves. Several
135
operations including 'init', 'init-repo', and 'upgrade' take a
136
--format option that controls this. Branching from an existing branch
137
will keep the same format.
139
It is possible to merge, pull and push between branches of different
140
formats but this is slower than moving data between homogenous
141
branches. It is therefore recommended (but not required) that you
142
upgrade all branches for a project at the same time. Information on
143
formats is shown by 'bzr info'.
145
bzr 0.8 now allows creation of 'repositories', which hold the history
146
of files and revisions for several branches. Previously bzr kept all
147
the history for a branch within the .bzr directory at the root of the
148
branch, and this is still the default. To create a repository, use
149
the new 'bzr init-repo' command. Branches exist as directories under
150
the repository and contain just a small amount of information
151
indicating the current revision of the branch.
153
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
154
subversion. Checkouts are associated with a branch (optionally in a
155
repository), which contains all the historical information. The
156
result is that a checkout can be deleted without losing any
157
already-committed revisions. A new 'update' command is also available.
159
Repositories and checkouts are not supported with the 0.7 storage
160
format. To use them you must upgrad to either knits, or to the
161
'metaweave' format, which uses weaves but changes the .bzr directory
167
* Sftp paths can now be relative, or local, according to the lftp
168
convention. Paths now take the form:
169
sftp://user:pass@host:port/~/relative/path
171
sftp://user:pass@host:port/absolute/path
173
* The FTP transport now tries to reconnect after a temporary
174
failure. ftp put is made atomic. (Matthieu Moy)
176
* The FTP transport now maintains a pool of connections, and
177
reuses them to avoid multiple connections to the same host (like
178
sftp did). (Daniel Silverstone)
180
* The bzr_man.py file has been removed. To create the man page now,
181
use ./generate_docs.py man. The new program can also create other files.
182
Run "python generate_docs.py --help" for usage information. (Hans
183
Ulrich Niedermann & James Blackwell).
185
* Man Page now gives full help (James Blackwell). Help also updated to
186
reflect user config now being stored in .bazaar (Hans Ulrich
189
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
191
* Pull now accepts a --revision argument (Erik Bågfors)
193
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
194
line. You can now use the following command to sign all of your old commits.
195
find .bzr/revision-store// -name my@email-* \
196
| sed 's/.*\/\/..\///' \
199
* Upgrade can now upgrade over the network. (Robert Collins)
201
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
202
behaviour. By default they will cache history in the checkout, but
203
with --lightweight almost all data is kept in the master branch.
206
* 'revert' unversions newly-versioned files, instead of deleting them.
208
* 'merge' is more robust. Conflict messages have changed.
210
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
213
* Default log format can be set in configuration and plugins can register
214
their own formatters. (Erik Bågfors)
216
* New 'reconcile' command will check branch consistency and repair indexes
217
that can become out of sync in pre 0.8 formats. (Robert Collins,
220
* New 'bzr init --format' and 'bzr upgrade --format' option to control
221
what storage format is created or produced. (Robert Collins,
224
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
226
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
228
* New 'init-repository' command, plus support for repositories in 'init'
229
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
231
* Improve output of 'info' command. Show all relevant locations related to
232
working tree, branch and repository. Use kibibytes for binary quantities.
233
Fix off-by-one error in missing revisions of working tree. Make 'info'
234
work on branches, repositories and remote locations. Show locations
235
relative to the shared repository, if applicable. Show locking status
236
of locations. (Olaf Conradi)
238
* Diff and merge now safely handle binary files. (Aaron Bentley)
240
* 'pull' and 'push' now normalise the revision history, so that any two
241
branches with the same tip revision will have the same output from 'log'.
244
* 'merge' accepts --remember option to store parent location, like 'push'
245
and 'pull'. (Olaf Conradi)
247
* bzr status and diff when files given as arguments do not exist
248
in the relevant trees. (Martin Pool, #3619)
250
* Add '.hg' to the default ignore list. (Martin Pool)
252
* 'knit' is now the default disk format. This improves disk performance and
253
utilization, increases incremental pull performance, robustness with SFTP
254
and allows checkouts over SFTP to perform acceptably.
255
The initial Knit code was contributed by Johan Rydberg based on a
256
specification by Martin Pool.
257
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
259
* New tool to generate all-in-one html version of the manual. (Alexander
262
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
263
to be left in the SFTP repository. (Robert Collins, Martin Pool).
265
* New option 'diff --prefix' to control how files are named in diff
266
output, with shortcuts '-p0' and '-p1' corresponding to the options for
267
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
269
* Add --revision option to 'annotate' command. (Olaf Conradi)
271
* Add --revision option to 'annotate' command. (Olaf Conradi)
273
* If bzr shows an unexpected revision-history after pulling (perhaps due
274
to a reweave) it can now be corrected by 'bzr reconcile'.
279
* Commit is now verbose by default, and shows changed filenames and the
280
new revision number. (Robert Collins, Martin Pool)
282
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
284
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
286
* Make 'pull' and 'push' remember location on failure using --remember.
289
* For compatibility, make old format for using weaves inside metadir
290
available as 'metaweave' format. Rename format 'metadir' to 'default'.
291
Clean up help for option --format in commands 'init', 'init-repo' and
292
'upgrade'. (Olaf Conradi)
296
* The internal storage of history, and logical branch identity have now
297
been split into Branch, and Repository. The common locking and file
298
management routines are now in bzrlib.lockablefiles.
299
(Aaron Bentley, Robert Collins, Martin Pool)
301
* Transports can now raise DependencyNotPresent if they need a library
302
which is not installed, and then another implementation will be
305
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
308
* Using Tree Transform for merge, revert, tree-building
310
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
311
Branch.initialize are now deprecated. Please see BzrDir.create_* for
312
replacement API's. (Robert Collins)
314
* New BzrDir class represents the .bzr control directory and manages
315
formatting issues. (Robert Collins)
317
* New repository.InterRepository class encapsulates Repository to
318
Repository actions and allows for clean selection of optimised code
319
paths. (Robert Collins)
321
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
322
please use 'branch.fetch' or 'repository.fetch' depending on your
323
needs. (Robert Collins)
325
* deprecated methods now have a 'is_deprecated' flag on them that can
326
be checked, if you need to determine whether a given callable is
327
deprecated at runtime. (Robert Collins)
329
* Progress bars are now nested - see
330
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
332
* New API call get_format_description() for each type of format.
335
* Changed branch.set_parent() to accept None to remove parent.
338
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
340
* WorkingTree.branch is now a read only property. (Robert Collins)
342
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
343
can be None or a factory that will create a progress bar. This is
344
useful for testing or for overriding the bzrlib.progress heuristic.
347
* New API method get_physical_lock_status() to query locks present on a
348
transport. (Olaf Conradi)
350
* Repository.reconcile now takes a thorough keyword parameter to allow
351
requesting an indepth reconciliation, rather than just a data-loss
352
check. (Robert Collins)
354
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
355
the user for yes/no style input. (Robert Collins)
359
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
360
for testing SFTP protocol support. (Robey Pointer)
362
* Branch formats are now tested once per implementation (see bzrlib.
363
tests.branch_implementations. This is analagous to the transport
364
interface tests, and has been followed up with working tree,
365
repository and BzrDir tests. (Robert Collins)
367
* New test base class TestCaseWithTransport provides a transport aware
368
test environment, useful for testing any transport-interface using
369
code. The test suite option --transport controls the transport used
370
by this class (when its not being used as part of implementation
371
contract testing). (Robert Collins)
373
* Close logging handler on disabling the test log. This will remove the
374
handler from the internal list inside python's logging module,
375
preventing shutdown from closing it twice. (Olaf Conradi)
377
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
379
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
380
will provide String("foo") to the command as its stdin.
386
* .bzrignore is excluded from exports, on the grounds that it's a bzr
387
internal-use file and may not be wanted. (Jamie Wilkinson)
389
* The "bzr directories" command were removed in favor of the new
390
--kind option to the "bzr inventory" command. To list all
391
versioned directories, now use "bzr inventory --kind directory".
394
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
395
by default. (John Arbash Meinel)
397
* The parent of Bzr configuration directory can be set by BZR_HOME
398
environment variable. Now the path for it is searched in BZR_HOME, then
399
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
400
points to C:\Documents and Settings\User Name\Application Data), HOME.
403
* Plugins with the same name in different directories in the bzr plugin
404
path are no longer loaded: only the first successfully loaded one is
405
used. (Robert Collins)
407
* Use systems' external ssh command to open connections if possible.
408
This gives better integration with user settings such as ProxyCommand.
411
* Permissions on files underneath .bzr/ are inherited from the .bzr
412
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
413
will mean that future file will be created with group write permissions.
415
* configure.in and config.guess are no longer in the builtin default
418
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
419
files. (John Arbash Meinel, Martin Pool)
423
* "bzr INIT dir" now initializes the specified directory, and creates
424
it if it does not exist. (John Arbash Meinel)
426
* New remerge command (Aaron Bentley)
428
* Better zsh completion script. (Steve Borho)
430
* 'bzr diff' now returns 1 when there are changes in the working
431
tree. (Robert Collins)
433
* 'bzr push' now exists and can push changes to a remote location.
434
This uses the transport infrastructure, and can store the remote
435
location in the ~/.bazaar/branches.conf configuration file.
438
* Test directories are only kept if the test fails and the user requests
441
* Tweaks to short log printing
443
* Added branch nicks, new nick command, printing them in log output.
446
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
447
occurs. (Martin Pool)
449
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
450
the same as Subversion. (Martin Pool)
452
* New ftp transport support (on ftplib), for ftp:// and aftp://
453
URLs. (Daniel Silverstone)
455
* Commit editor temporary files now start with 'bzr_log.', to allow
456
text editors to match the file name and set up appropriate modes or
457
settings. (Magnus Therning)
459
* Improved performance when integrating changes from a remote weave.
460
(Goffredo Baroncelli)
462
* Sftp will attempt to cache the connection, so it is more likely that
463
a connection will be reused, rather than requiring multiple password
466
* bzr revno now takes an optional argument indicating the branch whose
467
revno should be printed. (Michael Ellerman)
469
* bzr cat defaults to printing the last version of the file.
470
(#3632, Matthieu Moy)
472
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
473
profiler. (Denys Duchier)
475
* Faster commits by reading only the headers of affected weave files.
478
* 'bzr add' now takes a --dry-run parameter which shows you what would be
479
added, but doesn't actually add anything. (Michael Ellerman)
481
* 'bzr add' now lists how many files were ignored per glob. add --verbose
482
lists the specific files. (Aaron Bentley)
484
* 'bzr missing' now supports displaying changes in diverged trees and can
485
be limited to show what either end of the comparison is missing.
486
(Aaron Bently, with a little prompting from Daniel Silverstone)
490
* SFTP can walk up to the root path without index errors. (Robert Collins)
492
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
494
* Error when run with -OO
496
* Fix bug in reporting http errors that don't have an http error code.
499
* Handle more cases of pipe errors in display commands
501
* Change status to 3 for all errors
503
* Files that are added and unlinked before committing are completely
504
ignored by diff and status
506
* Stores with some compressed texts and some uncompressed texts are now
507
able to be used. (John A Meinel)
509
* Fix for bzr pull failing sometimes under windows
511
* Fix for sftp transport under windows when using interactive auth
513
* Show files which are both renamed and modified as such in 'bzr
514
status' output. (#4503, Daniel Silverstone)
516
* Make annotate cope better with revisions committed without a valid
517
email address. (Marien Zwart)
519
* Fix representation of tab characters in commit messages. (Harald
522
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
523
now parsed properly under Windows. (Alexander Belchenko)
525
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
527
* Keep a cached copy of the basis inventory to speed up operations
528
that need to refer to it. (Johan Rydberg, Martin Pool)
530
* Fix bugs in bzr status display of non-ascii characters. (Martin
533
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
536
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
540
* Fix selftest asking for passwords when there are no SFTP keys.
541
(Robey Pointer, Jelmer Vernooij)
543
* Fix selftest run with 'python -O'. (Martin Pool)
545
* Fix HTTP tests under Windows. (John Arbash Meinel)
547
* Make tests work even if HOME is not set (Aaron Bentley)
549
* Updated build_tree to use fixed line-endings for tests which read
550
the file cotents and compare. Make some tests use this to pass under
551
Windows. (John Arbash Meinel)
553
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
555
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
558
* Use terminal width to align verbose test output. (Martin Pool)
560
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
561
If adding a new test script please add that to
562
bzrlib.tests.blackbox.__init__. (Robert Collins)
564
* Much better error message if one of the test suites can't be
565
imported. (Martin Pool)
567
* Make check now runs the test suite twice - once with the default locale,
568
and once with all locales forced to C, to expose bugs. This is not
569
trivially done within python, so for now its only triggered by running
570
Make check. Integrators and packagers who wish to check for full
571
platform support should run 'make check' to test the source.
574
* Tests can now run TestSkipped if they can't execute for any reason.
575
(Martin Pool) (NB: TestSkipped should only be raised for correctable
576
reasons - see the wiki spec ImprovingBzrTestSuite).
578
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
579
paths for the transport tests. Introduce blackbox remote sftp tests that
580
test the same permutations. (Robert Collins, Robey Pointer)
582
* Transport implementation tests are now independent of the local file
583
system, which allows tests for esoteric transports, and for features
584
not available in the local file system. They also repeat for variations
585
on the URL scheme that can introduce issues in the transport code,
586
see bzrlib.transport.TransportTestProviderAdapter() for this.
589
* TestCase.build_tree uses the transport interface to build trees, pass
590
in a transport parameter to give it an existing connection.
595
* WorkingTree.pull has been split across Branch and WorkingTree,
596
to allow Branch only pulls. (Robert Collins)
598
* commands.display_command now returns the result of the decorated
599
function. (Robert Collins)
601
* LocationConfig now has a set_user_option(key, value) call to save
602
a setting in its matching location section (a new one is created
603
if needed). (Robert Collins)
605
* Branch has two new methods, get_push_location and set_push_location
606
to respectively, get and set the push location. (Robert Collins)
608
* commands.register_command now takes an optional flag to signal that
609
the registrant is planning to decorate an existing command. When
610
given multiple plugins registering a command is not an error, and
611
the original command class (whether built in or a plugin based one) is
612
returned to the caller. There is a new error 'MustUseDecorated' for
613
signalling when a wrapping command should switch to the original
614
version. (Robert Collins)
616
* Some option parsing errors will raise 'BzrOptionError', allowing
617
granular detection for decorating commands. (Robert Collins).
619
* Branch.read_working_inventory has moved to
620
WorkingTree.read_working_inventory. This necessitated changes to
621
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
622
as well. To make it clear that a WorkingTree cannot always be obtained
623
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
624
be obtained. (Robert Collins)
626
* All pending merges operations from Branch are now on WorkingTree.
629
* The follow operations from Branch have moved to WorkingTree:
637
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
639
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
641
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
644
* bzrlib.plugin.all_plugins has been changed from an attribute to a
645
query method. (Robert Collins)
647
* New options to read only the table-of-contents of a weave.
650
* Raise NoSuchFile when someone tries to add a non-existant file.
653
* Simplify handling of DivergedBranches in cmd_pull().
657
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
658
is exposed as Branch().control_files. Also this has been altered with the
659
controlfile pre/suffix replaced by simple method names like 'get' and
660
'put'. (Aaron Bentley, Robert Collins).
662
* Deprecated functions and methods can now be marked as such using the
663
bzrlib.symbol_versioning module. Marked method have their docstring
664
updated and will issue a DeprecationWarning using the warnings module
665
when they are used. (Robert Collins)
667
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
668
for functions that need unicode strings. (Robert Collins)
674
* pull now takes --verbose to show you what revisions are added or removed
677
* merge now takes a --show-base option to include the base text in
681
* The config files are now read using ConfigObj, so '=' should be used as
682
a separator, not ':'.
685
* New 'bzr commit --strict' option refuses to commit if there are
686
any unknown files in the tree. To commit, make sure all files are
687
either ignored, added, or deleted. (Michael Ellerman)
689
* The config directory is now ~/.bazaar, and there is a single file
690
~/.bazaar/bazaar.conf storing email, editor and other preferences.
693
* 'bzr add' no longer takes a --verbose option, and a --quiet option
694
has been added that suppresses all output.
696
* Improved zsh completion support in contrib/zsh, from Clint
699
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
702
* 'bzr check' now accepts -v for verbose reporting, and checks for
703
ghosts in the branch. (Robert Collins)
705
* New command 're-sign' which will regenerate the gpg signature for
706
a revision. (Robert Collins)
708
* If you set check_signatures=require for a path in
709
~/.bazaar/branches.conf then bzr will invoke your
710
gpg_signing_command (defaults to gpg) and record a digital signature
711
of your commit. (Robert Collins)
713
* New sftp transport, based on Paramiko. (Robey Pointer)
715
* 'bzr pull' now accepts '--clobber' which will discard local changes
716
and make this branch identical to the source branch. (Robert Collins)
718
* Just give a quieter warning if a plugin can't be loaded, and
719
put the details in .bzr.log. (Martin Pool)
721
* 'bzr branch' will now set the branch-name to the last component of the
722
output directory, if one was supplied.
724
* If the option 'post_commit' is set to one (or more) python function
725
names (must be in the bzrlib namespace), then they will be invoked
726
after the commit has completed, with the branch and revision_id as
727
parameters. (Robert Collins)
729
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
731
* --merge-type weave is now supported for file contents. Tree-shape
732
changes are still three-way based. (Martin Pool, Aaron Bentley)
734
* 'bzr check' allows the first revision on revision-history to have
735
parents - something that is expected for cheap checkouts, and occurs
736
when conversions from baz do not have all history. (Robert Collins).
738
* 'bzr merge' can now graft unrelated trees together, if your specify
739
0 as a base. (Aaron Bentley)
741
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
744
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
746
* 'bzr merge --reprocess' minimizes conflicts
750
* The 'bzr selftest --pattern' option for has been removed, now
751
test specifiers on the command line can be simple strings, or
752
regexps, or both. (Robert Collins)
754
* Passing -v to selftest will now show the time each test took to
755
complete, which will aid in analysing performance regressions and
756
related questions. (Robert Collins)
758
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
759
is given. (Martin Pool)
761
* There is a new method for TestCaseInTempDir, assertFileEqual, which
762
will check that a given content is equal to the content of the named
763
file. (Robert Collins)
765
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
770
* New 'testament' command and concept for making gpg-signatures
771
of revisions that are not tied to a particular internal
772
representation. (Martin Pool).
774
* Per-revision properties ('revprops') as key-value associated
775
strings on each revision created when the revision is committed.
776
Intended mainly for the use of external tools. (Martin Pool).
778
* Config options have moved from bzrlib.osutils to bzrlib.config.
781
* Improved command line option definitions allowing explanations
782
for individual options, among other things. Contributed by
785
* Config options have moved from bzrlib.osutils to bzrlib.config.
786
Configuration is now done via the config.Config interface:
787
Depending on whether you have a Branch, a Location or no information
788
available, construct a *Config, and use its signature_checking,
789
username and user_email methods. (Robert Collins)
791
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
792
they are made available for other plugins to use. You should not
793
import other plugins during the __init__ of your plugin though, as
794
no ordering is guaranteed, and the plugins directory is not on the
795
python path. (Robert Collins)
797
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
798
no longer takes an inventory, rather it takes an option branch
799
parameter, and if None is given will open the branch at basedir
800
implicitly. (Robert Collins)
802
* Cleaner exception structure and error reporting. Suggested by
803
Scott James Remnant. (Martin Pool)
805
* Branch.remove has been moved to WorkingTree, which has also gained
806
lock_read, lock_write and unlock methods for convenience. (Robert
809
* Two decorators, needs_read_lock and needs_write_lock have been added
810
to the branch module. Use these to cause a function to run in a
811
read or write lock respectively. (Robert Collins)
813
* Branch.open_containing now returns a tuple (Branch, relative-path),
814
which allows direct access to the common case of 'get me this file
815
from its branch'. (Robert Collins)
817
* Transports can register using register_lazy_transport, and they
818
will be loaded when first used. (Martin Pool)
820
* 'pull' has been factored out of the command as WorkingTree.pull().
821
A new option to WorkingTree.pull has been added, clobber, which will
822
ignore diverged history and pull anyway.
825
* config.Config has a 'get_user_option' call that accepts an option name.
826
This will be looked up in branches.conf and bazaar.conf as normal.
827
It is intended that this be used by plugins to support options -
828
options of built in programs should have specific methods on the config.
831
* merge.merge_inner now has tempdir as an optional parameter. (Robert
834
* Tree.kind is not recorded at the top level of the hierarchy, as it was
835
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
838
* WorkingTree.__del__ has been removed, it was non deterministic and not
839
doing what it was intended to. See WorkingTree.__init__ for a comment
840
about future directions. (Robert Collins/Martin Pool)
842
* bzrlib.transport.http has been modified so that only 404 urllib errors
843
are returned as NoSuchFile. Other exceptions will propogate as normal.
844
This allows debuging of actual errors. (Robert Collins)
846
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
847
to apis like 'put', 'get' and 'has'. This is to provide consistent
848
behaviour - it operates on url's only. (Robert Collins)
850
* Transports can register using register_lazy_transport, and they
851
will be loaded when first used. (Martin Pool)
853
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
854
is called by merge_inner. This is so that the conflict count can be
855
retrieved (and potentially manipulated) before returning to the caller
856
of merge_inner. Likewise 'merge' now returns the conflict count to the
857
caller. (Robert Collins)
859
* 'revision.revision_graph can handle having only partial history for
860
a revision - that is no revisions in the graph with no parents.
863
* New builtins.branch_files uses the standard file_list rules to produce
864
a branch and a list of paths, relative to that branch (Aaron Bentley)
866
* New TestCase.addCleanup facility.
868
* New bzrlib.version_info tuple (similar to sys.version_info), which can
869
be used by programs importing bzrlib.
873
* Better handling of branches in directories with non-ascii names.
874
(Joel Rosdahl, Panagiotis Papadakos)
876
* Upgrades of trees with no commits will not fail due to accessing
877
[-1] in the revision-history. (Andres Salomon)
884
* Fix problem in pulling over http from machines that do not
885
allow directories to be listed.
887
* Avoid harmless warning about invalid hash cache after
888
upgrading branch format.
892
* Avoid some unnecessary http operations in branch and pull.
899
* 'bzr branch' over http initially gives a very high estimate
900
of completion time but it should fall as the first few
901
revisions are pulled in. branch is still slow on
902
high-latency connections.
906
* bzr-man.py has been updated to work again. Contributed by
909
* Locking is now done with fcntl.lockf which works with NFS
910
file systems. Contributed by Harald Meland.
912
* When a merge encounters a file that has been deleted on
913
one side and modified on the other, the old contents are
914
written out to foo.BASE and foo.SIDE, where SIDE is this
915
or OTHER. Contributed by Aaron Bentley.
917
* Export was choosing incorrect file paths for the content of
918
the tarball, this has been fixed by Aaron Bentley.
920
* Commit will no longer commit without a log message, an
921
error is returned instead. Contributed by Jelmer Vernooij.
923
* If you commit a specific file in a sub directory, any of its
924
parent directories that are added but not listed will be
925
automatically included. Suggested by Michael Ellerman.
927
* bzr commit and upgrade did not correctly record new revisions
928
for files with only a change to their executable status.
929
bzr will correct this when it encounters it. Fixed by
932
* HTTP tests now force off the use of http_proxy for the duration.
933
Contributed by Gustavo Niemeyer.
935
* Fix problems in merging weave-based branches that have
936
different partial views of history.
938
* Symlink support: working with symlinks when not in the root of a
939
bzr tree was broken, patch from Scott James Remnant.
944
* 'branch' now accepts a --basis parameter which will take advantage
945
of local history when making a new branch. This allows faster
946
branching of remote branches. Contributed by Aaron Bentley.
948
* New tree format based on weave files, called version 5.
949
Existing branches can be upgraded to this format using
952
* Symlinks are now versionable. Initial patch by
953
Erik Toubro Nielsen, updated to head by Robert Collins.
955
* Executable bits are tracked on files. Patch from Gustavo
958
* 'bzr status' now shows unknown files inside a selected directory.
959
Patch from Heikki Paajanen.
961
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
962
and 'resolve' have needed added, which list and remove those
963
merge conflicts respectively. A conflicted tree cannot be committed
964
in. Contributed by Aaron Bentley.
966
* 'rm' is now an alias for 'remove'.
968
* Stores now split out their content in a single byte prefixed hash,
969
dropping the density of files per directory by 256. Contributed by
972
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
973
Contributed by Robert Collins.
975
* 'bzr log' with the default formatter will show merged revisions,
976
indented to the right. Initial implementation contributed by Gustavo
977
Niemeyer, made incremental by Robert Collins.
982
* Test case failures have the exception printed after the log
983
for your viewing pleasure.
985
* InventoryEntry is now an abstract base class, use one of the
986
concrete InventoryDirectory etc classes instead.
988
* Branch raises an UnsupportedFormatError when it detects a
989
bzr branch it cannot understand. This allows for precise
990
handling of such circumstances.
995
* Removed testsweet module so that tests can be run after
996
bzr installed by 'bzr selftest'.
998
* 'bzr selftest' command-line arguments can now be partial ids
999
of tests to run, e.g. 'bzr selftest test_weave'
1002
bzr 0.0.9 2005-09-23
1006
* Fixed "branch -r" option.
1008
* Fix remote access to branches containing non-compressed history.
1011
* Better reliability of http server tests. (John Arbash-Meinel)
1013
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1015
* Various minor bug in windows support have been fixed, largely in the
1016
test suite. Contributed by Alexander Belchenko.
1020
* Status now accepts a -r argument to give status between chosen
1021
revisions. Contributed by Heikki Paajanen.
1023
* Revision arguments no longer use +/-/= to control ranges, instead
1024
there is a 'before' namespace, which limits the successive namespace.
1025
For example '$ bzr log -r date:yesterday..before:date:today' will
1026
select everything from yesterday and before today. Contributed by
1029
* There is now a bzr.bat file created by distutils when building on
1030
Windows. Contributed by Alexander Belchenko.
1034
* Removed uuid() as it was unused.
1036
* Improved 'fetch' code for pulling revisions from one branch into
1037
another (used by pull, merged, etc.)
1040
bzr 0.0.8 2005-09-20
1044
* Adding a file whose parent directory is not versioned will
1045
implicitly add the parent, and so on up to the root. This means
1046
you should never need to explictly add a directory, they'll just
1047
get added when you add a file in the directory. Contributed by
1050
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1053
* If you set BZR_EDITOR in the environment, it is checked in
1054
preference to EDITOR and the config file for the interactive commit
1055
editing program. Related to this is a bugfix where a missing program
1056
set in EDITOR would cause editing to fail, now the fallback program
1057
for the operating system is still tried.
1059
* Files that are not directories/symlinks/regular files will no longer
1060
cause bzr to fail, it will just ignore them by default. You cannot add
1061
them to the tree though - they are not versionable.
1066
* Refactor xml packing/unpacking.
1070
* Fixed 'bzr mv' by Ollie Rutherfurd.
1072
* Fixed strange error when trying to access a nonexistent http
1075
* Make sure that the hashcache gets written out if it can't be
1081
* Various Windows fixes from Ollie Rutherfurd.
1083
* Quieten warnings about locking; patch from Matt Lavin.
1086
bzr-0.0.7 2005-09-02
1090
* ``bzr shell-complete`` command contributed by Clint Adams to
1091
help with intelligent shell completion.
1093
* New expert command ``bzr find-merge-base`` for debugging merges.
1098
* Much better merge support.
1100
* merge3 conflicts are now reported with markers like '<<<<<<<'
1101
(seven characters) which is the same as CVS and pleases things
1107
* ``bzr upgrade`` no longer fails when trying to fix trees that
1108
mention revisions that are not present.
1110
* Fixed bugs in listing plugins from ``bzr plugins``.
1112
* Fix case of $EDITOR containing options for the editor.
1114
* Fix log -r refusing to show the last revision.
1115
(Patch from Goffredo Baroncelli.)
1120
* ``bzr log --show-ids`` shows the revision ids of all parents.
1122
* Externally provided commands on your $BZRPATH no longer need
1123
to recognize --bzr-usage to work properly, and can just handle
1129
* Changed trace messages to go through the standard logging
1130
framework, so that they can more easily be redirected by
1135
bzr-0.0.6 2005-08-18
added
removed
NEWS
