5
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
6
Use terminal width for single-line logs from ``bzr log --line`` and
7
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
10
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
13
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
15
* Show the correct number of revisions pushed when pushing a new branch.
18
* 'bzr selftest' now shows a progress bar with the number of tests, and
19
progress made. 'make check' shows tests in -v mode, to be more useful
20
for the PQM status window. (Robert Collins).
22
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
23
(Robert Collins, Martin Pool).
25
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
26
where commit can take an appreciable time. (Robert Collins)
28
* 'bzr add' is now less verbose in telling you what ignore globs were
29
matched by files being ignored. Instead it just tells you how many
30
were ignored (because you might reasonably be expecting none to be
31
ignored). 'bzr add -v' is unchanged and will report every ignored
32
file. (Robert Collins).
34
* ftp now has a test server if medusa is installed. As part of testing,
35
ftp support has been improved, including support for supplying a
36
non-standard port. (John Arbash Meinel).
38
* ``log --line`` shows the revision number. (#5162, Alexander Belchenko)
42
* Fix shadowed definition of TestLocationConfig that caused some
43
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
48
* Combine the ignore rules into a single regex rather than looping over
49
them to reduce the threshold where N^2 behaviour occurs in operations
50
like status. (Jan Hudec, Robert Collins).
52
* 'bzr push' should only push the ancestry of the current revision, not
53
all of the history in the repository. This is especially important for
54
shared repositories. (John Arbash Meinel)
60
* setup.py failed to install launchpad plugin. (Martin Pool)
66
* Fix failure to commit a merge in a checkout. (Martin Pool,
67
Robert Collins, Erik Bågfors, #43959)
69
* Nicer messages from 'commit' in the case of renames, and correct
70
messages when a merge has occured. (Robert Collins, Martin Pool)
72
* Separate functionality from assert statements as they are skipped in
73
optimized mode of python. Add the same check to pending merges.
74
(#44443, Olaf Conradi)
78
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
80
* Add info on standalone branches without a working tree.
81
(#44155, Olaf Conradi)
83
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
87
* Make editor invocation comply with Debian Policy. First check
88
environment variables VISUAL and EDITOR, then try editor from
89
alternatives system. If that all fails, fall back to the pre-defined
90
list of editors. (#42904, Olaf Conradi)
94
* New 'register-branch' command registers a public branch into
95
Launchpad.net, where it can be associated with bugs, etc.
96
(Martin Pool, Bjorn Tillenius, Robert Collins)
100
* New public api in InventoryEntry - 'describe_change(old, new)' which
101
provides a human description of the changes between two old and
102
new. (Robert Collins, Martin Pool)
106
* Fix test case for bzr info in upgrading a standalone branch to metadir,
107
uses bzrlib api now. (Olaf Conradi)
111
NOTES WHEN UPGRADING:
113
Release 0.8 of bzr introduces a new format for history storage, called
114
'knit', as an evolution of to the 'weave' format used in 0.7. Local
115
and remote operations are faster using knits than weaves. Several
116
operations including 'init', 'init-repo', and 'upgrade' take a
117
--format option that controls this. Branching from an existing branch
118
will keep the same format.
120
It is possible to merge, pull and push between branches of different
121
formats but this is slower than moving data between homogenous
122
branches. It is therefore recommended (but not required) that you
123
upgrade all branches for a project at the same time. Information on
124
formats is shown by 'bzr info'.
126
bzr 0.8 now allows creation of 'repositories', which hold the history
127
of files and revisions for several branches. Previously bzr kept all
128
the history for a branch within the .bzr directory at the root of the
129
branch, and this is still the default. To create a repository, use
130
the new 'bzr init-repo' command. Branches exist as directories under
131
the repository and contain just a small amount of information
132
indicating the current revision of the branch.
134
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
135
subversion. Checkouts are associated with a branch (optionally in a
136
repository), which contains all the historical information. The
137
result is that a checkout can be deleted without losing any
138
already-committed revisions. A new 'update' command is also available.
140
Repositories and checkouts are not supported with the 0.7 storage
141
format. To use them you must upgrad to either knits, or to the
142
'metaweave' format, which uses weaves but changes the .bzr directory
148
* Sftp paths can now be relative, or local, according to the lftp
149
convention. Paths now take the form:
150
sftp://user:pass@host:port/~/relative/path
152
sftp://user:pass@host:port/absolute/path
154
* The FTP transport now tries to reconnect after a temporary
155
failure. ftp put is made atomic. (Matthieu Moy)
157
* The FTP transport now maintains a pool of connections, and
158
reuses them to avoid multiple connections to the same host (like
159
sftp did). (Daniel Silverstone)
161
* The bzr_man.py file has been removed. To create the man page now,
162
use ./generate_docs.py man. The new program can also create other files.
163
Run "python generate_docs.py --help" for usage information. (Hans
164
Ulrich Niedermann & James Blackwell).
166
* Man Page now gives full help (James Blackwell). Help also updated to
167
reflect user config now being stored in .bazaar (Hans Ulrich
170
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
172
* Pull now accepts a --revision argument (Erik Bågfors)
174
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
175
line. You can now use the following command to sign all of your old commits.
176
find .bzr/revision-store// -name my@email-* \
177
| sed 's/.*\/\/..\///' \
180
* Upgrade can now upgrade over the network. (Robert Collins)
182
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
183
behaviour. By default they will cache history in the checkout, but
184
with --lightweight almost all data is kept in the master branch.
187
* 'revert' unversions newly-versioned files, instead of deleting them.
189
* 'merge' is more robust. Conflict messages have changed.
191
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
194
* Default log format can be set in configuration and plugins can register
195
their own formatters. (Erik Bågfors)
197
* New 'reconcile' command will check branch consistency and repair indexes
198
that can become out of sync in pre 0.8 formats. (Robert Collins,
201
* New 'bzr init --format' and 'bzr upgrade --format' option to control
202
what storage format is created or produced. (Robert Collins,
205
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
207
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
209
* New 'init-repository' command, plus support for repositories in 'init'
210
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
212
* Improve output of 'info' command. Show all relevant locations related to
213
working tree, branch and repository. Use kibibytes for binary quantities.
214
Fix off-by-one error in missing revisions of working tree. Make 'info'
215
work on branches, repositories and remote locations. Show locations
216
relative to the shared repository, if applicable. Show locking status
217
of locations. (Olaf Conradi)
219
* Diff and merge now safely handle binary files. (Aaron Bentley)
221
* 'pull' and 'push' now normalise the revision history, so that any two
222
branches with the same tip revision will have the same output from 'log'.
225
* 'merge' accepts --remember option to store parent location, like 'push'
226
and 'pull'. (Olaf Conradi)
228
* bzr status and diff when files given as arguments do not exist
229
in the relevant trees. (Martin Pool, #3619)
231
* Add '.hg' to the default ignore list. (Martin Pool)
233
* 'knit' is now the default disk format. This improves disk performance and
234
utilization, increases incremental pull performance, robustness with SFTP
235
and allows checkouts over SFTP to perform acceptably.
236
The initial Knit code was contributed by Johan Rydberg based on a
237
specification by Martin Pool.
238
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
240
* New tool to generate all-in-one html version of the manual. (Alexander
243
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
244
to be left in the SFTP repository. (Robert Collins, Martin Pool).
246
* New option 'diff --prefix' to control how files are named in diff
247
output, with shortcuts '-p0' and '-p1' corresponding to the options for
248
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
250
* Add --revision option to 'annotate' command. (Olaf Conradi)
252
* Add --revision option to 'annotate' command. (Olaf Conradi)
254
* If bzr shows an unexpected revision-history after pulling (perhaps due
255
to a reweave) it can now be corrected by 'bzr reconcile'.
260
* Commit is now verbose by default, and shows changed filenames and the
261
new revision number. (Robert Collins, Martin Pool)
263
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
265
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
267
* Make 'pull' and 'push' remember location on failure using --remember.
270
* For compatibility, make old format for using weaves inside metadir
271
available as 'metaweave' format. Rename format 'metadir' to 'default'.
272
Clean up help for option --format in commands 'init', 'init-repo' and
273
'upgrade'. (Olaf Conradi)
277
* The internal storage of history, and logical branch identity have now
278
been split into Branch, and Repository. The common locking and file
279
management routines are now in bzrlib.lockablefiles.
280
(Aaron Bentley, Robert Collins, Martin Pool)
282
* Transports can now raise DependencyNotPresent if they need a library
283
which is not installed, and then another implementation will be
286
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
289
* Using Tree Transform for merge, revert, tree-building
291
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
292
Branch.initialize are now deprecated. Please see BzrDir.create_* for
293
replacement API's. (Robert Collins)
295
* New BzrDir class represents the .bzr control directory and manages
296
formatting issues. (Robert Collins)
298
* New repository.InterRepository class encapsulates Repository to
299
Repository actions and allows for clean selection of optimised code
300
paths. (Robert Collins)
302
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
303
please use 'branch.fetch' or 'repository.fetch' depending on your
304
needs. (Robert Collins)
306
* deprecated methods now have a 'is_deprecated' flag on them that can
307
be checked, if you need to determine whether a given callable is
308
deprecated at runtime. (Robert Collins)
310
* Progress bars are now nested - see
311
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
313
* New API call get_format_description() for each type of format.
316
* Changed branch.set_parent() to accept None to remove parent.
319
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
321
* WorkingTree.branch is now a read only property. (Robert Collins)
323
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
324
can be None or a factory that will create a progress bar. This is
325
useful for testing or for overriding the bzrlib.progress heuristic.
328
* New API method get_physical_lock_status() to query locks present on a
329
transport. (Olaf Conradi)
331
* Repository.reconcile now takes a thorough keyword parameter to allow
332
requesting an indepth reconciliation, rather than just a data-loss
333
check. (Robert Collins)
335
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
336
the user for yes/no style input. (Robert Collins)
340
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
341
for testing SFTP protocol support. (Robey Pointer)
343
* Branch formats are now tested once per implementation (see bzrlib.
344
tests.branch_implementations. This is analagous to the transport
345
interface tests, and has been followed up with working tree,
346
repository and BzrDir tests. (Robert Collins)
348
* New test base class TestCaseWithTransport provides a transport aware
349
test environment, useful for testing any transport-interface using
350
code. The test suite option --transport controls the transport used
351
by this class (when its not being used as part of implementation
352
contract testing). (Robert Collins)
354
* Close logging handler on disabling the test log. This will remove the
355
handler from the internal list inside python's logging module,
356
preventing shutdown from closing it twice. (Olaf Conradi)
358
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
360
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
361
will provide String("foo") to the command as its stdin.
367
* .bzrignore is excluded from exports, on the grounds that it's a bzr
368
internal-use file and may not be wanted. (Jamie Wilkinson)
370
* The "bzr directories" command were removed in favor of the new
371
--kind option to the "bzr inventory" command. To list all
372
versioned directories, now use "bzr inventory --kind directory".
375
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
376
by default. (John Arbash Meinel)
378
* The parent of Bzr configuration directory can be set by BZR_HOME
379
environment variable. Now the path for it is searched in BZR_HOME, then
380
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
381
points to C:\Documents and Settings\User Name\Application Data), HOME.
384
* Plugins with the same name in different directories in the bzr plugin
385
path are no longer loaded: only the first successfully loaded one is
386
used. (Robert Collins)
388
* Use systems' external ssh command to open connections if possible.
389
This gives better integration with user settings such as ProxyCommand.
392
* Permissions on files underneath .bzr/ are inherited from the .bzr
393
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
394
will mean that future file will be created with group write permissions.
396
* configure.in and config.guess are no longer in the builtin default
399
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
400
files. (John Arbash Meinel, Martin Pool)
404
* "bzr INIT dir" now initializes the specified directory, and creates
405
it if it does not exist. (John Arbash Meinel)
407
* New remerge command (Aaron Bentley)
409
* Better zsh completion script. (Steve Borho)
411
* 'bzr diff' now returns 1 when there are changes in the working
412
tree. (Robert Collins)
414
* 'bzr push' now exists and can push changes to a remote location.
415
This uses the transport infrastructure, and can store the remote
416
location in the ~/.bazaar/branches.conf configuration file.
419
* Test directories are only kept if the test fails and the user requests
422
* Tweaks to short log printing
424
* Added branch nicks, new nick command, printing them in log output.
427
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
428
occurs. (Martin Pool)
430
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
431
the same as Subversion. (Martin Pool)
433
* New ftp transport support (on ftplib), for ftp:// and aftp://
434
URLs. (Daniel Silverstone)
436
* Commit editor temporary files now start with 'bzr_log.', to allow
437
text editors to match the file name and set up appropriate modes or
438
settings. (Magnus Therning)
440
* Improved performance when integrating changes from a remote weave.
441
(Goffredo Baroncelli)
443
* Sftp will attempt to cache the connection, so it is more likely that
444
a connection will be reused, rather than requiring multiple password
447
* bzr revno now takes an optional argument indicating the branch whose
448
revno should be printed. (Michael Ellerman)
450
* bzr cat defaults to printing the last version of the file.
451
(#3632, Matthieu Moy)
453
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
454
profiler. (Denys Duchier)
456
* Faster commits by reading only the headers of affected weave files.
459
* 'bzr add' now takes a --dry-run parameter which shows you what would be
460
added, but doesn't actually add anything. (Michael Ellerman)
462
* 'bzr add' now lists how many files were ignored per glob. add --verbose
463
lists the specific files. (Aaron Bentley)
465
* 'bzr missing' now supports displaying changes in diverged trees and can
466
be limited to show what either end of the comparison is missing.
467
(Aaron Bently, with a little prompting from Daniel Silverstone)
471
* SFTP can walk up to the root path without index errors. (Robert Collins)
473
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
475
* Error when run with -OO
477
* Fix bug in reporting http errors that don't have an http error code.
480
* Handle more cases of pipe errors in display commands
482
* Change status to 3 for all errors
484
* Files that are added and unlinked before committing are completely
485
ignored by diff and status
487
* Stores with some compressed texts and some uncompressed texts are now
488
able to be used. (John A Meinel)
490
* Fix for bzr pull failing sometimes under windows
492
* Fix for sftp transport under windows when using interactive auth
494
* Show files which are both renamed and modified as such in 'bzr
495
status' output. (#4503, Daniel Silverstone)
497
* Make annotate cope better with revisions committed without a valid
498
email address. (Marien Zwart)
500
* Fix representation of tab characters in commit messages. (Harald
503
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
504
now parsed properly under Windows. (Alexander Belchenko)
506
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
508
* Keep a cached copy of the basis inventory to speed up operations
509
that need to refer to it. (Johan Rydberg, Martin Pool)
511
* Fix bugs in bzr status display of non-ascii characters. (Martin
514
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
517
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
521
* Fix selftest asking for passwords when there are no SFTP keys.
522
(Robey Pointer, Jelmer Vernooij)
524
* Fix selftest run with 'python -O'. (Martin Pool)
526
* Fix HTTP tests under Windows. (John Arbash Meinel)
528
* Make tests work even if HOME is not set (Aaron Bentley)
530
* Updated build_tree to use fixed line-endings for tests which read
531
the file cotents and compare. Make some tests use this to pass under
532
Windows. (John Arbash Meinel)
534
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
536
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
539
* Use terminal width to align verbose test output. (Martin Pool)
541
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
542
If adding a new test script please add that to
543
bzrlib.tests.blackbox.__init__. (Robert Collins)
545
* Much better error message if one of the test suites can't be
546
imported. (Martin Pool)
548
* Make check now runs the test suite twice - once with the default locale,
549
and once with all locales forced to C, to expose bugs. This is not
550
trivially done within python, so for now its only triggered by running
551
Make check. Integrators and packagers who wish to check for full
552
platform support should run 'make check' to test the source.
555
* Tests can now run TestSkipped if they can't execute for any reason.
556
(Martin Pool) (NB: TestSkipped should only be raised for correctable
557
reasons - see the wiki spec ImprovingBzrTestSuite).
559
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
560
paths for the transport tests. Introduce blackbox remote sftp tests that
561
test the same permutations. (Robert Collins, Robey Pointer)
563
* Transport implementation tests are now independent of the local file
564
system, which allows tests for esoteric transports, and for features
565
not available in the local file system. They also repeat for variations
566
on the URL scheme that can introduce issues in the transport code,
567
see bzrlib.transport.TransportTestProviderAdapter() for this.
570
* TestCase.build_tree uses the transport interface to build trees, pass
571
in a transport parameter to give it an existing connection.
576
* WorkingTree.pull has been split across Branch and WorkingTree,
577
to allow Branch only pulls. (Robert Collins)
579
* commands.display_command now returns the result of the decorated
580
function. (Robert Collins)
582
* LocationConfig now has a set_user_option(key, value) call to save
583
a setting in its matching location section (a new one is created
584
if needed). (Robert Collins)
586
* Branch has two new methods, get_push_location and set_push_location
587
to respectively, get and set the push location. (Robert Collins)
589
* commands.register_command now takes an optional flag to signal that
590
the registrant is planning to decorate an existing command. When
591
given multiple plugins registering a command is not an error, and
592
the original command class (whether built in or a plugin based one) is
593
returned to the caller. There is a new error 'MustUseDecorated' for
594
signalling when a wrapping command should switch to the original
595
version. (Robert Collins)
597
* Some option parsing errors will raise 'BzrOptionError', allowing
598
granular detection for decorating commands. (Robert Collins).
600
* Branch.read_working_inventory has moved to
601
WorkingTree.read_working_inventory. This necessitated changes to
602
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
603
as well. To make it clear that a WorkingTree cannot always be obtained
604
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
605
be obtained. (Robert Collins)
607
* All pending merges operations from Branch are now on WorkingTree.
610
* The follow operations from Branch have moved to WorkingTree:
618
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
620
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
622
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
625
* bzrlib.plugin.all_plugins has been changed from an attribute to a
626
query method. (Robert Collins)
628
* New options to read only the table-of-contents of a weave.
631
* Raise NoSuchFile when someone tries to add a non-existant file.
634
* Simplify handling of DivergedBranches in cmd_pull().
638
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
639
is exposed as Branch().control_files. Also this has been altered with the
640
controlfile pre/suffix replaced by simple method names like 'get' and
641
'put'. (Aaron Bentley, Robert Collins).
643
* Deprecated functions and methods can now be marked as such using the
644
bzrlib.symbol_versioning module. Marked method have their docstring
645
updated and will issue a DeprecationWarning using the warnings module
646
when they are used. (Robert Collins)
648
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
649
for functions that need unicode strings. (Robert Collins)
655
* pull now takes --verbose to show you what revisions are added or removed
658
* merge now takes a --show-base option to include the base text in
662
* The config files are now read using ConfigObj, so '=' should be used as
663
a separator, not ':'.
666
* New 'bzr commit --strict' option refuses to commit if there are
667
any unknown files in the tree. To commit, make sure all files are
668
either ignored, added, or deleted. (Michael Ellerman)
670
* The config directory is now ~/.bazaar, and there is a single file
671
~/.bazaar/bazaar.conf storing email, editor and other preferences.
674
* 'bzr add' no longer takes a --verbose option, and a --quiet option
675
has been added that suppresses all output.
677
* Improved zsh completion support in contrib/zsh, from Clint
680
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
683
* 'bzr check' now accepts -v for verbose reporting, and checks for
684
ghosts in the branch. (Robert Collins)
686
* New command 're-sign' which will regenerate the gpg signature for
687
a revision. (Robert Collins)
689
* If you set check_signatures=require for a path in
690
~/.bazaar/branches.conf then bzr will invoke your
691
gpg_signing_command (defaults to gpg) and record a digital signature
692
of your commit. (Robert Collins)
694
* New sftp transport, based on Paramiko. (Robey Pointer)
696
* 'bzr pull' now accepts '--clobber' which will discard local changes
697
and make this branch identical to the source branch. (Robert Collins)
699
* Just give a quieter warning if a plugin can't be loaded, and
700
put the details in .bzr.log. (Martin Pool)
702
* 'bzr branch' will now set the branch-name to the last component of the
703
output directory, if one was supplied.
705
* If the option 'post_commit' is set to one (or more) python function
706
names (must be in the bzrlib namespace), then they will be invoked
707
after the commit has completed, with the branch and revision_id as
708
parameters. (Robert Collins)
710
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
712
* --merge-type weave is now supported for file contents. Tree-shape
713
changes are still three-way based. (Martin Pool, Aaron Bentley)
715
* 'bzr check' allows the first revision on revision-history to have
716
parents - something that is expected for cheap checkouts, and occurs
717
when conversions from baz do not have all history. (Robert Collins).
719
* 'bzr merge' can now graft unrelated trees together, if your specify
720
0 as a base. (Aaron Bentley)
722
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
725
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
727
* 'bzr merge --reprocess' minimizes conflicts
731
* The 'bzr selftest --pattern' option for has been removed, now
732
test specifiers on the command line can be simple strings, or
733
regexps, or both. (Robert Collins)
735
* Passing -v to selftest will now show the time each test took to
736
complete, which will aid in analysing performance regressions and
737
related questions. (Robert Collins)
739
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
740
is given. (Martin Pool)
742
* There is a new method for TestCaseInTempDir, assertFileEqual, which
743
will check that a given content is equal to the content of the named
744
file. (Robert Collins)
746
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
751
* New 'testament' command and concept for making gpg-signatures
752
of revisions that are not tied to a particular internal
753
representation. (Martin Pool).
755
* Per-revision properties ('revprops') as key-value associated
756
strings on each revision created when the revision is committed.
757
Intended mainly for the use of external tools. (Martin Pool).
759
* Config options have moved from bzrlib.osutils to bzrlib.config.
762
* Improved command line option definitions allowing explanations
763
for individual options, among other things. Contributed by
766
* Config options have moved from bzrlib.osutils to bzrlib.config.
767
Configuration is now done via the config.Config interface:
768
Depending on whether you have a Branch, a Location or no information
769
available, construct a *Config, and use its signature_checking,
770
username and user_email methods. (Robert Collins)
772
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
773
they are made available for other plugins to use. You should not
774
import other plugins during the __init__ of your plugin though, as
775
no ordering is guaranteed, and the plugins directory is not on the
776
python path. (Robert Collins)
778
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
779
no longer takes an inventory, rather it takes an option branch
780
parameter, and if None is given will open the branch at basedir
781
implicitly. (Robert Collins)
783
* Cleaner exception structure and error reporting. Suggested by
784
Scott James Remnant. (Martin Pool)
786
* Branch.remove has been moved to WorkingTree, which has also gained
787
lock_read, lock_write and unlock methods for convenience. (Robert
790
* Two decorators, needs_read_lock and needs_write_lock have been added
791
to the branch module. Use these to cause a function to run in a
792
read or write lock respectively. (Robert Collins)
794
* Branch.open_containing now returns a tuple (Branch, relative-path),
795
which allows direct access to the common case of 'get me this file
796
from its branch'. (Robert Collins)
798
* Transports can register using register_lazy_transport, and they
799
will be loaded when first used. (Martin Pool)
801
* 'pull' has been factored out of the command as WorkingTree.pull().
802
A new option to WorkingTree.pull has been added, clobber, which will
803
ignore diverged history and pull anyway.
806
* config.Config has a 'get_user_option' call that accepts an option name.
807
This will be looked up in branches.conf and bazaar.conf as normal.
808
It is intended that this be used by plugins to support options -
809
options of built in programs should have specific methods on the config.
812
* merge.merge_inner now has tempdir as an optional parameter. (Robert
815
* Tree.kind is not recorded at the top level of the hierarchy, as it was
816
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
819
* WorkingTree.__del__ has been removed, it was non deterministic and not
820
doing what it was intended to. See WorkingTree.__init__ for a comment
821
about future directions. (Robert Collins/Martin Pool)
823
* bzrlib.transport.http has been modified so that only 404 urllib errors
824
are returned as NoSuchFile. Other exceptions will propogate as normal.
825
This allows debuging of actual errors. (Robert Collins)
827
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
828
to apis like 'put', 'get' and 'has'. This is to provide consistent
829
behaviour - it operates on url's only. (Robert Collins)
831
* Transports can register using register_lazy_transport, and they
832
will be loaded when first used. (Martin Pool)
834
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
835
is called by merge_inner. This is so that the conflict count can be
836
retrieved (and potentially manipulated) before returning to the caller
837
of merge_inner. Likewise 'merge' now returns the conflict count to the
838
caller. (Robert Collins)
840
* 'revision.revision_graph can handle having only partial history for
841
a revision - that is no revisions in the graph with no parents.
844
* New builtins.branch_files uses the standard file_list rules to produce
845
a branch and a list of paths, relative to that branch (Aaron Bentley)
847
* New TestCase.addCleanup facility.
849
* New bzrlib.version_info tuple (similar to sys.version_info), which can
850
be used by programs importing bzrlib.
854
* Better handling of branches in directories with non-ascii names.
855
(Joel Rosdahl, Panagiotis Papadakos)
857
* Upgrades of trees with no commits will not fail due to accessing
858
[-1] in the revision-history. (Andres Salomon)
865
* Fix problem in pulling over http from machines that do not
866
allow directories to be listed.
868
* Avoid harmless warning about invalid hash cache after
869
upgrading branch format.
873
* Avoid some unnecessary http operations in branch and pull.
880
* 'bzr branch' over http initially gives a very high estimate
881
of completion time but it should fall as the first few
882
revisions are pulled in. branch is still slow on
883
high-latency connections.
887
* bzr-man.py has been updated to work again. Contributed by
890
* Locking is now done with fcntl.lockf which works with NFS
891
file systems. Contributed by Harald Meland.
893
* When a merge encounters a file that has been deleted on
894
one side and modified on the other, the old contents are
895
written out to foo.BASE and foo.SIDE, where SIDE is this
896
or OTHER. Contributed by Aaron Bentley.
898
* Export was choosing incorrect file paths for the content of
899
the tarball, this has been fixed by Aaron Bentley.
901
* Commit will no longer commit without a log message, an
902
error is returned instead. Contributed by Jelmer Vernooij.
904
* If you commit a specific file in a sub directory, any of its
905
parent directories that are added but not listed will be
906
automatically included. Suggested by Michael Ellerman.
908
* bzr commit and upgrade did not correctly record new revisions
909
for files with only a change to their executable status.
910
bzr will correct this when it encounters it. Fixed by
913
* HTTP tests now force off the use of http_proxy for the duration.
914
Contributed by Gustavo Niemeyer.
916
* Fix problems in merging weave-based branches that have
917
different partial views of history.
919
* Symlink support: working with symlinks when not in the root of a
920
bzr tree was broken, patch from Scott James Remnant.
925
* 'branch' now accepts a --basis parameter which will take advantage
926
of local history when making a new branch. This allows faster
927
branching of remote branches. Contributed by Aaron Bentley.
929
* New tree format based on weave files, called version 5.
930
Existing branches can be upgraded to this format using
933
* Symlinks are now versionable. Initial patch by
934
Erik Toubro Nielsen, updated to head by Robert Collins.
936
* Executable bits are tracked on files. Patch from Gustavo
939
* 'bzr status' now shows unknown files inside a selected directory.
940
Patch from Heikki Paajanen.
942
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
943
and 'resolve' have needed added, which list and remove those
944
merge conflicts respectively. A conflicted tree cannot be committed
945
in. Contributed by Aaron Bentley.
947
* 'rm' is now an alias for 'remove'.
949
* Stores now split out their content in a single byte prefixed hash,
950
dropping the density of files per directory by 256. Contributed by
953
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
954
Contributed by Robert Collins.
956
* 'bzr log' with the default formatter will show merged revisions,
957
indented to the right. Initial implementation contributed by Gustavo
958
Niemeyer, made incremental by Robert Collins.
963
* Test case failures have the exception printed after the log
964
for your viewing pleasure.
966
* InventoryEntry is now an abstract base class, use one of the
967
concrete InventoryDirectory etc classes instead.
969
* Branch raises an UnsupportedFormatError when it detects a
970
bzr branch it cannot understand. This allows for precise
971
handling of such circumstances.
976
* Removed testsweet module so that tests can be run after
977
bzr installed by 'bzr selftest'.
979
* 'bzr selftest' command-line arguments can now be partial ids
980
of tests to run, e.g. 'bzr selftest test_weave'
987
* Fixed "branch -r" option.
989
* Fix remote access to branches containing non-compressed history.
992
* Better reliability of http server tests. (John Arbash-Meinel)
994
* Merge graph maximum distance calculation fix. (Aaron Bentley)
996
* Various minor bug in windows support have been fixed, largely in the
997
test suite. Contributed by Alexander Belchenko.
1001
* Status now accepts a -r argument to give status between chosen
1002
revisions. Contributed by Heikki Paajanen.
1004
* Revision arguments no longer use +/-/= to control ranges, instead
1005
there is a 'before' namespace, which limits the successive namespace.
1006
For example '$ bzr log -r date:yesterday..before:date:today' will
1007
select everything from yesterday and before today. Contributed by
1010
* There is now a bzr.bat file created by distutils when building on
1011
Windows. Contributed by Alexander Belchenko.
1015
* Removed uuid() as it was unused.
1017
* Improved 'fetch' code for pulling revisions from one branch into
1018
another (used by pull, merged, etc.)
1021
bzr 0.0.8 2005-09-20
1025
* Adding a file whose parent directory is not versioned will
1026
implicitly add the parent, and so on up to the root. This means
1027
you should never need to explictly add a directory, they'll just
1028
get added when you add a file in the directory. Contributed by
1031
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1034
* If you set BZR_EDITOR in the environment, it is checked in
1035
preference to EDITOR and the config file for the interactive commit
1036
editing program. Related to this is a bugfix where a missing program
1037
set in EDITOR would cause editing to fail, now the fallback program
1038
for the operating system is still tried.
1040
* Files that are not directories/symlinks/regular files will no longer
1041
cause bzr to fail, it will just ignore them by default. You cannot add
1042
them to the tree though - they are not versionable.
1047
* Refactor xml packing/unpacking.
1051
* Fixed 'bzr mv' by Ollie Rutherfurd.
1053
* Fixed strange error when trying to access a nonexistent http
1056
* Make sure that the hashcache gets written out if it can't be
1062
* Various Windows fixes from Ollie Rutherfurd.
1064
* Quieten warnings about locking; patch from Matt Lavin.
1067
bzr-0.0.7 2005-09-02
1071
* ``bzr shell-complete`` command contributed by Clint Adams to
1072
help with intelligent shell completion.
1074
* New expert command ``bzr find-merge-base`` for debugging merges.
1079
* Much better merge support.
1081
* merge3 conflicts are now reported with markers like '<<<<<<<'
1082
(seven characters) which is the same as CVS and pleases things
1088
* ``bzr upgrade`` no longer fails when trying to fix trees that
1089
mention revisions that are not present.
1091
* Fixed bugs in listing plugins from ``bzr plugins``.
1093
* Fix case of $EDITOR containing options for the editor.
1095
* Fix log -r refusing to show the last revision.
1096
(Patch from Goffredo Baroncelli.)
1101
* ``bzr log --show-ids`` shows the revision ids of all parents.
1103
* Externally provided commands on your $BZRPATH no longer need
1104
to recognize --bzr-usage to work properly, and can just handle
1110
* Changed trace messages to go through the standard logging
1111
framework, so that they can more easily be redirected by
1116
bzr-0.0.6 2005-08-18
1120
* Python plugins, automatically loaded from the directories on
1121
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1123
* New 'bzr mkdir' command.
1125
* Commit mesage is fetched from an editor if not given on the
1126
command line; patch from Torsten Marek.
1128
* ``bzr log -m FOO`` displays commits whose message matches regexp
1131
* ``bzr add`` with no arguments adds everything under the current directory.
1133
* ``bzr mv`` does move or rename depending on its arguments, like
1136
* ``bzr missing`` command shows a summary of the differences
1137
between two trees. (Merged from John Arbash-Meinel.)
1139
* An email address for commits to a particular tree can be
1140
specified by putting it into .bzr/email within a branch. (Based
1141
on a patch from Heikki Paajanen.)
1146
* Faster working tree operations.
1151
* 3rd-party modules shipped with bzr are copied within the bzrlib
1152
python package, so that they can be installed by the setup
1153
script without clashing with anything already existing on the
1154
system. (Contributed by Gustavo Niemeyer.)
1156
* Moved plugins directory to bzrlib/, so that there's a standard
1157
plugin directory which is not only installed with bzr itself but
1158
is also available when using bzr from the development tree.
1159
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1160
standard plugins directory.
1162
* When exporting to a tarball with ``bzr export --format tgz``, put
1163
everything under a top directory rather than dumping it into the
1164
current directory. This can be overridden with the ``--root``
1165
option. Patch from William Dodé and John Meinel.
1167
* New ``bzr upgrade`` command to upgrade the format of a branch,
1168
replacing ``bzr check --update``.
1170
* Files within store directories are no longer marked readonly on
1173
* Changed ``bzr log`` output to a more compact form suggested by
1174
John A Meinel. Old format is available with the ``--long`` or
1175
``-l`` option, patched by William Dodé.
1177
* By default the commit command refuses to record a revision with
1178
no changes unless the ``--unchanged`` option is given.
1180
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1181
line options must come before the command name because they
1182
affect what commands are available; all other options must come
1183
after the command name because their interpretation depends on
1186
* ``branch`` and ``clone`` added as aliases for ``branch``.
1188
* Default log format is back to the long format; the compact one
1189
is available with ``--short``.
1194
* Fix bugs in committing only selected files or within a subdirectory.
1197
bzr-0.0.5 2005-06-15
1201
* ``bzr`` with no command now shows help rather than giving an
1202
error. Suggested by Michael Ellerman.
1204
* ``bzr status`` output format changed, because svn-style output
1205
doesn't really match the model of bzr. Now files are grouped by
1206
status and can be shown with their IDs. ``bzr status --all``
1207
shows all versioned files and unknown files but not ignored files.
1209
* ``bzr log`` runs from most-recent to least-recent, the reverse
1210
of the previous order. The previous behaviour can be obtained
1211
with the ``--forward`` option.
1213
* ``bzr inventory`` by default shows only filenames, and also ids
1214
if ``--show-ids`` is given, in which case the id is the second
1220
* New 'bzr whoami --email' option shows only the email component
1221
of the user identification, from Jo Vermeulen.
1223
* New ``bzr ignore PATTERN`` command.
1225
* Nicer error message for broken pipe, interrupt and similar
1226
conditions that don't indicate an internal error.
1228
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1230
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1231
either read or write mode.
1233
* New option ``bzr log --show-ids`` shows revision and file ids.
1235
* New usage ``bzr log FILENAME`` shows only revisions that
1238
* Changed format for describing changes in ``bzr log -v``.
1240
* New option ``bzr commit --file`` to take a message from a file,
1241
suggested by LarstiQ.
1243
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1244
Oler. File may be in a branch other than the working directory.
1246
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1249
* Commands can now be defined by external programs or scripts
1250
in a directory on $BZRPATH.
1252
* New "stat cache" avoids reading the contents of files if they
1253
haven't changed since the previous time.
1255
* If the Python interpreter is too old, try to find a better one
1256
or give an error. Based on a patch from Fredrik Lundh.
1258
* New optional parameter ``bzr info [BRANCH]``.
1260
* New form ``bzr commit SELECTED`` to commit only selected files.
1262
* New form ``bzr log -r FROM:TO`` shows changes in selected
1263
range; contributed by John A Meinel.
1265
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1266
options through to an external GNU diff.
1268
* New option ``bzr add --no-recurse`` to add a directory but not
1271
* ``bzr --version`` now shows more information if bzr is being run
1277
* Fixed diff format so that added and removed files will be
1278
handled properly by patch. Fix from Lalo Martins.
1280
* Various fixes for files whose names contain spaces or other
1286
* Converted black-box test suites from Bourne shell into Python;
1287
now run using ``./testbzr``. Various structural improvements to
1290
* testbzr by default runs the version of bzr found in the same
1291
directory as the tests, or the one given as the first parameter.
1293
* testbzr also runs the internal tests, so the only command
1294
required to check is just ``./testbzr``.
1296
* testbzr requires python2.4, but can be used to test bzr running
1297
under a different version.
1299
* Tests added for many other changes in this release.
1304
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1306
* Refactor command functions into Command objects based on HCT by
1307
Scott James Remnant.
1309
* Better help messages for many commands.
1311
* Expose bzrlib.open_tracefile() to start the tracefile; until
1312
this is called trace messages are just discarded.
1314
* New internal function find_touching_revisions() and hidden
1315
command touching-revisions trace the changes to a given file.
1317
* Simpler and faster compare_inventories() function.
1319
* bzrlib.open_tracefile() takes a tracefilename parameter.
1321
* New AtomicFile class.
1323
* New developer commands ``added``, ``modified``.
1328
* Cope on Windows on python2.3 by using the weaker random seed.
1329
2.4 is now only recommended.
1332
bzr-0.0.4 2005-04-22
1336
* 'bzr diff' optionally takes a list of files to diff. Still a bit
1337
basic. Patch from QuantumG.
1339
* More default ignore patterns.
1341
* New 'bzr log --verbose' shows a list of files changed in the
1342
changeset. Patch from Sebastian Cote.
1344
* Roll over ~/.bzr.log if it gets too large.
1346
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
1349
* New 'bzr help commands' based on a patch from Denys Duchier.
1354
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
1355
or $EMAIL. All are decoded by the locale preferred encoding.
1356
If none of these are present user@hostname is used. The host's
1357
fully-qualified name is not used because that tends to fail when
1358
there are DNS problems.
1360
* New 'bzr whoami' command instead of username user-email.
1365
* Make commit safe for hardlinked bzr trees.
1367
* Some Unicode/locale fixes.
1369
* Partial workaround for difflib.unified_diff not handling
1370
trailing newlines properly.
1375
* Allow docstrings for help to be in PEP0257 format. Patch from
1378
* More tests in test.sh.
1380
* Write profile data to a temporary file not into working
1381
directory and delete it when done.
1383
* Smaller .bzr.log with process ids.
1388
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
1391
* Some improvements in handling paths on Windows, based on a patch
1395
bzr-0.0.3 2005-04-06
1399
* New "directories" internal command lists versioned directories
1402
* Can now say "bzr commit --help".
1404
* New "rename" command to rename one file to a different name
1407
* New "move" command to move one or more files into a different
1410
* New "renames" command lists files renamed since base revision.
1412
* New cat command contributed by janmar.
1416
* .bzr.log is placed in $HOME (not pwd) and is always written in
1417
UTF-8. (Probably not a completely good long-term solution, but
1422
* Workaround for difflib bug in Python 2.3 that causes an
1423
exception when comparing empty files. Reported by Erik Toubro
1428
* Refactored inventory storage to insert a root entry at the top.
1432
* Start of shell-based black-box testing in test.sh.
1439
* Win32 fixes from Steve Brown.
1442
bzr-0.0.2 "black cube" 2005-03-31
1446
* Default ignore list extended (see bzrlib/__init__.py).
1448
* Patterns in .bzrignore are now added to the default ignore list,
1449
rather than replacing it.
1451
* Ignore list isn't reread for every file.
1455
* Reinstate the 'bzr check' command to check invariants of the
1458
* New 'ignored' command lists which files are ignored and why;
1459
'deleted' lists files deleted in the current working tree.
1461
* Performance improvements.
1463
* New global --profile option.
1465
* Ignore patterns like './config.h' now correctly match files in
1466
the root directory only.
1469
bzr-0.0.1 2005-03-26
1473
* More information from info command.
1475
* Can now say "bzr help COMMAND" for more detailed help.
1477
* Less file flushing and faster performance when writing logs and
1478
committing to stores.
1480
* More useful verbose output from some commands.
1484
* Fix inverted display of 'R' and 'M' during 'commit -v'.
1488
* Include a subset of ElementTree-1.2.20040618 to make
1489
installation easier.
1491
* Fix time.localtime call to work with Python 2.3 (the minimum
1495
bzr-0.0.0.69 2005-03-22
1499
* First public release.
1501
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
