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
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
24
profile data for the individual profiled calls, allowing for fine
25
grained analysis of performance.
26
(Robert Collins, Martin Pool).
28
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
29
where commit can take an appreciable time. (Robert Collins)
31
* 'bzr add' is now less verbose in telling you what ignore globs were
32
matched by files being ignored. Instead it just tells you how many
33
were ignored (because you might reasonably be expecting none to be
34
ignored). 'bzr add -v' is unchanged and will report every ignored
35
file. (Robert Collins).
37
* ftp now has a test server if medusa is installed. As part of testing,
38
ftp support has been improved, including support for supplying a
39
non-standard port. (John Arbash Meinel).
41
* ``log --line`` shows the revision number. (#5162, Alexander Belchenko)
45
* Fix shadowed definition of TestLocationConfig that caused some
46
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
51
* Combine the ignore rules into a single regex rather than looping over
52
them to reduce the threshold where N^2 behaviour occurs in operations
53
like status. (Jan Hudec, Robert Collins).
55
* 'bzr push' should only push the ancestry of the current revision, not
56
all of the history in the repository. This is especially important for
57
shared repositories. (John Arbash Meinel)
59
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
60
rather than randomly walking the inventories. (John Arbash Meinel)
66
* setup.py failed to install launchpad plugin. (Martin Pool)
72
* Fix failure to commit a merge in a checkout. (Martin Pool,
73
Robert Collins, Erik Bågfors, #43959)
75
* Nicer messages from 'commit' in the case of renames, and correct
76
messages when a merge has occured. (Robert Collins, Martin Pool)
78
* Separate functionality from assert statements as they are skipped in
79
optimized mode of python. Add the same check to pending merges.
80
(#44443, Olaf Conradi)
84
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
86
* Add info on standalone branches without a working tree.
87
(#44155, Olaf Conradi)
89
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
93
* Make editor invocation comply with Debian Policy. First check
94
environment variables VISUAL and EDITOR, then try editor from
95
alternatives system. If that all fails, fall back to the pre-defined
96
list of editors. (#42904, Olaf Conradi)
100
* New 'register-branch' command registers a public branch into
101
Launchpad.net, where it can be associated with bugs, etc.
102
(Martin Pool, Bjorn Tillenius, Robert Collins)
106
* New public api in InventoryEntry - 'describe_change(old, new)' which
107
provides a human description of the changes between two old and
108
new. (Robert Collins, Martin Pool)
112
* Fix test case for bzr info in upgrading a standalone branch to metadir,
113
uses bzrlib api now. (Olaf Conradi)
117
NOTES WHEN UPGRADING:
119
Release 0.8 of bzr introduces a new format for history storage, called
120
'knit', as an evolution of to the 'weave' format used in 0.7. Local
121
and remote operations are faster using knits than weaves. Several
122
operations including 'init', 'init-repo', and 'upgrade' take a
123
--format option that controls this. Branching from an existing branch
124
will keep the same format.
126
It is possible to merge, pull and push between branches of different
127
formats but this is slower than moving data between homogenous
128
branches. It is therefore recommended (but not required) that you
129
upgrade all branches for a project at the same time. Information on
130
formats is shown by 'bzr info'.
132
bzr 0.8 now allows creation of 'repositories', which hold the history
133
of files and revisions for several branches. Previously bzr kept all
134
the history for a branch within the .bzr directory at the root of the
135
branch, and this is still the default. To create a repository, use
136
the new 'bzr init-repo' command. Branches exist as directories under
137
the repository and contain just a small amount of information
138
indicating the current revision of the branch.
140
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
141
subversion. Checkouts are associated with a branch (optionally in a
142
repository), which contains all the historical information. The
143
result is that a checkout can be deleted without losing any
144
already-committed revisions. A new 'update' command is also available.
146
Repositories and checkouts are not supported with the 0.7 storage
147
format. To use them you must upgrad to either knits, or to the
148
'metaweave' format, which uses weaves but changes the .bzr directory
154
* Sftp paths can now be relative, or local, according to the lftp
155
convention. Paths now take the form:
156
sftp://user:pass@host:port/~/relative/path
158
sftp://user:pass@host:port/absolute/path
160
* The FTP transport now tries to reconnect after a temporary
161
failure. ftp put is made atomic. (Matthieu Moy)
163
* The FTP transport now maintains a pool of connections, and
164
reuses them to avoid multiple connections to the same host (like
165
sftp did). (Daniel Silverstone)
167
* The bzr_man.py file has been removed. To create the man page now,
168
use ./generate_docs.py man. The new program can also create other files.
169
Run "python generate_docs.py --help" for usage information. (Hans
170
Ulrich Niedermann & James Blackwell).
172
* Man Page now gives full help (James Blackwell). Help also updated to
173
reflect user config now being stored in .bazaar (Hans Ulrich
176
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
178
* Pull now accepts a --revision argument (Erik Bågfors)
180
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
181
line. You can now use the following command to sign all of your old commits.
182
find .bzr/revision-store// -name my@email-* \
183
| sed 's/.*\/\/..\///' \
186
* Upgrade can now upgrade over the network. (Robert Collins)
188
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
189
behaviour. By default they will cache history in the checkout, but
190
with --lightweight almost all data is kept in the master branch.
193
* 'revert' unversions newly-versioned files, instead of deleting them.
195
* 'merge' is more robust. Conflict messages have changed.
197
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
200
* Default log format can be set in configuration and plugins can register
201
their own formatters. (Erik Bågfors)
203
* New 'reconcile' command will check branch consistency and repair indexes
204
that can become out of sync in pre 0.8 formats. (Robert Collins,
207
* New 'bzr init --format' and 'bzr upgrade --format' option to control
208
what storage format is created or produced. (Robert Collins,
211
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
213
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
215
* New 'init-repository' command, plus support for repositories in 'init'
216
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
218
* Improve output of 'info' command. Show all relevant locations related to
219
working tree, branch and repository. Use kibibytes for binary quantities.
220
Fix off-by-one error in missing revisions of working tree. Make 'info'
221
work on branches, repositories and remote locations. Show locations
222
relative to the shared repository, if applicable. Show locking status
223
of locations. (Olaf Conradi)
225
* Diff and merge now safely handle binary files. (Aaron Bentley)
227
* 'pull' and 'push' now normalise the revision history, so that any two
228
branches with the same tip revision will have the same output from 'log'.
231
* 'merge' accepts --remember option to store parent location, like 'push'
232
and 'pull'. (Olaf Conradi)
234
* bzr status and diff when files given as arguments do not exist
235
in the relevant trees. (Martin Pool, #3619)
237
* Add '.hg' to the default ignore list. (Martin Pool)
239
* 'knit' is now the default disk format. This improves disk performance and
240
utilization, increases incremental pull performance, robustness with SFTP
241
and allows checkouts over SFTP to perform acceptably.
242
The initial Knit code was contributed by Johan Rydberg based on a
243
specification by Martin Pool.
244
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
246
* New tool to generate all-in-one html version of the manual. (Alexander
249
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
250
to be left in the SFTP repository. (Robert Collins, Martin Pool).
252
* New option 'diff --prefix' to control how files are named in diff
253
output, with shortcuts '-p0' and '-p1' corresponding to the options for
254
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
256
* Add --revision option to 'annotate' command. (Olaf Conradi)
258
* Add --revision option to 'annotate' command. (Olaf Conradi)
260
* If bzr shows an unexpected revision-history after pulling (perhaps due
261
to a reweave) it can now be corrected by 'bzr reconcile'.
266
* Commit is now verbose by default, and shows changed filenames and the
267
new revision number. (Robert Collins, Martin Pool)
269
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
271
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
273
* Make 'pull' and 'push' remember location on failure using --remember.
276
* For compatibility, make old format for using weaves inside metadir
277
available as 'metaweave' format. Rename format 'metadir' to 'default'.
278
Clean up help for option --format in commands 'init', 'init-repo' and
279
'upgrade'. (Olaf Conradi)
283
* The internal storage of history, and logical branch identity have now
284
been split into Branch, and Repository. The common locking and file
285
management routines are now in bzrlib.lockablefiles.
286
(Aaron Bentley, Robert Collins, Martin Pool)
288
* Transports can now raise DependencyNotPresent if they need a library
289
which is not installed, and then another implementation will be
292
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
295
* Using Tree Transform for merge, revert, tree-building
297
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
298
Branch.initialize are now deprecated. Please see BzrDir.create_* for
299
replacement API's. (Robert Collins)
301
* New BzrDir class represents the .bzr control directory and manages
302
formatting issues. (Robert Collins)
304
* New repository.InterRepository class encapsulates Repository to
305
Repository actions and allows for clean selection of optimised code
306
paths. (Robert Collins)
308
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
309
please use 'branch.fetch' or 'repository.fetch' depending on your
310
needs. (Robert Collins)
312
* deprecated methods now have a 'is_deprecated' flag on them that can
313
be checked, if you need to determine whether a given callable is
314
deprecated at runtime. (Robert Collins)
316
* Progress bars are now nested - see
317
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
319
* New API call get_format_description() for each type of format.
322
* Changed branch.set_parent() to accept None to remove parent.
325
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
327
* WorkingTree.branch is now a read only property. (Robert Collins)
329
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
330
can be None or a factory that will create a progress bar. This is
331
useful for testing or for overriding the bzrlib.progress heuristic.
334
* New API method get_physical_lock_status() to query locks present on a
335
transport. (Olaf Conradi)
337
* Repository.reconcile now takes a thorough keyword parameter to allow
338
requesting an indepth reconciliation, rather than just a data-loss
339
check. (Robert Collins)
341
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
342
the user for yes/no style input. (Robert Collins)
346
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
347
for testing SFTP protocol support. (Robey Pointer)
349
* Branch formats are now tested once per implementation (see bzrlib.
350
tests.branch_implementations. This is analagous to the transport
351
interface tests, and has been followed up with working tree,
352
repository and BzrDir tests. (Robert Collins)
354
* New test base class TestCaseWithTransport provides a transport aware
355
test environment, useful for testing any transport-interface using
356
code. The test suite option --transport controls the transport used
357
by this class (when its not being used as part of implementation
358
contract testing). (Robert Collins)
360
* Close logging handler on disabling the test log. This will remove the
361
handler from the internal list inside python's logging module,
362
preventing shutdown from closing it twice. (Olaf Conradi)
364
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
366
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
367
will provide String("foo") to the command as its stdin.
373
* .bzrignore is excluded from exports, on the grounds that it's a bzr
374
internal-use file and may not be wanted. (Jamie Wilkinson)
376
* The "bzr directories" command were removed in favor of the new
377
--kind option to the "bzr inventory" command. To list all
378
versioned directories, now use "bzr inventory --kind directory".
381
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
382
by default. (John Arbash Meinel)
384
* The parent of Bzr configuration directory can be set by BZR_HOME
385
environment variable. Now the path for it is searched in BZR_HOME, then
386
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
387
points to C:\Documents and Settings\User Name\Application Data), HOME.
390
* Plugins with the same name in different directories in the bzr plugin
391
path are no longer loaded: only the first successfully loaded one is
392
used. (Robert Collins)
394
* Use systems' external ssh command to open connections if possible.
395
This gives better integration with user settings such as ProxyCommand.
398
* Permissions on files underneath .bzr/ are inherited from the .bzr
399
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
400
will mean that future file will be created with group write permissions.
402
* configure.in and config.guess are no longer in the builtin default
405
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
406
files. (John Arbash Meinel, Martin Pool)
410
* "bzr INIT dir" now initializes the specified directory, and creates
411
it if it does not exist. (John Arbash Meinel)
413
* New remerge command (Aaron Bentley)
415
* Better zsh completion script. (Steve Borho)
417
* 'bzr diff' now returns 1 when there are changes in the working
418
tree. (Robert Collins)
420
* 'bzr push' now exists and can push changes to a remote location.
421
This uses the transport infrastructure, and can store the remote
422
location in the ~/.bazaar/branches.conf configuration file.
425
* Test directories are only kept if the test fails and the user requests
428
* Tweaks to short log printing
430
* Added branch nicks, new nick command, printing them in log output.
433
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
434
occurs. (Martin Pool)
436
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
437
the same as Subversion. (Martin Pool)
439
* New ftp transport support (on ftplib), for ftp:// and aftp://
440
URLs. (Daniel Silverstone)
442
* Commit editor temporary files now start with 'bzr_log.', to allow
443
text editors to match the file name and set up appropriate modes or
444
settings. (Magnus Therning)
446
* Improved performance when integrating changes from a remote weave.
447
(Goffredo Baroncelli)
449
* Sftp will attempt to cache the connection, so it is more likely that
450
a connection will be reused, rather than requiring multiple password
453
* bzr revno now takes an optional argument indicating the branch whose
454
revno should be printed. (Michael Ellerman)
456
* bzr cat defaults to printing the last version of the file.
457
(#3632, Matthieu Moy)
459
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
460
profiler. (Denys Duchier)
462
* Faster commits by reading only the headers of affected weave files.
465
* 'bzr add' now takes a --dry-run parameter which shows you what would be
466
added, but doesn't actually add anything. (Michael Ellerman)
468
* 'bzr add' now lists how many files were ignored per glob. add --verbose
469
lists the specific files. (Aaron Bentley)
471
* 'bzr missing' now supports displaying changes in diverged trees and can
472
be limited to show what either end of the comparison is missing.
473
(Aaron Bently, with a little prompting from Daniel Silverstone)
477
* SFTP can walk up to the root path without index errors. (Robert Collins)
479
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
481
* Error when run with -OO
483
* Fix bug in reporting http errors that don't have an http error code.
486
* Handle more cases of pipe errors in display commands
488
* Change status to 3 for all errors
490
* Files that are added and unlinked before committing are completely
491
ignored by diff and status
493
* Stores with some compressed texts and some uncompressed texts are now
494
able to be used. (John A Meinel)
496
* Fix for bzr pull failing sometimes under windows
498
* Fix for sftp transport under windows when using interactive auth
500
* Show files which are both renamed and modified as such in 'bzr
501
status' output. (#4503, Daniel Silverstone)
503
* Make annotate cope better with revisions committed without a valid
504
email address. (Marien Zwart)
506
* Fix representation of tab characters in commit messages. (Harald
509
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
510
now parsed properly under Windows. (Alexander Belchenko)
512
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
514
* Keep a cached copy of the basis inventory to speed up operations
515
that need to refer to it. (Johan Rydberg, Martin Pool)
517
* Fix bugs in bzr status display of non-ascii characters. (Martin
520
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
523
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
527
* Fix selftest asking for passwords when there are no SFTP keys.
528
(Robey Pointer, Jelmer Vernooij)
530
* Fix selftest run with 'python -O'. (Martin Pool)
532
* Fix HTTP tests under Windows. (John Arbash Meinel)
534
* Make tests work even if HOME is not set (Aaron Bentley)
536
* Updated build_tree to use fixed line-endings for tests which read
537
the file cotents and compare. Make some tests use this to pass under
538
Windows. (John Arbash Meinel)
540
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
542
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
545
* Use terminal width to align verbose test output. (Martin Pool)
547
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
548
If adding a new test script please add that to
549
bzrlib.tests.blackbox.__init__. (Robert Collins)
551
* Much better error message if one of the test suites can't be
552
imported. (Martin Pool)
554
* Make check now runs the test suite twice - once with the default locale,
555
and once with all locales forced to C, to expose bugs. This is not
556
trivially done within python, so for now its only triggered by running
557
Make check. Integrators and packagers who wish to check for full
558
platform support should run 'make check' to test the source.
561
* Tests can now run TestSkipped if they can't execute for any reason.
562
(Martin Pool) (NB: TestSkipped should only be raised for correctable
563
reasons - see the wiki spec ImprovingBzrTestSuite).
565
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
566
paths for the transport tests. Introduce blackbox remote sftp tests that
567
test the same permutations. (Robert Collins, Robey Pointer)
569
* Transport implementation tests are now independent of the local file
570
system, which allows tests for esoteric transports, and for features
571
not available in the local file system. They also repeat for variations
572
on the URL scheme that can introduce issues in the transport code,
573
see bzrlib.transport.TransportTestProviderAdapter() for this.
576
* TestCase.build_tree uses the transport interface to build trees, pass
577
in a transport parameter to give it an existing connection.
582
* WorkingTree.pull has been split across Branch and WorkingTree,
583
to allow Branch only pulls. (Robert Collins)
585
* commands.display_command now returns the result of the decorated
586
function. (Robert Collins)
588
* LocationConfig now has a set_user_option(key, value) call to save
589
a setting in its matching location section (a new one is created
590
if needed). (Robert Collins)
592
* Branch has two new methods, get_push_location and set_push_location
593
to respectively, get and set the push location. (Robert Collins)
595
* commands.register_command now takes an optional flag to signal that
596
the registrant is planning to decorate an existing command. When
597
given multiple plugins registering a command is not an error, and
598
the original command class (whether built in or a plugin based one) is
599
returned to the caller. There is a new error 'MustUseDecorated' for
600
signalling when a wrapping command should switch to the original
601
version. (Robert Collins)
603
* Some option parsing errors will raise 'BzrOptionError', allowing
604
granular detection for decorating commands. (Robert Collins).
606
* Branch.read_working_inventory has moved to
607
WorkingTree.read_working_inventory. This necessitated changes to
608
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
609
as well. To make it clear that a WorkingTree cannot always be obtained
610
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
611
be obtained. (Robert Collins)
613
* All pending merges operations from Branch are now on WorkingTree.
616
* The follow operations from Branch have moved to WorkingTree:
624
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
626
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
628
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
631
* bzrlib.plugin.all_plugins has been changed from an attribute to a
632
query method. (Robert Collins)
634
* New options to read only the table-of-contents of a weave.
637
* Raise NoSuchFile when someone tries to add a non-existant file.
640
* Simplify handling of DivergedBranches in cmd_pull().
644
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
645
is exposed as Branch().control_files. Also this has been altered with the
646
controlfile pre/suffix replaced by simple method names like 'get' and
647
'put'. (Aaron Bentley, Robert Collins).
649
* Deprecated functions and methods can now be marked as such using the
650
bzrlib.symbol_versioning module. Marked method have their docstring
651
updated and will issue a DeprecationWarning using the warnings module
652
when they are used. (Robert Collins)
654
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
655
for functions that need unicode strings. (Robert Collins)
661
* pull now takes --verbose to show you what revisions are added or removed
664
* merge now takes a --show-base option to include the base text in
668
* The config files are now read using ConfigObj, so '=' should be used as
669
a separator, not ':'.
672
* New 'bzr commit --strict' option refuses to commit if there are
673
any unknown files in the tree. To commit, make sure all files are
674
either ignored, added, or deleted. (Michael Ellerman)
676
* The config directory is now ~/.bazaar, and there is a single file
677
~/.bazaar/bazaar.conf storing email, editor and other preferences.
680
* 'bzr add' no longer takes a --verbose option, and a --quiet option
681
has been added that suppresses all output.
683
* Improved zsh completion support in contrib/zsh, from Clint
686
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
689
* 'bzr check' now accepts -v for verbose reporting, and checks for
690
ghosts in the branch. (Robert Collins)
692
* New command 're-sign' which will regenerate the gpg signature for
693
a revision. (Robert Collins)
695
* If you set check_signatures=require for a path in
696
~/.bazaar/branches.conf then bzr will invoke your
697
gpg_signing_command (defaults to gpg) and record a digital signature
698
of your commit. (Robert Collins)
700
* New sftp transport, based on Paramiko. (Robey Pointer)
702
* 'bzr pull' now accepts '--clobber' which will discard local changes
703
and make this branch identical to the source branch. (Robert Collins)
705
* Just give a quieter warning if a plugin can't be loaded, and
706
put the details in .bzr.log. (Martin Pool)
708
* 'bzr branch' will now set the branch-name to the last component of the
709
output directory, if one was supplied.
711
* If the option 'post_commit' is set to one (or more) python function
712
names (must be in the bzrlib namespace), then they will be invoked
713
after the commit has completed, with the branch and revision_id as
714
parameters. (Robert Collins)
716
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
718
* --merge-type weave is now supported for file contents. Tree-shape
719
changes are still three-way based. (Martin Pool, Aaron Bentley)
721
* 'bzr check' allows the first revision on revision-history to have
722
parents - something that is expected for cheap checkouts, and occurs
723
when conversions from baz do not have all history. (Robert Collins).
725
* 'bzr merge' can now graft unrelated trees together, if your specify
726
0 as a base. (Aaron Bentley)
728
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
731
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
733
* 'bzr merge --reprocess' minimizes conflicts
737
* The 'bzr selftest --pattern' option for has been removed, now
738
test specifiers on the command line can be simple strings, or
739
regexps, or both. (Robert Collins)
741
* Passing -v to selftest will now show the time each test took to
742
complete, which will aid in analysing performance regressions and
743
related questions. (Robert Collins)
745
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
746
is given. (Martin Pool)
748
* There is a new method for TestCaseInTempDir, assertFileEqual, which
749
will check that a given content is equal to the content of the named
750
file. (Robert Collins)
752
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
757
* New 'testament' command and concept for making gpg-signatures
758
of revisions that are not tied to a particular internal
759
representation. (Martin Pool).
761
* Per-revision properties ('revprops') as key-value associated
762
strings on each revision created when the revision is committed.
763
Intended mainly for the use of external tools. (Martin Pool).
765
* Config options have moved from bzrlib.osutils to bzrlib.config.
768
* Improved command line option definitions allowing explanations
769
for individual options, among other things. Contributed by
772
* Config options have moved from bzrlib.osutils to bzrlib.config.
773
Configuration is now done via the config.Config interface:
774
Depending on whether you have a Branch, a Location or no information
775
available, construct a *Config, and use its signature_checking,
776
username and user_email methods. (Robert Collins)
778
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
779
they are made available for other plugins to use. You should not
780
import other plugins during the __init__ of your plugin though, as
781
no ordering is guaranteed, and the plugins directory is not on the
782
python path. (Robert Collins)
784
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
785
no longer takes an inventory, rather it takes an option branch
786
parameter, and if None is given will open the branch at basedir
787
implicitly. (Robert Collins)
789
* Cleaner exception structure and error reporting. Suggested by
790
Scott James Remnant. (Martin Pool)
792
* Branch.remove has been moved to WorkingTree, which has also gained
793
lock_read, lock_write and unlock methods for convenience. (Robert
796
* Two decorators, needs_read_lock and needs_write_lock have been added
797
to the branch module. Use these to cause a function to run in a
798
read or write lock respectively. (Robert Collins)
800
* Branch.open_containing now returns a tuple (Branch, relative-path),
801
which allows direct access to the common case of 'get me this file
802
from its branch'. (Robert Collins)
804
* Transports can register using register_lazy_transport, and they
805
will be loaded when first used. (Martin Pool)
807
* 'pull' has been factored out of the command as WorkingTree.pull().
808
A new option to WorkingTree.pull has been added, clobber, which will
809
ignore diverged history and pull anyway.
812
* config.Config has a 'get_user_option' call that accepts an option name.
813
This will be looked up in branches.conf and bazaar.conf as normal.
814
It is intended that this be used by plugins to support options -
815
options of built in programs should have specific methods on the config.
818
* merge.merge_inner now has tempdir as an optional parameter. (Robert
821
* Tree.kind is not recorded at the top level of the hierarchy, as it was
822
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
825
* WorkingTree.__del__ has been removed, it was non deterministic and not
826
doing what it was intended to. See WorkingTree.__init__ for a comment
827
about future directions. (Robert Collins/Martin Pool)
829
* bzrlib.transport.http has been modified so that only 404 urllib errors
830
are returned as NoSuchFile. Other exceptions will propogate as normal.
831
This allows debuging of actual errors. (Robert Collins)
833
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
834
to apis like 'put', 'get' and 'has'. This is to provide consistent
835
behaviour - it operates on url's only. (Robert Collins)
837
* Transports can register using register_lazy_transport, and they
838
will be loaded when first used. (Martin Pool)
840
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
841
is called by merge_inner. This is so that the conflict count can be
842
retrieved (and potentially manipulated) before returning to the caller
843
of merge_inner. Likewise 'merge' now returns the conflict count to the
844
caller. (Robert Collins)
846
* 'revision.revision_graph can handle having only partial history for
847
a revision - that is no revisions in the graph with no parents.
850
* New builtins.branch_files uses the standard file_list rules to produce
851
a branch and a list of paths, relative to that branch (Aaron Bentley)
853
* New TestCase.addCleanup facility.
855
* New bzrlib.version_info tuple (similar to sys.version_info), which can
856
be used by programs importing bzrlib.
860
* Better handling of branches in directories with non-ascii names.
861
(Joel Rosdahl, Panagiotis Papadakos)
863
* Upgrades of trees with no commits will not fail due to accessing
864
[-1] in the revision-history. (Andres Salomon)
871
* Fix problem in pulling over http from machines that do not
872
allow directories to be listed.
874
* Avoid harmless warning about invalid hash cache after
875
upgrading branch format.
879
* Avoid some unnecessary http operations in branch and pull.
886
* 'bzr branch' over http initially gives a very high estimate
887
of completion time but it should fall as the first few
888
revisions are pulled in. branch is still slow on
889
high-latency connections.
893
* bzr-man.py has been updated to work again. Contributed by
896
* Locking is now done with fcntl.lockf which works with NFS
897
file systems. Contributed by Harald Meland.
899
* When a merge encounters a file that has been deleted on
900
one side and modified on the other, the old contents are
901
written out to foo.BASE and foo.SIDE, where SIDE is this
902
or OTHER. Contributed by Aaron Bentley.
904
* Export was choosing incorrect file paths for the content of
905
the tarball, this has been fixed by Aaron Bentley.
907
* Commit will no longer commit without a log message, an
908
error is returned instead. Contributed by Jelmer Vernooij.
910
* If you commit a specific file in a sub directory, any of its
911
parent directories that are added but not listed will be
912
automatically included. Suggested by Michael Ellerman.
914
* bzr commit and upgrade did not correctly record new revisions
915
for files with only a change to their executable status.
916
bzr will correct this when it encounters it. Fixed by
919
* HTTP tests now force off the use of http_proxy for the duration.
920
Contributed by Gustavo Niemeyer.
922
* Fix problems in merging weave-based branches that have
923
different partial views of history.
925
* Symlink support: working with symlinks when not in the root of a
926
bzr tree was broken, patch from Scott James Remnant.
931
* 'branch' now accepts a --basis parameter which will take advantage
932
of local history when making a new branch. This allows faster
933
branching of remote branches. Contributed by Aaron Bentley.
935
* New tree format based on weave files, called version 5.
936
Existing branches can be upgraded to this format using
939
* Symlinks are now versionable. Initial patch by
940
Erik Toubro Nielsen, updated to head by Robert Collins.
942
* Executable bits are tracked on files. Patch from Gustavo
945
* 'bzr status' now shows unknown files inside a selected directory.
946
Patch from Heikki Paajanen.
948
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
949
and 'resolve' have needed added, which list and remove those
950
merge conflicts respectively. A conflicted tree cannot be committed
951
in. Contributed by Aaron Bentley.
953
* 'rm' is now an alias for 'remove'.
955
* Stores now split out their content in a single byte prefixed hash,
956
dropping the density of files per directory by 256. Contributed by
959
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
960
Contributed by Robert Collins.
962
* 'bzr log' with the default formatter will show merged revisions,
963
indented to the right. Initial implementation contributed by Gustavo
964
Niemeyer, made incremental by Robert Collins.
969
* Test case failures have the exception printed after the log
970
for your viewing pleasure.
972
* InventoryEntry is now an abstract base class, use one of the
973
concrete InventoryDirectory etc classes instead.
975
* Branch raises an UnsupportedFormatError when it detects a
976
bzr branch it cannot understand. This allows for precise
977
handling of such circumstances.
982
* Removed testsweet module so that tests can be run after
983
bzr installed by 'bzr selftest'.
985
* 'bzr selftest' command-line arguments can now be partial ids
986
of tests to run, e.g. 'bzr selftest test_weave'
993
* Fixed "branch -r" option.
995
* Fix remote access to branches containing non-compressed history.
998
* Better reliability of http server tests. (John Arbash-Meinel)
1000
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1002
* Various minor bug in windows support have been fixed, largely in the
1003
test suite. Contributed by Alexander Belchenko.
1007
* Status now accepts a -r argument to give status between chosen
1008
revisions. Contributed by Heikki Paajanen.
1010
* Revision arguments no longer use +/-/= to control ranges, instead
1011
there is a 'before' namespace, which limits the successive namespace.
1012
For example '$ bzr log -r date:yesterday..before:date:today' will
1013
select everything from yesterday and before today. Contributed by
1016
* There is now a bzr.bat file created by distutils when building on
1017
Windows. Contributed by Alexander Belchenko.
1021
* Removed uuid() as it was unused.
1023
* Improved 'fetch' code for pulling revisions from one branch into
1024
another (used by pull, merged, etc.)
1027
bzr 0.0.8 2005-09-20
1031
* Adding a file whose parent directory is not versioned will
1032
implicitly add the parent, and so on up to the root. This means
1033
you should never need to explictly add a directory, they'll just
1034
get added when you add a file in the directory. Contributed by
1037
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1040
* If you set BZR_EDITOR in the environment, it is checked in
1041
preference to EDITOR and the config file for the interactive commit
1042
editing program. Related to this is a bugfix where a missing program
1043
set in EDITOR would cause editing to fail, now the fallback program
1044
for the operating system is still tried.
1046
* Files that are not directories/symlinks/regular files will no longer
1047
cause bzr to fail, it will just ignore them by default. You cannot add
1048
them to the tree though - they are not versionable.
1053
* Refactor xml packing/unpacking.
1057
* Fixed 'bzr mv' by Ollie Rutherfurd.
1059
* Fixed strange error when trying to access a nonexistent http
1062
* Make sure that the hashcache gets written out if it can't be
1068
* Various Windows fixes from Ollie Rutherfurd.
1070
* Quieten warnings about locking; patch from Matt Lavin.
1073
bzr-0.0.7 2005-09-02
1077
* ``bzr shell-complete`` command contributed by Clint Adams to
1078
help with intelligent shell completion.
1080
* New expert command ``bzr find-merge-base`` for debugging merges.
1085
* Much better merge support.
1087
* merge3 conflicts are now reported with markers like '<<<<<<<'
1088
(seven characters) which is the same as CVS and pleases things
1094
* ``bzr upgrade`` no longer fails when trying to fix trees that
1095
mention revisions that are not present.
1097
* Fixed bugs in listing plugins from ``bzr plugins``.
1099
* Fix case of $EDITOR containing options for the editor.
1101
* Fix log -r refusing to show the last revision.
1102
(Patch from Goffredo Baroncelli.)
1107
* ``bzr log --show-ids`` shows the revision ids of all parents.
1109
* Externally provided commands on your $BZRPATH no longer need
1110
to recognize --bzr-usage to work properly, and can just handle
1116
* Changed trace messages to go through the standard logging
1117
framework, so that they can more easily be redirected by
1122
bzr-0.0.6 2005-08-18
1126
* Python plugins, automatically loaded from the directories on
1127
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1129
* New 'bzr mkdir' command.
1131
* Commit mesage is fetched from an editor if not given on the
1132
command line; patch from Torsten Marek.
1134
* ``bzr log -m FOO`` displays commits whose message matches regexp
1137
* ``bzr add`` with no arguments adds everything under the current directory.
1139
* ``bzr mv`` does move or rename depending on its arguments, like
1142
* ``bzr missing`` command shows a summary of the differences
1143
between two trees. (Merged from John Arbash-Meinel.)
1145
* An email address for commits to a particular tree can be
1146
specified by putting it into .bzr/email within a branch. (Based
1147
on a patch from Heikki Paajanen.)
1152
* Faster working tree operations.
1157
* 3rd-party modules shipped with bzr are copied within the bzrlib
1158
python package, so that they can be installed by the setup
1159
script without clashing with anything already existing on the
1160
system. (Contributed by Gustavo Niemeyer.)
1162
* Moved plugins directory to bzrlib/, so that there's a standard
1163
plugin directory which is not only installed with bzr itself but
1164
is also available when using bzr from the development tree.
1165
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1166
standard plugins directory.
1168
* When exporting to a tarball with ``bzr export --format tgz``, put
1169
everything under a top directory rather than dumping it into the
1170
current directory. This can be overridden with the ``--root``
1171
option. Patch from William Dodé and John Meinel.
1173
* New ``bzr upgrade`` command to upgrade the format of a branch,
1174
replacing ``bzr check --update``.
1176
* Files within store directories are no longer marked readonly on
1179
* Changed ``bzr log`` output to a more compact form suggested by
1180
John A Meinel. Old format is available with the ``--long`` or
1181
``-l`` option, patched by William Dodé.
1183
* By default the commit command refuses to record a revision with
1184
no changes unless the ``--unchanged`` option is given.
1186
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1187
line options must come before the command name because they
1188
affect what commands are available; all other options must come
1189
after the command name because their interpretation depends on
1192
* ``branch`` and ``clone`` added as aliases for ``branch``.
1194
* Default log format is back to the long format; the compact one
1195
is available with ``--short``.
1200
* Fix bugs in committing only selected files or within a subdirectory.
1203
bzr-0.0.5 2005-06-15
1207
* ``bzr`` with no command now shows help rather than giving an
1208
error. Suggested by Michael Ellerman.
1210
* ``bzr status`` output format changed, because svn-style output
1211
doesn't really match the model of bzr. Now files are grouped by
1212
status and can be shown with their IDs. ``bzr status --all``
1213
shows all versioned files and unknown files but not ignored files.
1215
* ``bzr log`` runs from most-recent to least-recent, the reverse
1216
of the previous order. The previous behaviour can be obtained
1217
with the ``--forward`` option.
1219
* ``bzr inventory`` by default shows only filenames, and also ids
1220
if ``--show-ids`` is given, in which case the id is the second
1
bzr-0.0.5 NOT RELEASED YET
1226
5
* New 'bzr whoami --email' option shows only the email component
1227
6
of the user identification, from Jo Vermeulen.
1229
* New ``bzr ignore PATTERN`` command.
8
* New 'bzr ignore PATTERN' command.
1231
10
* Nicer error message for broken pipe, interrupt and similar
1232
11
conditions that don't indicate an internal error.
1234
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1236
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1237
either read or write mode.
1239
* New option ``bzr log --show-ids`` shows revision and file ids.
1241
* New usage ``bzr log FILENAME`` shows only revisions that
1244
* Changed format for describing changes in ``bzr log -v``.
1246
* New option ``bzr commit --file`` to take a message from a file,
1247
suggested by LarstiQ.
1249
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1250
Oler. File may be in a branch other than the working directory.
1252
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1255
* Commands can now be defined by external programs or scripts
1256
in a directory on $BZRPATH.
1258
* New "stat cache" avoids reading the contents of files if they
1259
haven't changed since the previous time.
1261
* If the Python interpreter is too old, try to find a better one
1262
or give an error. Based on a patch from Fredrik Lundh.
1264
* New optional parameter ``bzr info [BRANCH]``.
1266
* New form ``bzr commit SELECTED`` to commit only selected files.
1268
* New form ``bzr log -r FROM:TO`` shows changes in selected
1269
range; contributed by John A Meinel.
1271
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1272
options through to an external GNU diff.
1274
* New option ``bzr add --no-recurse`` to add a directory but not
1277
* ``bzr --version`` now shows more information if bzr is being run
1283
* Fixed diff format so that added and removed files will be
1284
handled properly by patch. Fix from Lalo Martins.
1286
* Various fixes for files whose names contain spaces or other
1292
* Converted black-box test suites from Bourne shell into Python;
1293
now run using ``./testbzr``. Various structural improvements to
1296
* testbzr by default runs the version of bzr found in the same
1297
directory as the tests, or the one given as the first parameter.
1299
* testbzr also runs the internal tests, so the only command
1300
required to check is just ``./testbzr``.
1302
* testbzr requires python2.4, but can be used to test bzr running
1303
under a different version.
1305
* Tests added for many other changes in this release.
15
* Converted black-box test suites from Bourne shell into Python.
16
Various structural improvements to the tests.
1310
20
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1312
* Refactor command functions into Command objects based on HCT by
1313
Scott James Remnant.
22
* Refactor command functions into Command objects based on
23
mango-sorbet by Scott James Remnant.
1315
25
* Better help messages for many commands.
1317
* Expose bzrlib.open_tracefile() to start the tracefile; until
1318
this is called trace messages are just discarded.
1320
* New internal function find_touching_revisions() and hidden
1321
command touching-revisions trace the changes to a given file.
1323
* Simpler and faster compare_inventories() function.
1325
* bzrlib.open_tracefile() takes a tracefilename parameter.
1327
* New AtomicFile class.
1329
* New developer commands ``added``, ``modified``.
1334
* Cope on Windows on python2.3 by using the weaker random seed.
1335
2.4 is now only recommended.
1338
28
bzr-0.0.4 2005-04-22
added
removed
NEWS
