5
* The revision specifier "revno:" is extended to accept the syntax
6
revno:N:branch. For example,
7
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
8
bzr.dev. (Matthieu Moy)
10
* No default ignore rules are applied by bzr - only the rules in .bzrignore
11
are considered. This fixes bugs with default rules being enforced no
12
matter what. The old list of ignore rules from bzr is available by
13
running 'bzr ignore --old-default-rules'.
15
* Tests updates to ensure proper URL handling, UNICODE support, and
16
proper printing when the user's terminal encoding cannot display
17
the path of a file that has been versioned.
18
``bzr branch`` can take a target URL rather than only a local directory.
19
Branch.get_parent()/set_parent() now save a relative path if possible,
20
and normalize the parent based on root, allowing access across
21
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
22
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
25
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
26
Use terminal width for single-line logs from ``bzr log --line`` and
27
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
30
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
33
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
35
* Show the correct number of revisions pushed when pushing a new branch.
38
* 'bzr selftest' now shows a progress bar with the number of tests, and
39
progress made. 'make check' shows tests in -v mode, to be more useful
40
for the PQM status window. (Robert Collins).
42
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
43
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
44
profile data for the individual profiled calls, allowing for fine
45
grained analysis of performance.
46
(Robert Collins, Martin Pool).
48
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
49
where commit can take an appreciable time. (Robert Collins)
51
* 'bzr add' is now less verbose in telling you what ignore globs were
52
matched by files being ignored. Instead it just tells you how many
53
were ignored (because you might reasonably be expecting none to be
54
ignored). 'bzr add -v' is unchanged and will report every ignored
55
file. (Robert Collins).
57
* ftp now has a test server if medusa is installed. As part of testing,
58
ftp support has been improved, including support for supplying a
59
non-standard port. (John Arbash Meinel).
61
* 'bzr log --line' shows the revision number, and uses only the
62
first line of the log message (#5162, Alexander Belchenko;
65
* 'bzr status' has had the --all option removed. The 'bzr ls' command
66
should be used to retrieve all versioned files. (Robert Collins)
68
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
69
over email, and applied on the other end, while maintaining ancestry.
70
This bundle can be applied with either 'bzr merge' or 'bzr pull',
71
the same way you would apply another branch.
72
(John Arbash Meinel, Aaron Bentley)
74
* 'branches.conf' has been changed to 'locations.conf', since it can apply
75
to more locations than just branch locations.
78
* 'bzr whoami' can now be used to set your identity from the command line,
79
for a branch or globally. (Robey Pointer)
81
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
84
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
87
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
88
Also updates things like 'http+pycurl://' if pycurl is not present.
89
(John Arbash Meinel) (Malone #47821, #52204)
91
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
92
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
93
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
95
* Improve the help text for 'bzr diff' to explain what various options do.
96
(John Arbash Meinel, #6391)
100
* Fix shadowed definition of TestLocationConfig that caused some
101
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
104
* Fix unnecessary requirement of sign-my-commits that it be run from
105
a working directory. (Martin Pool, Robert Collins)
107
* 'bzr push location' will only remember the push location if it succeeds
108
in connecting to the remote location. (#49742, John Arbash Meinel)
110
* 'bzr revert' no longer toggles the executable bit on win32
111
(#45010, John Arbash Meinel)
113
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
115
* sftp tests now work correctly on win32 if you have a newer paramiko
118
* Cleanup win32 test suite, and general cleanup of places where
119
file handles were being held open. (John Arbash Meinel)
121
* When specifying filenames for 'diff -r x..y', the name of the file in the
122
working directory can be used, even if its name is different in both x
125
* File-ids containing single- or double-quotes are handled correctly by
126
push. (#52227, Aaron Bentley)
128
* Normalize unicode filenames to ensure cross-platform consistency.
129
(John Arbash Meinel, #43689)
131
* The argument parser can now handle '-' as an argument. Currently
132
no code interprets it specially (it is mostly handled as a file named
133
'-'). But plugins, and future operations can use it.
134
(John Arbash meinel, #50984)
136
* Bundles can properly read binary files with a plain '\r' in them.
137
(John Arbash Meinel, #51927)
139
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
141
* Lots of win32 fixes (the test suite passes again).
142
(John Arbash Meinel, #50155)
144
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
146
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
148
* Removals are only committed if they match the filespec (or if there is
149
no filespec). (#46635, Aaron Bentley)
153
* Combine the ignore rules into a single regex rather than looping over
154
them to reduce the threshold where N^2 behaviour occurs in operations
155
like status. (Jan Hudec, Robert Collins).
157
* 'bzr push' should only push the ancestry of the current revision, not
158
all of the history in the repository. This is especially important for
159
shared repositories. (John Arbash Meinel)
161
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
162
rather than randomly walking the inventories. (John Arbash Meinel)
164
* Doctests are now run in temporary directories which are cleaned up when
165
they finish, rather than using special ScratchDir/ScratchBranch objects.
168
* Split ``check`` into separate methods on the branch and on the repository,
169
so that it can be specialized in ways that are useful or efficient for
170
different formats. (Martin Pool, Robert Collins)
172
* Deprecate Repository.all_revision_ids; most methods don't really need
173
the global revision graph but only that part leading up to a particular
174
revision. (Martin Pool, Robert Collins)
176
* Add a BzrDirFormat control_formats list which allows for control formats
177
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
178
(Robert Collins, Jelmer Vernooij).
180
* bzrlib.diff.external_diff can be redirected to any file-like object.
181
Uses subprocess instead of spawnvp.
182
(#4047, #48914, James Henstridge, John Arbash Meinel)
184
* New command line option '--profile-imports', which will install a custom
185
importer to log time to import modules and regex compilation time to
186
sys.stderr (John Arbash Meinel)
192
* setup.py failed to install launchpad plugin. (Martin Pool)
198
* Fix failure to commit a merge in a checkout. (Martin Pool,
199
Robert Collins, Erik Bågfors, #43959)
201
* Nicer messages from 'commit' in the case of renames, and correct
202
messages when a merge has occured. (Robert Collins, Martin Pool)
204
* Separate functionality from assert statements as they are skipped in
205
optimized mode of python. Add the same check to pending merges.
206
(#44443, Olaf Conradi)
210
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
212
* Add info on standalone branches without a working tree.
213
(#44155, Olaf Conradi)
215
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
219
* Make editor invocation comply with Debian Policy. First check
220
environment variables VISUAL and EDITOR, then try editor from
221
alternatives system. If that all fails, fall back to the pre-defined
222
list of editors. (#42904, Olaf Conradi)
226
* New 'register-branch' command registers a public branch into
227
Launchpad.net, where it can be associated with bugs, etc.
228
(Martin Pool, Bjorn Tillenius, Robert Collins)
232
* New public api in InventoryEntry - 'describe_change(old, new)' which
233
provides a human description of the changes between two old and
234
new. (Robert Collins, Martin Pool)
238
* Fix test case for bzr info in upgrading a standalone branch to metadir,
239
uses bzrlib api now. (Olaf Conradi)
243
NOTES WHEN UPGRADING:
245
Release 0.8 of bzr introduces a new format for history storage, called
246
'knit', as an evolution of to the 'weave' format used in 0.7. Local
247
and remote operations are faster using knits than weaves. Several
248
operations including 'init', 'init-repo', and 'upgrade' take a
249
--format option that controls this. Branching from an existing branch
250
will keep the same format.
252
It is possible to merge, pull and push between branches of different
253
formats but this is slower than moving data between homogenous
254
branches. It is therefore recommended (but not required) that you
255
upgrade all branches for a project at the same time. Information on
256
formats is shown by 'bzr info'.
258
bzr 0.8 now allows creation of 'repositories', which hold the history
259
of files and revisions for several branches. Previously bzr kept all
260
the history for a branch within the .bzr directory at the root of the
261
branch, and this is still the default. To create a repository, use
262
the new 'bzr init-repo' command. Branches exist as directories under
263
the repository and contain just a small amount of information
264
indicating the current revision of the branch.
266
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
267
subversion. Checkouts are associated with a branch (optionally in a
268
repository), which contains all the historical information. The
269
result is that a checkout can be deleted without losing any
270
already-committed revisions. A new 'update' command is also available.
272
Repositories and checkouts are not supported with the 0.7 storage
273
format. To use them you must upgrad to either knits, or to the
274
'metaweave' format, which uses weaves but changes the .bzr directory
280
* Sftp paths can now be relative, or local, according to the lftp
281
convention. Paths now take the form:
282
sftp://user:pass@host:port/~/relative/path
284
sftp://user:pass@host:port/absolute/path
286
* The FTP transport now tries to reconnect after a temporary
287
failure. ftp put is made atomic. (Matthieu Moy)
289
* The FTP transport now maintains a pool of connections, and
290
reuses them to avoid multiple connections to the same host (like
291
sftp did). (Daniel Silverstone)
293
* The bzr_man.py file has been removed. To create the man page now,
294
use ./generate_docs.py man. The new program can also create other files.
295
Run "python generate_docs.py --help" for usage information. (Hans
296
Ulrich Niedermann & James Blackwell).
298
* Man Page now gives full help (James Blackwell). Help also updated to
299
reflect user config now being stored in .bazaar (Hans Ulrich
302
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
304
* Pull now accepts a --revision argument (Erik Bågfors)
306
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
307
line. You can now use the following command to sign all of your old commits.
308
find .bzr/revision-store// -name my@email-* \
309
| sed 's/.*\/\/..\///' \
312
* Upgrade can now upgrade over the network. (Robert Collins)
314
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
315
behaviour. By default they will cache history in the checkout, but
316
with --lightweight almost all data is kept in the master branch.
319
* 'revert' unversions newly-versioned files, instead of deleting them.
321
* 'merge' is more robust. Conflict messages have changed.
323
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
326
* Default log format can be set in configuration and plugins can register
327
their own formatters. (Erik Bågfors)
329
* New 'reconcile' command will check branch consistency and repair indexes
330
that can become out of sync in pre 0.8 formats. (Robert Collins,
333
* New 'bzr init --format' and 'bzr upgrade --format' option to control
334
what storage format is created or produced. (Robert Collins,
337
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
339
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
341
* New 'init-repository' command, plus support for repositories in 'init'
342
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
344
* Improve output of 'info' command. Show all relevant locations related to
345
working tree, branch and repository. Use kibibytes for binary quantities.
346
Fix off-by-one error in missing revisions of working tree. Make 'info'
347
work on branches, repositories and remote locations. Show locations
348
relative to the shared repository, if applicable. Show locking status
349
of locations. (Olaf Conradi)
351
* Diff and merge now safely handle binary files. (Aaron Bentley)
353
* 'pull' and 'push' now normalise the revision history, so that any two
354
branches with the same tip revision will have the same output from 'log'.
357
* 'merge' accepts --remember option to store parent location, like 'push'
358
and 'pull'. (Olaf Conradi)
360
* bzr status and diff when files given as arguments do not exist
361
in the relevant trees. (Martin Pool, #3619)
363
* Add '.hg' to the default ignore list. (Martin Pool)
365
* 'knit' is now the default disk format. This improves disk performance and
366
utilization, increases incremental pull performance, robustness with SFTP
367
and allows checkouts over SFTP to perform acceptably.
368
The initial Knit code was contributed by Johan Rydberg based on a
369
specification by Martin Pool.
370
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
372
* New tool to generate all-in-one html version of the manual. (Alexander
375
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
376
to be left in the SFTP repository. (Robert Collins, Martin Pool).
378
* New option 'diff --prefix' to control how files are named in diff
379
output, with shortcuts '-p0' and '-p1' corresponding to the options for
380
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
382
* Add --revision option to 'annotate' command. (Olaf Conradi)
384
* If bzr shows an unexpected revision-history after pulling (perhaps due
385
to a reweave) it can now be corrected by 'bzr reconcile'.
390
* Commit is now verbose by default, and shows changed filenames and the
391
new revision number. (Robert Collins, Martin Pool)
393
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
395
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
397
* Make 'pull' and 'push' remember location on failure using --remember.
400
* For compatibility, make old format for using weaves inside metadir
401
available as 'metaweave' format. Rename format 'metadir' to 'default'.
402
Clean up help for option --format in commands 'init', 'init-repo' and
403
'upgrade'. (Olaf Conradi)
407
* The internal storage of history, and logical branch identity have now
408
been split into Branch, and Repository. The common locking and file
409
management routines are now in bzrlib.lockablefiles.
410
(Aaron Bentley, Robert Collins, Martin Pool)
412
* Transports can now raise DependencyNotPresent if they need a library
413
which is not installed, and then another implementation will be
416
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
419
* Using Tree Transform for merge, revert, tree-building
421
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
422
Branch.initialize are now deprecated. Please see BzrDir.create_* for
423
replacement API's. (Robert Collins)
425
* New BzrDir class represents the .bzr control directory and manages
426
formatting issues. (Robert Collins)
428
* New repository.InterRepository class encapsulates Repository to
429
Repository actions and allows for clean selection of optimised code
430
paths. (Robert Collins)
432
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
433
please use 'branch.fetch' or 'repository.fetch' depending on your
434
needs. (Robert Collins)
436
* deprecated methods now have a 'is_deprecated' flag on them that can
437
be checked, if you need to determine whether a given callable is
438
deprecated at runtime. (Robert Collins)
440
* Progress bars are now nested - see
441
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
443
* New API call get_format_description() for each type of format.
446
* Changed branch.set_parent() to accept None to remove parent.
449
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
451
* WorkingTree.branch is now a read only property. (Robert Collins)
453
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
454
can be None or a factory that will create a progress bar. This is
455
useful for testing or for overriding the bzrlib.progress heuristic.
458
* New API method get_physical_lock_status() to query locks present on a
459
transport. (Olaf Conradi)
461
* Repository.reconcile now takes a thorough keyword parameter to allow
462
requesting an indepth reconciliation, rather than just a data-loss
463
check. (Robert Collins)
465
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
466
the user for yes/no style input. (Robert Collins)
470
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
471
for testing SFTP protocol support. (Robey Pointer)
473
* Branch formats are now tested once per implementation (see bzrlib.
474
tests.branch_implementations. This is analagous to the transport
475
interface tests, and has been followed up with working tree,
476
repository and BzrDir tests. (Robert Collins)
478
* New test base class TestCaseWithTransport provides a transport aware
479
test environment, useful for testing any transport-interface using
480
code. The test suite option --transport controls the transport used
481
by this class (when its not being used as part of implementation
482
contract testing). (Robert Collins)
484
* Close logging handler on disabling the test log. This will remove the
485
handler from the internal list inside python's logging module,
486
preventing shutdown from closing it twice. (Olaf Conradi)
488
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
490
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
491
will provide String("foo") to the command as its stdin.
497
* .bzrignore is excluded from exports, on the grounds that it's a bzr
498
internal-use file and may not be wanted. (Jamie Wilkinson)
500
* The "bzr directories" command were removed in favor of the new
501
--kind option to the "bzr inventory" command. To list all
502
versioned directories, now use "bzr inventory --kind directory".
505
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
506
by default. (John Arbash Meinel)
508
* The parent of Bzr configuration directory can be set by BZR_HOME
509
environment variable. Now the path for it is searched in BZR_HOME, then
510
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
511
points to C:\Documents and Settings\User Name\Application Data), HOME.
514
* Plugins with the same name in different directories in the bzr plugin
515
path are no longer loaded: only the first successfully loaded one is
516
used. (Robert Collins)
518
* Use systems' external ssh command to open connections if possible.
519
This gives better integration with user settings such as ProxyCommand.
522
* Permissions on files underneath .bzr/ are inherited from the .bzr
523
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
524
will mean that future file will be created with group write permissions.
526
* configure.in and config.guess are no longer in the builtin default
529
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
530
files. (John Arbash Meinel, Martin Pool)
534
* "bzr INIT dir" now initializes the specified directory, and creates
535
it if it does not exist. (John Arbash Meinel)
537
* New remerge command (Aaron Bentley)
539
* Better zsh completion script. (Steve Borho)
541
* 'bzr diff' now returns 1 when there are changes in the working
542
tree. (Robert Collins)
544
* 'bzr push' now exists and can push changes to a remote location.
545
This uses the transport infrastructure, and can store the remote
546
location in the ~/.bazaar/branches.conf configuration file.
549
* Test directories are only kept if the test fails and the user requests
552
* Tweaks to short log printing
554
* Added branch nicks, new nick command, printing them in log output.
557
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
558
occurs. (Martin Pool)
560
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
561
the same as Subversion. (Martin Pool)
563
* New ftp transport support (on ftplib), for ftp:// and aftp://
564
URLs. (Daniel Silverstone)
566
* Commit editor temporary files now start with 'bzr_log.', to allow
567
text editors to match the file name and set up appropriate modes or
568
settings. (Magnus Therning)
570
* Improved performance when integrating changes from a remote weave.
571
(Goffredo Baroncelli)
573
* Sftp will attempt to cache the connection, so it is more likely that
574
a connection will be reused, rather than requiring multiple password
577
* bzr revno now takes an optional argument indicating the branch whose
578
revno should be printed. (Michael Ellerman)
580
* bzr cat defaults to printing the last version of the file.
581
(#3632, Matthieu Moy)
583
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
584
profiler. (Denys Duchier)
586
* Faster commits by reading only the headers of affected weave files.
589
* 'bzr add' now takes a --dry-run parameter which shows you what would be
590
added, but doesn't actually add anything. (Michael Ellerman)
592
* 'bzr add' now lists how many files were ignored per glob. add --verbose
593
lists the specific files. (Aaron Bentley)
595
* 'bzr missing' now supports displaying changes in diverged trees and can
596
be limited to show what either end of the comparison is missing.
597
(Aaron Bently, with a little prompting from Daniel Silverstone)
601
* SFTP can walk up to the root path without index errors. (Robert Collins)
603
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
605
* Error when run with -OO
607
* Fix bug in reporting http errors that don't have an http error code.
610
* Handle more cases of pipe errors in display commands
612
* Change status to 3 for all errors
614
* Files that are added and unlinked before committing are completely
615
ignored by diff and status
617
* Stores with some compressed texts and some uncompressed texts are now
618
able to be used. (John A Meinel)
620
* Fix for bzr pull failing sometimes under windows
622
* Fix for sftp transport under windows when using interactive auth
624
* Show files which are both renamed and modified as such in 'bzr
625
status' output. (#4503, Daniel Silverstone)
627
* Make annotate cope better with revisions committed without a valid
628
email address. (Marien Zwart)
630
* Fix representation of tab characters in commit messages. (Harald
633
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
634
now parsed properly under Windows. (Alexander Belchenko)
636
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
638
* Keep a cached copy of the basis inventory to speed up operations
639
that need to refer to it. (Johan Rydberg, Martin Pool)
641
* Fix bugs in bzr status display of non-ascii characters. (Martin
644
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
647
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
651
* Fix selftest asking for passwords when there are no SFTP keys.
652
(Robey Pointer, Jelmer Vernooij)
654
* Fix selftest run with 'python -O'. (Martin Pool)
656
* Fix HTTP tests under Windows. (John Arbash Meinel)
658
* Make tests work even if HOME is not set (Aaron Bentley)
660
* Updated build_tree to use fixed line-endings for tests which read
661
the file cotents and compare. Make some tests use this to pass under
662
Windows. (John Arbash Meinel)
664
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
666
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
669
* Use terminal width to align verbose test output. (Martin Pool)
671
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
672
If adding a new test script please add that to
673
bzrlib.tests.blackbox.__init__. (Robert Collins)
675
* Much better error message if one of the test suites can't be
676
imported. (Martin Pool)
678
* Make check now runs the test suite twice - once with the default locale,
679
and once with all locales forced to C, to expose bugs. This is not
680
trivially done within python, so for now its only triggered by running
681
Make check. Integrators and packagers who wish to check for full
682
platform support should run 'make check' to test the source.
685
* Tests can now run TestSkipped if they can't execute for any reason.
686
(Martin Pool) (NB: TestSkipped should only be raised for correctable
687
reasons - see the wiki spec ImprovingBzrTestSuite).
689
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
690
paths for the transport tests. Introduce blackbox remote sftp tests that
691
test the same permutations. (Robert Collins, Robey Pointer)
693
* Transport implementation tests are now independent of the local file
694
system, which allows tests for esoteric transports, and for features
695
not available in the local file system. They also repeat for variations
696
on the URL scheme that can introduce issues in the transport code,
697
see bzrlib.transport.TransportTestProviderAdapter() for this.
700
* TestCase.build_tree uses the transport interface to build trees, pass
701
in a transport parameter to give it an existing connection.
706
* WorkingTree.pull has been split across Branch and WorkingTree,
707
to allow Branch only pulls. (Robert Collins)
709
* commands.display_command now returns the result of the decorated
710
function. (Robert Collins)
712
* LocationConfig now has a set_user_option(key, value) call to save
713
a setting in its matching location section (a new one is created
714
if needed). (Robert Collins)
716
* Branch has two new methods, get_push_location and set_push_location
717
to respectively, get and set the push location. (Robert Collins)
719
* commands.register_command now takes an optional flag to signal that
720
the registrant is planning to decorate an existing command. When
721
given multiple plugins registering a command is not an error, and
722
the original command class (whether built in or a plugin based one) is
723
returned to the caller. There is a new error 'MustUseDecorated' for
724
signalling when a wrapping command should switch to the original
725
version. (Robert Collins)
727
* Some option parsing errors will raise 'BzrOptionError', allowing
728
granular detection for decorating commands. (Robert Collins).
730
* Branch.read_working_inventory has moved to
731
WorkingTree.read_working_inventory. This necessitated changes to
732
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
733
as well. To make it clear that a WorkingTree cannot always be obtained
734
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
735
be obtained. (Robert Collins)
737
* All pending merges operations from Branch are now on WorkingTree.
740
* The follow operations from Branch have moved to WorkingTree:
748
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
750
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
752
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
755
* bzrlib.plugin.all_plugins has been changed from an attribute to a
756
query method. (Robert Collins)
758
* New options to read only the table-of-contents of a weave.
761
* Raise NoSuchFile when someone tries to add a non-existant file.
764
* Simplify handling of DivergedBranches in cmd_pull().
768
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
769
is exposed as Branch().control_files. Also this has been altered with the
770
controlfile pre/suffix replaced by simple method names like 'get' and
771
'put'. (Aaron Bentley, Robert Collins).
773
* Deprecated functions and methods can now be marked as such using the
774
bzrlib.symbol_versioning module. Marked method have their docstring
775
updated and will issue a DeprecationWarning using the warnings module
776
when they are used. (Robert Collins)
778
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
779
for functions that need unicode strings. (Robert Collins)
785
* pull now takes --verbose to show you what revisions are added or removed
788
* merge now takes a --show-base option to include the base text in
792
* The config files are now read using ConfigObj, so '=' should be used as
793
a separator, not ':'.
796
* New 'bzr commit --strict' option refuses to commit if there are
797
any unknown files in the tree. To commit, make sure all files are
798
either ignored, added, or deleted. (Michael Ellerman)
800
* The config directory is now ~/.bazaar, and there is a single file
801
~/.bazaar/bazaar.conf storing email, editor and other preferences.
804
* 'bzr add' no longer takes a --verbose option, and a --quiet option
805
has been added that suppresses all output.
807
* Improved zsh completion support in contrib/zsh, from Clint
810
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
813
* 'bzr check' now accepts -v for verbose reporting, and checks for
814
ghosts in the branch. (Robert Collins)
816
* New command 're-sign' which will regenerate the gpg signature for
817
a revision. (Robert Collins)
819
* If you set check_signatures=require for a path in
820
~/.bazaar/branches.conf then bzr will invoke your
821
gpg_signing_command (defaults to gpg) and record a digital signature
822
of your commit. (Robert Collins)
824
* New sftp transport, based on Paramiko. (Robey Pointer)
826
* 'bzr pull' now accepts '--clobber' which will discard local changes
827
and make this branch identical to the source branch. (Robert Collins)
829
* Just give a quieter warning if a plugin can't be loaded, and
830
put the details in .bzr.log. (Martin Pool)
832
* 'bzr branch' will now set the branch-name to the last component of the
833
output directory, if one was supplied.
835
* If the option 'post_commit' is set to one (or more) python function
836
names (must be in the bzrlib namespace), then they will be invoked
837
after the commit has completed, with the branch and revision_id as
838
parameters. (Robert Collins)
840
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
842
* --merge-type weave is now supported for file contents. Tree-shape
843
changes are still three-way based. (Martin Pool, Aaron Bentley)
845
* 'bzr check' allows the first revision on revision-history to have
846
parents - something that is expected for cheap checkouts, and occurs
847
when conversions from baz do not have all history. (Robert Collins).
849
* 'bzr merge' can now graft unrelated trees together, if your specify
850
0 as a base. (Aaron Bentley)
852
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
855
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
857
* 'bzr merge --reprocess' minimizes conflicts
861
* The 'bzr selftest --pattern' option for has been removed, now
862
test specifiers on the command line can be simple strings, or
863
regexps, or both. (Robert Collins)
865
* Passing -v to selftest will now show the time each test took to
866
complete, which will aid in analysing performance regressions and
867
related questions. (Robert Collins)
869
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
870
is given. (Martin Pool)
872
* There is a new method for TestCaseInTempDir, assertFileEqual, which
873
will check that a given content is equal to the content of the named
874
file. (Robert Collins)
876
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
881
* New 'testament' command and concept for making gpg-signatures
882
of revisions that are not tied to a particular internal
883
representation. (Martin Pool).
885
* Per-revision properties ('revprops') as key-value associated
886
strings on each revision created when the revision is committed.
887
Intended mainly for the use of external tools. (Martin Pool).
889
* Config options have moved from bzrlib.osutils to bzrlib.config.
892
* Improved command line option definitions allowing explanations
893
for individual options, among other things. Contributed by
896
* Config options have moved from bzrlib.osutils to bzrlib.config.
897
Configuration is now done via the config.Config interface:
898
Depending on whether you have a Branch, a Location or no information
899
available, construct a *Config, and use its signature_checking,
900
username and user_email methods. (Robert Collins)
902
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
903
they are made available for other plugins to use. You should not
904
import other plugins during the __init__ of your plugin though, as
905
no ordering is guaranteed, and the plugins directory is not on the
906
python path. (Robert Collins)
908
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
909
no longer takes an inventory, rather it takes an option branch
910
parameter, and if None is given will open the branch at basedir
911
implicitly. (Robert Collins)
913
* Cleaner exception structure and error reporting. Suggested by
914
Scott James Remnant. (Martin Pool)
916
* Branch.remove has been moved to WorkingTree, which has also gained
917
lock_read, lock_write and unlock methods for convenience. (Robert
920
* Two decorators, needs_read_lock and needs_write_lock have been added
921
to the branch module. Use these to cause a function to run in a
922
read or write lock respectively. (Robert Collins)
924
* Branch.open_containing now returns a tuple (Branch, relative-path),
925
which allows direct access to the common case of 'get me this file
926
from its branch'. (Robert Collins)
928
* Transports can register using register_lazy_transport, and they
929
will be loaded when first used. (Martin Pool)
931
* 'pull' has been factored out of the command as WorkingTree.pull().
932
A new option to WorkingTree.pull has been added, clobber, which will
933
ignore diverged history and pull anyway.
936
* config.Config has a 'get_user_option' call that accepts an option name.
937
This will be looked up in branches.conf and bazaar.conf as normal.
938
It is intended that this be used by plugins to support options -
939
options of built in programs should have specific methods on the config.
942
* merge.merge_inner now has tempdir as an optional parameter. (Robert
945
* Tree.kind is not recorded at the top level of the hierarchy, as it was
946
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
949
* WorkingTree.__del__ has been removed, it was non deterministic and not
950
doing what it was intended to. See WorkingTree.__init__ for a comment
951
about future directions. (Robert Collins/Martin Pool)
953
* bzrlib.transport.http has been modified so that only 404 urllib errors
954
are returned as NoSuchFile. Other exceptions will propogate as normal.
955
This allows debuging of actual errors. (Robert Collins)
957
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
958
to apis like 'put', 'get' and 'has'. This is to provide consistent
959
behaviour - it operates on url's only. (Robert Collins)
961
* Transports can register using register_lazy_transport, and they
962
will be loaded when first used. (Martin Pool)
964
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
965
is called by merge_inner. This is so that the conflict count can be
966
retrieved (and potentially manipulated) before returning to the caller
967
of merge_inner. Likewise 'merge' now returns the conflict count to the
968
caller. (Robert Collins)
970
* 'revision.revision_graph can handle having only partial history for
971
a revision - that is no revisions in the graph with no parents.
974
* New builtins.branch_files uses the standard file_list rules to produce
975
a branch and a list of paths, relative to that branch (Aaron Bentley)
977
* New TestCase.addCleanup facility.
979
* New bzrlib.version_info tuple (similar to sys.version_info), which can
980
be used by programs importing bzrlib.
984
* Better handling of branches in directories with non-ascii names.
985
(Joel Rosdahl, Panagiotis Papadakos)
987
* Upgrades of trees with no commits will not fail due to accessing
988
[-1] in the revision-history. (Andres Salomon)
995
* Fix problem in pulling over http from machines that do not
996
allow directories to be listed.
998
* Avoid harmless warning about invalid hash cache after
999
upgrading branch format.
1003
* Avoid some unnecessary http operations in branch and pull.
1010
* 'bzr branch' over http initially gives a very high estimate
1011
of completion time but it should fall as the first few
1012
revisions are pulled in. branch is still slow on
1013
high-latency connections.
1017
* bzr-man.py has been updated to work again. Contributed by
1020
* Locking is now done with fcntl.lockf which works with NFS
1021
file systems. Contributed by Harald Meland.
1023
* When a merge encounters a file that has been deleted on
1024
one side and modified on the other, the old contents are
1025
written out to foo.BASE and foo.SIDE, where SIDE is this
1026
or OTHER. Contributed by Aaron Bentley.
1028
* Export was choosing incorrect file paths for the content of
1029
the tarball, this has been fixed by Aaron Bentley.
1031
* Commit will no longer commit without a log message, an
1032
error is returned instead. Contributed by Jelmer Vernooij.
1034
* If you commit a specific file in a sub directory, any of its
1035
parent directories that are added but not listed will be
1036
automatically included. Suggested by Michael Ellerman.
1038
* bzr commit and upgrade did not correctly record new revisions
1039
for files with only a change to their executable status.
1040
bzr will correct this when it encounters it. Fixed by
1043
* HTTP tests now force off the use of http_proxy for the duration.
1044
Contributed by Gustavo Niemeyer.
1046
* Fix problems in merging weave-based branches that have
1047
different partial views of history.
1049
* Symlink support: working with symlinks when not in the root of a
1050
bzr tree was broken, patch from Scott James Remnant.
1055
* 'branch' now accepts a --basis parameter which will take advantage
1056
of local history when making a new branch. This allows faster
1057
branching of remote branches. Contributed by Aaron Bentley.
1059
* New tree format based on weave files, called version 5.
1060
Existing branches can be upgraded to this format using
1063
* Symlinks are now versionable. Initial patch by
1064
Erik Toubro Nielsen, updated to head by Robert Collins.
1066
* Executable bits are tracked on files. Patch from Gustavo
1069
* 'bzr status' now shows unknown files inside a selected directory.
1070
Patch from Heikki Paajanen.
1072
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1073
and 'resolve' have needed added, which list and remove those
1074
merge conflicts respectively. A conflicted tree cannot be committed
1075
in. Contributed by Aaron Bentley.
1077
* 'rm' is now an alias for 'remove'.
1079
* Stores now split out their content in a single byte prefixed hash,
1080
dropping the density of files per directory by 256. Contributed by
1083
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1084
Contributed by Robert Collins.
1086
* 'bzr log' with the default formatter will show merged revisions,
1087
indented to the right. Initial implementation contributed by Gustavo
1088
Niemeyer, made incremental by Robert Collins.
1093
* Test case failures have the exception printed after the log
1094
for your viewing pleasure.
1096
* InventoryEntry is now an abstract base class, use one of the
1097
concrete InventoryDirectory etc classes instead.
1099
* Branch raises an UnsupportedFormatError when it detects a
1100
bzr branch it cannot understand. This allows for precise
1101
handling of such circumstances.
1106
* Removed testsweet module so that tests can be run after
1107
bzr installed by 'bzr selftest'.
1109
* 'bzr selftest' command-line arguments can now be partial ids
1110
of tests to run, e.g. 'bzr selftest test_weave'
1113
bzr 0.0.9 2005-09-23
1117
* Fixed "branch -r" option.
1119
* Fix remote access to branches containing non-compressed history.
1122
* Better reliability of http server tests. (John Arbash-Meinel)
1124
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1126
* Various minor bug in windows support have been fixed, largely in the
1127
test suite. Contributed by Alexander Belchenko.
1131
* Status now accepts a -r argument to give status between chosen
1132
revisions. Contributed by Heikki Paajanen.
1134
* Revision arguments no longer use +/-/= to control ranges, instead
1135
there is a 'before' namespace, which limits the successive namespace.
1136
For example '$ bzr log -r date:yesterday..before:date:today' will
1137
select everything from yesterday and before today. Contributed by
1140
* There is now a bzr.bat file created by distutils when building on
1141
Windows. Contributed by Alexander Belchenko.
1145
* Removed uuid() as it was unused.
1147
* Improved 'fetch' code for pulling revisions from one branch into
1148
another (used by pull, merged, etc.)
1151
bzr 0.0.8 2005-09-20
1155
* Adding a file whose parent directory is not versioned will
1156
implicitly add the parent, and so on up to the root. This means
1157
you should never need to explictly add a directory, they'll just
1158
get added when you add a file in the directory. Contributed by
1161
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1164
* If you set BZR_EDITOR in the environment, it is checked in
1165
preference to EDITOR and the config file for the interactive commit
1166
editing program. Related to this is a bugfix where a missing program
1167
set in EDITOR would cause editing to fail, now the fallback program
1168
for the operating system is still tried.
1170
* Files that are not directories/symlinks/regular files will no longer
1171
cause bzr to fail, it will just ignore them by default. You cannot add
1172
them to the tree though - they are not versionable.
1177
* Refactor xml packing/unpacking.
1181
* Fixed 'bzr mv' by Ollie Rutherfurd.
1183
* Fixed strange error when trying to access a nonexistent http
1186
* Make sure that the hashcache gets written out if it can't be
1192
* Various Windows fixes from Ollie Rutherfurd.
1194
* Quieten warnings about locking; patch from Matt Lavin.
1197
bzr-0.0.7 2005-09-02
1201
* ``bzr shell-complete`` command contributed by Clint Adams to
1202
help with intelligent shell completion.
1204
* New expert command ``bzr find-merge-base`` for debugging merges.
1209
* Much better merge support.
1211
* merge3 conflicts are now reported with markers like '<<<<<<<'
1212
(seven characters) which is the same as CVS and pleases things
1218
* ``bzr upgrade`` no longer fails when trying to fix trees that
1219
mention revisions that are not present.
1221
* Fixed bugs in listing plugins from ``bzr plugins``.
1223
* Fix case of $EDITOR containing options for the editor.
1225
* Fix log -r refusing to show the last revision.
1226
(Patch from Goffredo Baroncelli.)
1231
* ``bzr log --show-ids`` shows the revision ids of all parents.
1233
* Externally provided commands on your $BZRPATH no longer need
1234
to recognize --bzr-usage to work properly, and can just handle
1240
* Changed trace messages to go through the standard logging
1241
framework, so that they can more easily be redirected by
1246
bzr-0.0.6 2005-08-18
1250
* Python plugins, automatically loaded from the directories on
1251
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1253
* New 'bzr mkdir' command.
1255
* Commit mesage is fetched from an editor if not given on the
1256
command line; patch from Torsten Marek.
1258
* ``bzr log -m FOO`` displays commits whose message matches regexp
1261
* ``bzr add`` with no arguments adds everything under the current directory.
1263
* ``bzr mv`` does move or rename depending on its arguments, like
1266
* ``bzr missing`` command shows a summary of the differences
1267
between two trees. (Merged from John Arbash-Meinel.)
1269
* An email address for commits to a particular tree can be
1270
specified by putting it into .bzr/email within a branch. (Based
1271
on a patch from Heikki Paajanen.)
1276
* Faster working tree operations.
1281
* 3rd-party modules shipped with bzr are copied within the bzrlib
1282
python package, so that they can be installed by the setup
1283
script without clashing with anything already existing on the
1284
system. (Contributed by Gustavo Niemeyer.)
1286
* Moved plugins directory to bzrlib/, so that there's a standard
1287
plugin directory which is not only installed with bzr itself but
1288
is also available when using bzr from the development tree.
1289
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1290
standard plugins directory.
1292
* When exporting to a tarball with ``bzr export --format tgz``, put
1293
everything under a top directory rather than dumping it into the
1294
current directory. This can be overridden with the ``--root``
1295
option. Patch from William Dodé and John Meinel.
1297
5
* New ``bzr upgrade`` command to upgrade the format of a branch,
1298
6
replacing ``bzr check --update``.
added
removed
NEWS
