5
* No default ignore rules are applied by bzr - only the rules in .bzrignore
6
are considered. This fixes bugs with default rules being enforced no
7
matter what. The old list of ignore rules from bzr is available by
8
running 'bzr ignore --old-default-rules'.
10
* Tests updates to ensure proper URL handling, UNICODE support, and
11
proper printing when the user's terminal encoding cannot display
12
the path of a file that has been versioned.
13
``bzr branch`` can take a target URL rather than only a local directory.
14
Branch.get_parent()/set_parent() now save a relative path if possible,
15
and normalize the parent based on root, allowing access across
16
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
17
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
20
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
21
Use terminal width for single-line logs from ``bzr log --line`` and
22
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
25
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
28
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
30
* Show the correct number of revisions pushed when pushing a new branch.
33
* 'bzr selftest' now shows a progress bar with the number of tests, and
34
progress made. 'make check' shows tests in -v mode, to be more useful
35
for the PQM status window. (Robert Collins).
37
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
38
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
39
profile data for the individual profiled calls, allowing for fine
40
grained analysis of performance.
41
(Robert Collins, Martin Pool).
43
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
44
where commit can take an appreciable time. (Robert Collins)
46
* 'bzr add' is now less verbose in telling you what ignore globs were
47
matched by files being ignored. Instead it just tells you how many
48
were ignored (because you might reasonably be expecting none to be
49
ignored). 'bzr add -v' is unchanged and will report every ignored
50
file. (Robert Collins).
52
* ftp now has a test server if medusa is installed. As part of testing,
53
ftp support has been improved, including support for supplying a
54
non-standard port. (John Arbash Meinel).
56
* 'bzr log --line' shows the revision number, and uses only the
57
first line of the log message (#5162, Alexander Belchenko;
60
* 'bzr status' has had the --all option removed. The 'bzr ls' command
61
should be used to retrieve all versioned files. (Robert Collins)
63
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
64
over email, and applied on the other end, while maintaining ancestry.
65
This bundle can be applied with either 'bzr merge' or 'bzr pull',
66
the same way you would apply another branch.
67
(John Arbash Meinel, Aaron Bentley)
69
* 'branches.conf' has been changed to 'locations.conf', since it can apply
70
to more locations than just branch locations.
73
* 'bzr whoami' can now be used to set your identity from the command line,
74
for a branch or globally. (Robey Pointer)
76
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
79
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
84
* Fix shadowed definition of TestLocationConfig that caused some
85
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
88
* Fix unnecessary requirement of sign-my-commits that it be run from
89
a working directory. (Martin Pool, Robert Collins)
91
* 'bzr push location' will only remember the push location if it succeeds
92
in connecting to the remote location. (#49742, John Arbash Meinel)
94
* 'bzr revert' no longer toggles the executable bit on win32
95
(#45010, John Arbash Meinel)
97
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
99
* sftp tests now work correctly on win32 if you have a newer paramiko
102
* Cleanup win32 test suite, and general cleanup of places where
103
file handles were being held open. (John Arbash Meinel)
105
* When specifying filenames for 'diff -r x..y', the name of the file in the
106
working directory can be used, even if its name is different in both x
109
* File-ids containing single- or double-quotes are handled correctly by
110
push. (#52227, Aaron Bentley)
114
* Combine the ignore rules into a single regex rather than looping over
115
them to reduce the threshold where N^2 behaviour occurs in operations
116
like status. (Jan Hudec, Robert Collins).
118
* 'bzr push' should only push the ancestry of the current revision, not
119
all of the history in the repository. This is especially important for
120
shared repositories. (John Arbash Meinel)
122
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
123
rather than randomly walking the inventories. (John Arbash Meinel)
125
* Doctests are now run in temporary directories which are cleaned up when
126
they finish, rather than using special ScratchDir/ScratchBranch objects.
129
* Split ``check`` into separate methods on the branch and on the repository,
130
so that it can be specialized in ways that are useful or efficient for
131
different formats. (Martin Pool, Robert Collins)
133
* Deprecate Repository.all_revision_ids; most methods don't really need
134
the global revision graph but only that part leading up to a particular
135
revision. (Martin Pool, Robert Collins)
137
* Add a BzrDirFormat control_formats list which allows for control formats
138
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
139
(Robert Collins, Jelmer Vernooij).
141
* bzrlib.diff.external_diff can be redirected to any file-like object.
142
Uses subprocess instead of spawnvp.
143
(#4047, #48914, James Henstridge, John Arbash Meinel)
145
* New command line option '--profile-imports', which will install a custom
146
importer to log time to import modules and regex compilation time to
147
sys.stderr (John Arbash Meinel)
153
* setup.py failed to install launchpad plugin. (Martin Pool)
159
* Fix failure to commit a merge in a checkout. (Martin Pool,
160
Robert Collins, Erik Bågfors, #43959)
162
* Nicer messages from 'commit' in the case of renames, and correct
163
messages when a merge has occured. (Robert Collins, Martin Pool)
165
* Separate functionality from assert statements as they are skipped in
166
optimized mode of python. Add the same check to pending merges.
167
(#44443, Olaf Conradi)
171
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
173
* Add info on standalone branches without a working tree.
174
(#44155, Olaf Conradi)
176
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
180
* Make editor invocation comply with Debian Policy. First check
181
environment variables VISUAL and EDITOR, then try editor from
182
alternatives system. If that all fails, fall back to the pre-defined
183
list of editors. (#42904, Olaf Conradi)
187
* New 'register-branch' command registers a public branch into
188
Launchpad.net, where it can be associated with bugs, etc.
189
(Martin Pool, Bjorn Tillenius, Robert Collins)
193
* New public api in InventoryEntry - 'describe_change(old, new)' which
194
provides a human description of the changes between two old and
195
new. (Robert Collins, Martin Pool)
199
* Fix test case for bzr info in upgrading a standalone branch to metadir,
200
uses bzrlib api now. (Olaf Conradi)
204
NOTES WHEN UPGRADING:
206
Release 0.8 of bzr introduces a new format for history storage, called
207
'knit', as an evolution of to the 'weave' format used in 0.7. Local
208
and remote operations are faster using knits than weaves. Several
209
operations including 'init', 'init-repo', and 'upgrade' take a
210
--format option that controls this. Branching from an existing branch
211
will keep the same format.
213
It is possible to merge, pull and push between branches of different
214
formats but this is slower than moving data between homogenous
215
branches. It is therefore recommended (but not required) that you
216
upgrade all branches for a project at the same time. Information on
217
formats is shown by 'bzr info'.
219
bzr 0.8 now allows creation of 'repositories', which hold the history
220
of files and revisions for several branches. Previously bzr kept all
221
the history for a branch within the .bzr directory at the root of the
222
branch, and this is still the default. To create a repository, use
223
the new 'bzr init-repo' command. Branches exist as directories under
224
the repository and contain just a small amount of information
225
indicating the current revision of the branch.
227
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
228
subversion. Checkouts are associated with a branch (optionally in a
229
repository), which contains all the historical information. The
230
result is that a checkout can be deleted without losing any
231
already-committed revisions. A new 'update' command is also available.
233
Repositories and checkouts are not supported with the 0.7 storage
234
format. To use them you must upgrad to either knits, or to the
235
'metaweave' format, which uses weaves but changes the .bzr directory
241
* Sftp paths can now be relative, or local, according to the lftp
242
convention. Paths now take the form:
243
sftp://user:pass@host:port/~/relative/path
245
sftp://user:pass@host:port/absolute/path
247
* The FTP transport now tries to reconnect after a temporary
248
failure. ftp put is made atomic. (Matthieu Moy)
250
* The FTP transport now maintains a pool of connections, and
251
reuses them to avoid multiple connections to the same host (like
252
sftp did). (Daniel Silverstone)
254
* The bzr_man.py file has been removed. To create the man page now,
255
use ./generate_docs.py man. The new program can also create other files.
256
Run "python generate_docs.py --help" for usage information. (Hans
257
Ulrich Niedermann & James Blackwell).
259
* Man Page now gives full help (James Blackwell). Help also updated to
260
reflect user config now being stored in .bazaar (Hans Ulrich
263
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
265
* Pull now accepts a --revision argument (Erik Bågfors)
267
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
268
line. You can now use the following command to sign all of your old commits.
269
find .bzr/revision-store// -name my@email-* \
270
| sed 's/.*\/\/..\///' \
273
* Upgrade can now upgrade over the network. (Robert Collins)
275
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
276
behaviour. By default they will cache history in the checkout, but
277
with --lightweight almost all data is kept in the master branch.
280
* 'revert' unversions newly-versioned files, instead of deleting them.
282
* 'merge' is more robust. Conflict messages have changed.
284
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
287
* Default log format can be set in configuration and plugins can register
288
their own formatters. (Erik Bågfors)
290
* New 'reconcile' command will check branch consistency and repair indexes
291
that can become out of sync in pre 0.8 formats. (Robert Collins,
294
* New 'bzr init --format' and 'bzr upgrade --format' option to control
295
what storage format is created or produced. (Robert Collins,
298
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
300
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
302
* New 'init-repository' command, plus support for repositories in 'init'
303
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
305
* Improve output of 'info' command. Show all relevant locations related to
306
working tree, branch and repository. Use kibibytes for binary quantities.
307
Fix off-by-one error in missing revisions of working tree. Make 'info'
308
work on branches, repositories and remote locations. Show locations
309
relative to the shared repository, if applicable. Show locking status
310
of locations. (Olaf Conradi)
312
* Diff and merge now safely handle binary files. (Aaron Bentley)
314
* 'pull' and 'push' now normalise the revision history, so that any two
315
branches with the same tip revision will have the same output from 'log'.
318
* 'merge' accepts --remember option to store parent location, like 'push'
319
and 'pull'. (Olaf Conradi)
321
* bzr status and diff when files given as arguments do not exist
322
in the relevant trees. (Martin Pool, #3619)
324
* Add '.hg' to the default ignore list. (Martin Pool)
326
* 'knit' is now the default disk format. This improves disk performance and
327
utilization, increases incremental pull performance, robustness with SFTP
328
and allows checkouts over SFTP to perform acceptably.
329
The initial Knit code was contributed by Johan Rydberg based on a
330
specification by Martin Pool.
331
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
333
* New tool to generate all-in-one html version of the manual. (Alexander
336
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
337
to be left in the SFTP repository. (Robert Collins, Martin Pool).
339
* New option 'diff --prefix' to control how files are named in diff
340
output, with shortcuts '-p0' and '-p1' corresponding to the options for
341
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
343
* Add --revision option to 'annotate' command. (Olaf Conradi)
345
* If bzr shows an unexpected revision-history after pulling (perhaps due
346
to a reweave) it can now be corrected by 'bzr reconcile'.
351
* Commit is now verbose by default, and shows changed filenames and the
352
new revision number. (Robert Collins, Martin Pool)
354
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
356
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
358
* Make 'pull' and 'push' remember location on failure using --remember.
361
* For compatibility, make old format for using weaves inside metadir
362
available as 'metaweave' format. Rename format 'metadir' to 'default'.
363
Clean up help for option --format in commands 'init', 'init-repo' and
364
'upgrade'. (Olaf Conradi)
368
* The internal storage of history, and logical branch identity have now
369
been split into Branch, and Repository. The common locking and file
370
management routines are now in bzrlib.lockablefiles.
371
(Aaron Bentley, Robert Collins, Martin Pool)
373
* Transports can now raise DependencyNotPresent if they need a library
374
which is not installed, and then another implementation will be
377
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
380
* Using Tree Transform for merge, revert, tree-building
382
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
383
Branch.initialize are now deprecated. Please see BzrDir.create_* for
384
replacement API's. (Robert Collins)
386
* New BzrDir class represents the .bzr control directory and manages
387
formatting issues. (Robert Collins)
389
* New repository.InterRepository class encapsulates Repository to
390
Repository actions and allows for clean selection of optimised code
391
paths. (Robert Collins)
393
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
394
please use 'branch.fetch' or 'repository.fetch' depending on your
395
needs. (Robert Collins)
397
* deprecated methods now have a 'is_deprecated' flag on them that can
398
be checked, if you need to determine whether a given callable is
399
deprecated at runtime. (Robert Collins)
401
* Progress bars are now nested - see
402
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
404
* New API call get_format_description() for each type of format.
407
* Changed branch.set_parent() to accept None to remove parent.
410
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
412
* WorkingTree.branch is now a read only property. (Robert Collins)
414
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
415
can be None or a factory that will create a progress bar. This is
416
useful for testing or for overriding the bzrlib.progress heuristic.
419
* New API method get_physical_lock_status() to query locks present on a
420
transport. (Olaf Conradi)
422
* Repository.reconcile now takes a thorough keyword parameter to allow
423
requesting an indepth reconciliation, rather than just a data-loss
424
check. (Robert Collins)
426
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
427
the user for yes/no style input. (Robert Collins)
431
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
432
for testing SFTP protocol support. (Robey Pointer)
434
* Branch formats are now tested once per implementation (see bzrlib.
435
tests.branch_implementations. This is analagous to the transport
436
interface tests, and has been followed up with working tree,
437
repository and BzrDir tests. (Robert Collins)
439
* New test base class TestCaseWithTransport provides a transport aware
440
test environment, useful for testing any transport-interface using
441
code. The test suite option --transport controls the transport used
442
by this class (when its not being used as part of implementation
443
contract testing). (Robert Collins)
445
* Close logging handler on disabling the test log. This will remove the
446
handler from the internal list inside python's logging module,
447
preventing shutdown from closing it twice. (Olaf Conradi)
449
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
451
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
452
will provide String("foo") to the command as its stdin.
458
* .bzrignore is excluded from exports, on the grounds that it's a bzr
459
internal-use file and may not be wanted. (Jamie Wilkinson)
461
* The "bzr directories" command were removed in favor of the new
462
--kind option to the "bzr inventory" command. To list all
463
versioned directories, now use "bzr inventory --kind directory".
466
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
467
by default. (John Arbash Meinel)
469
* The parent of Bzr configuration directory can be set by BZR_HOME
470
environment variable. Now the path for it is searched in BZR_HOME, then
471
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
472
points to C:\Documents and Settings\User Name\Application Data), HOME.
475
* Plugins with the same name in different directories in the bzr plugin
476
path are no longer loaded: only the first successfully loaded one is
477
used. (Robert Collins)
479
* Use systems' external ssh command to open connections if possible.
480
This gives better integration with user settings such as ProxyCommand.
483
* Permissions on files underneath .bzr/ are inherited from the .bzr
484
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
485
will mean that future file will be created with group write permissions.
487
* configure.in and config.guess are no longer in the builtin default
490
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
491
files. (John Arbash Meinel, Martin Pool)
495
* "bzr INIT dir" now initializes the specified directory, and creates
496
it if it does not exist. (John Arbash Meinel)
498
* New remerge command (Aaron Bentley)
500
* Better zsh completion script. (Steve Borho)
502
* 'bzr diff' now returns 1 when there are changes in the working
503
tree. (Robert Collins)
505
* 'bzr push' now exists and can push changes to a remote location.
506
This uses the transport infrastructure, and can store the remote
507
location in the ~/.bazaar/branches.conf configuration file.
510
* Test directories are only kept if the test fails and the user requests
513
* Tweaks to short log printing
515
* Added branch nicks, new nick command, printing them in log output.
518
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
519
occurs. (Martin Pool)
521
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
522
the same as Subversion. (Martin Pool)
524
* New ftp transport support (on ftplib), for ftp:// and aftp://
525
URLs. (Daniel Silverstone)
527
* Commit editor temporary files now start with 'bzr_log.', to allow
528
text editors to match the file name and set up appropriate modes or
529
settings. (Magnus Therning)
531
* Improved performance when integrating changes from a remote weave.
532
(Goffredo Baroncelli)
534
* Sftp will attempt to cache the connection, so it is more likely that
535
a connection will be reused, rather than requiring multiple password
538
* bzr revno now takes an optional argument indicating the branch whose
539
revno should be printed. (Michael Ellerman)
541
* bzr cat defaults to printing the last version of the file.
542
(#3632, Matthieu Moy)
544
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
545
profiler. (Denys Duchier)
547
* Faster commits by reading only the headers of affected weave files.
550
* 'bzr add' now takes a --dry-run parameter which shows you what would be
551
added, but doesn't actually add anything. (Michael Ellerman)
553
* 'bzr add' now lists how many files were ignored per glob. add --verbose
554
lists the specific files. (Aaron Bentley)
556
* 'bzr missing' now supports displaying changes in diverged trees and can
557
be limited to show what either end of the comparison is missing.
558
(Aaron Bently, with a little prompting from Daniel Silverstone)
562
* SFTP can walk up to the root path without index errors. (Robert Collins)
564
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
566
* Error when run with -OO
568
* Fix bug in reporting http errors that don't have an http error code.
571
* Handle more cases of pipe errors in display commands
573
* Change status to 3 for all errors
575
* Files that are added and unlinked before committing are completely
576
ignored by diff and status
578
* Stores with some compressed texts and some uncompressed texts are now
579
able to be used. (John A Meinel)
581
* Fix for bzr pull failing sometimes under windows
583
* Fix for sftp transport under windows when using interactive auth
585
* Show files which are both renamed and modified as such in 'bzr
586
status' output. (#4503, Daniel Silverstone)
588
* Make annotate cope better with revisions committed without a valid
589
email address. (Marien Zwart)
591
* Fix representation of tab characters in commit messages. (Harald
594
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
595
now parsed properly under Windows. (Alexander Belchenko)
597
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
599
* Keep a cached copy of the basis inventory to speed up operations
600
that need to refer to it. (Johan Rydberg, Martin Pool)
602
* Fix bugs in bzr status display of non-ascii characters. (Martin
605
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
608
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
612
* Fix selftest asking for passwords when there are no SFTP keys.
613
(Robey Pointer, Jelmer Vernooij)
615
* Fix selftest run with 'python -O'. (Martin Pool)
617
* Fix HTTP tests under Windows. (John Arbash Meinel)
619
* Make tests work even if HOME is not set (Aaron Bentley)
621
* Updated build_tree to use fixed line-endings for tests which read
622
the file cotents and compare. Make some tests use this to pass under
623
Windows. (John Arbash Meinel)
625
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
627
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
630
* Use terminal width to align verbose test output. (Martin Pool)
632
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
633
If adding a new test script please add that to
634
bzrlib.tests.blackbox.__init__. (Robert Collins)
636
* Much better error message if one of the test suites can't be
637
imported. (Martin Pool)
639
* Make check now runs the test suite twice - once with the default locale,
640
and once with all locales forced to C, to expose bugs. This is not
641
trivially done within python, so for now its only triggered by running
642
Make check. Integrators and packagers who wish to check for full
643
platform support should run 'make check' to test the source.
646
* Tests can now run TestSkipped if they can't execute for any reason.
647
(Martin Pool) (NB: TestSkipped should only be raised for correctable
648
reasons - see the wiki spec ImprovingBzrTestSuite).
650
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
651
paths for the transport tests. Introduce blackbox remote sftp tests that
652
test the same permutations. (Robert Collins, Robey Pointer)
654
* Transport implementation tests are now independent of the local file
655
system, which allows tests for esoteric transports, and for features
656
not available in the local file system. They also repeat for variations
657
on the URL scheme that can introduce issues in the transport code,
658
see bzrlib.transport.TransportTestProviderAdapter() for this.
661
* TestCase.build_tree uses the transport interface to build trees, pass
662
in a transport parameter to give it an existing connection.
667
* WorkingTree.pull has been split across Branch and WorkingTree,
668
to allow Branch only pulls. (Robert Collins)
670
* commands.display_command now returns the result of the decorated
671
function. (Robert Collins)
673
* LocationConfig now has a set_user_option(key, value) call to save
674
a setting in its matching location section (a new one is created
675
if needed). (Robert Collins)
677
* Branch has two new methods, get_push_location and set_push_location
678
to respectively, get and set the push location. (Robert Collins)
680
* commands.register_command now takes an optional flag to signal that
681
the registrant is planning to decorate an existing command. When
682
given multiple plugins registering a command is not an error, and
683
the original command class (whether built in or a plugin based one) is
684
returned to the caller. There is a new error 'MustUseDecorated' for
685
signalling when a wrapping command should switch to the original
686
version. (Robert Collins)
688
* Some option parsing errors will raise 'BzrOptionError', allowing
689
granular detection for decorating commands. (Robert Collins).
691
* Branch.read_working_inventory has moved to
692
WorkingTree.read_working_inventory. This necessitated changes to
693
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
694
as well. To make it clear that a WorkingTree cannot always be obtained
695
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
696
be obtained. (Robert Collins)
698
* All pending merges operations from Branch are now on WorkingTree.
701
* The follow operations from Branch have moved to WorkingTree:
709
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
711
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
713
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
716
* bzrlib.plugin.all_plugins has been changed from an attribute to a
717
query method. (Robert Collins)
719
* New options to read only the table-of-contents of a weave.
722
* Raise NoSuchFile when someone tries to add a non-existant file.
725
* Simplify handling of DivergedBranches in cmd_pull().
729
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
730
is exposed as Branch().control_files. Also this has been altered with the
731
controlfile pre/suffix replaced by simple method names like 'get' and
732
'put'. (Aaron Bentley, Robert Collins).
734
* Deprecated functions and methods can now be marked as such using the
735
bzrlib.symbol_versioning module. Marked method have their docstring
736
updated and will issue a DeprecationWarning using the warnings module
737
when they are used. (Robert Collins)
739
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
740
for functions that need unicode strings. (Robert Collins)
746
* pull now takes --verbose to show you what revisions are added or removed
749
* merge now takes a --show-base option to include the base text in
753
* The config files are now read using ConfigObj, so '=' should be used as
754
a separator, not ':'.
757
* New 'bzr commit --strict' option refuses to commit if there are
758
any unknown files in the tree. To commit, make sure all files are
759
either ignored, added, or deleted. (Michael Ellerman)
761
* The config directory is now ~/.bazaar, and there is a single file
762
~/.bazaar/bazaar.conf storing email, editor and other preferences.
765
* 'bzr add' no longer takes a --verbose option, and a --quiet option
766
has been added that suppresses all output.
768
* Improved zsh completion support in contrib/zsh, from Clint
771
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
774
* 'bzr check' now accepts -v for verbose reporting, and checks for
775
ghosts in the branch. (Robert Collins)
777
* New command 're-sign' which will regenerate the gpg signature for
778
a revision. (Robert Collins)
780
* If you set check_signatures=require for a path in
781
~/.bazaar/branches.conf then bzr will invoke your
782
gpg_signing_command (defaults to gpg) and record a digital signature
783
of your commit. (Robert Collins)
785
* New sftp transport, based on Paramiko. (Robey Pointer)
787
* 'bzr pull' now accepts '--clobber' which will discard local changes
788
and make this branch identical to the source branch. (Robert Collins)
790
* Just give a quieter warning if a plugin can't be loaded, and
791
put the details in .bzr.log. (Martin Pool)
793
* 'bzr branch' will now set the branch-name to the last component of the
794
output directory, if one was supplied.
796
* If the option 'post_commit' is set to one (or more) python function
797
names (must be in the bzrlib namespace), then they will be invoked
798
after the commit has completed, with the branch and revision_id as
799
parameters. (Robert Collins)
801
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
803
* --merge-type weave is now supported for file contents. Tree-shape
804
changes are still three-way based. (Martin Pool, Aaron Bentley)
806
* 'bzr check' allows the first revision on revision-history to have
807
parents - something that is expected for cheap checkouts, and occurs
808
when conversions from baz do not have all history. (Robert Collins).
810
* 'bzr merge' can now graft unrelated trees together, if your specify
811
0 as a base. (Aaron Bentley)
813
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
816
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
818
* 'bzr merge --reprocess' minimizes conflicts
822
* The 'bzr selftest --pattern' option for has been removed, now
823
test specifiers on the command line can be simple strings, or
824
regexps, or both. (Robert Collins)
826
* Passing -v to selftest will now show the time each test took to
827
complete, which will aid in analysing performance regressions and
828
related questions. (Robert Collins)
830
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
831
is given. (Martin Pool)
833
* There is a new method for TestCaseInTempDir, assertFileEqual, which
834
will check that a given content is equal to the content of the named
835
file. (Robert Collins)
837
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
842
* New 'testament' command and concept for making gpg-signatures
843
of revisions that are not tied to a particular internal
844
representation. (Martin Pool).
846
* Per-revision properties ('revprops') as key-value associated
847
strings on each revision created when the revision is committed.
848
Intended mainly for the use of external tools. (Martin Pool).
850
* Config options have moved from bzrlib.osutils to bzrlib.config.
853
* Improved command line option definitions allowing explanations
854
for individual options, among other things. Contributed by
857
* Config options have moved from bzrlib.osutils to bzrlib.config.
858
Configuration is now done via the config.Config interface:
859
Depending on whether you have a Branch, a Location or no information
860
available, construct a *Config, and use its signature_checking,
861
username and user_email methods. (Robert Collins)
863
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
864
they are made available for other plugins to use. You should not
865
import other plugins during the __init__ of your plugin though, as
866
no ordering is guaranteed, and the plugins directory is not on the
867
python path. (Robert Collins)
869
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
870
no longer takes an inventory, rather it takes an option branch
871
parameter, and if None is given will open the branch at basedir
872
implicitly. (Robert Collins)
874
* Cleaner exception structure and error reporting. Suggested by
875
Scott James Remnant. (Martin Pool)
877
* Branch.remove has been moved to WorkingTree, which has also gained
878
lock_read, lock_write and unlock methods for convenience. (Robert
881
* Two decorators, needs_read_lock and needs_write_lock have been added
882
to the branch module. Use these to cause a function to run in a
883
read or write lock respectively. (Robert Collins)
885
* Branch.open_containing now returns a tuple (Branch, relative-path),
886
which allows direct access to the common case of 'get me this file
887
from its branch'. (Robert Collins)
889
* Transports can register using register_lazy_transport, and they
890
will be loaded when first used. (Martin Pool)
892
* 'pull' has been factored out of the command as WorkingTree.pull().
893
A new option to WorkingTree.pull has been added, clobber, which will
894
ignore diverged history and pull anyway.
897
* config.Config has a 'get_user_option' call that accepts an option name.
898
This will be looked up in branches.conf and bazaar.conf as normal.
899
It is intended that this be used by plugins to support options -
900
options of built in programs should have specific methods on the config.
903
* merge.merge_inner now has tempdir as an optional parameter. (Robert
906
* Tree.kind is not recorded at the top level of the hierarchy, as it was
907
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
910
* WorkingTree.__del__ has been removed, it was non deterministic and not
911
doing what it was intended to. See WorkingTree.__init__ for a comment
912
about future directions. (Robert Collins/Martin Pool)
914
* bzrlib.transport.http has been modified so that only 404 urllib errors
915
are returned as NoSuchFile. Other exceptions will propogate as normal.
916
This allows debuging of actual errors. (Robert Collins)
918
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
919
to apis like 'put', 'get' and 'has'. This is to provide consistent
920
behaviour - it operates on url's only. (Robert Collins)
922
* Transports can register using register_lazy_transport, and they
923
will be loaded when first used. (Martin Pool)
925
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
926
is called by merge_inner. This is so that the conflict count can be
927
retrieved (and potentially manipulated) before returning to the caller
928
of merge_inner. Likewise 'merge' now returns the conflict count to the
929
caller. (Robert Collins)
931
* 'revision.revision_graph can handle having only partial history for
932
a revision - that is no revisions in the graph with no parents.
935
* New builtins.branch_files uses the standard file_list rules to produce
936
a branch and a list of paths, relative to that branch (Aaron Bentley)
938
* New TestCase.addCleanup facility.
940
* New bzrlib.version_info tuple (similar to sys.version_info), which can
941
be used by programs importing bzrlib.
945
* Better handling of branches in directories with non-ascii names.
946
(Joel Rosdahl, Panagiotis Papadakos)
948
* Upgrades of trees with no commits will not fail due to accessing
949
[-1] in the revision-history. (Andres Salomon)
956
* Fix problem in pulling over http from machines that do not
957
allow directories to be listed.
959
* Avoid harmless warning about invalid hash cache after
960
upgrading branch format.
964
* Avoid some unnecessary http operations in branch and pull.
971
* 'bzr branch' over http initially gives a very high estimate
972
of completion time but it should fall as the first few
973
revisions are pulled in. branch is still slow on
974
high-latency connections.
978
* bzr-man.py has been updated to work again. Contributed by
981
* Locking is now done with fcntl.lockf which works with NFS
982
file systems. Contributed by Harald Meland.
984
* When a merge encounters a file that has been deleted on
985
one side and modified on the other, the old contents are
986
written out to foo.BASE and foo.SIDE, where SIDE is this
987
or OTHER. Contributed by Aaron Bentley.
989
* Export was choosing incorrect file paths for the content of
990
the tarball, this has been fixed by Aaron Bentley.
992
* Commit will no longer commit without a log message, an
993
error is returned instead. Contributed by Jelmer Vernooij.
995
* If you commit a specific file in a sub directory, any of its
996
parent directories that are added but not listed will be
997
automatically included. Suggested by Michael Ellerman.
999
* bzr commit and upgrade did not correctly record new revisions
1000
for files with only a change to their executable status.
1001
bzr will correct this when it encounters it. Fixed by
1004
* HTTP tests now force off the use of http_proxy for the duration.
1005
Contributed by Gustavo Niemeyer.
1007
* Fix problems in merging weave-based branches that have
1008
different partial views of history.
1010
* Symlink support: working with symlinks when not in the root of a
1011
bzr tree was broken, patch from Scott James Remnant.
1016
* 'branch' now accepts a --basis parameter which will take advantage
1017
of local history when making a new branch. This allows faster
1018
branching of remote branches. Contributed by Aaron Bentley.
1020
* New tree format based on weave files, called version 5.
1021
Existing branches can be upgraded to this format using
1024
* Symlinks are now versionable. Initial patch by
1025
Erik Toubro Nielsen, updated to head by Robert Collins.
1027
* Executable bits are tracked on files. Patch from Gustavo
1030
* 'bzr status' now shows unknown files inside a selected directory.
1031
Patch from Heikki Paajanen.
1033
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1034
and 'resolve' have needed added, which list and remove those
1035
merge conflicts respectively. A conflicted tree cannot be committed
1036
in. Contributed by Aaron Bentley.
1038
* 'rm' is now an alias for 'remove'.
1040
* Stores now split out their content in a single byte prefixed hash,
1041
dropping the density of files per directory by 256. Contributed by
1044
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1045
Contributed by Robert Collins.
1047
* 'bzr log' with the default formatter will show merged revisions,
1048
indented to the right. Initial implementation contributed by Gustavo
1049
Niemeyer, made incremental by Robert Collins.
1054
* Test case failures have the exception printed after the log
1055
for your viewing pleasure.
1057
* InventoryEntry is now an abstract base class, use one of the
1058
concrete InventoryDirectory etc classes instead.
1060
* Branch raises an UnsupportedFormatError when it detects a
1061
bzr branch it cannot understand. This allows for precise
1062
handling of such circumstances.
1067
* Removed testsweet module so that tests can be run after
1068
bzr installed by 'bzr selftest'.
1070
* 'bzr selftest' command-line arguments can now be partial ids
1071
of tests to run, e.g. 'bzr selftest test_weave'
1074
bzr 0.0.9 2005-09-23
1078
* Fixed "branch -r" option.
1080
* Fix remote access to branches containing non-compressed history.
1083
* Better reliability of http server tests. (John Arbash-Meinel)
1085
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1087
* Various minor bug in windows support have been fixed, largely in the
1088
test suite. Contributed by Alexander Belchenko.
1092
* Status now accepts a -r argument to give status between chosen
1093
revisions. Contributed by Heikki Paajanen.
1095
* Revision arguments no longer use +/-/= to control ranges, instead
1096
there is a 'before' namespace, which limits the successive namespace.
1097
For example '$ bzr log -r date:yesterday..before:date:today' will
1098
select everything from yesterday and before today. Contributed by
1101
* There is now a bzr.bat file created by distutils when building on
1102
Windows. Contributed by Alexander Belchenko.
1106
* Removed uuid() as it was unused.
1108
* Improved 'fetch' code for pulling revisions from one branch into
1109
another (used by pull, merged, etc.)
1112
bzr 0.0.8 2005-09-20
1116
* Adding a file whose parent directory is not versioned will
1117
implicitly add the parent, and so on up to the root. This means
1118
you should never need to explictly add a directory, they'll just
1119
get added when you add a file in the directory. Contributed by
1122
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1125
* If you set BZR_EDITOR in the environment, it is checked in
1126
preference to EDITOR and the config file for the interactive commit
1127
editing program. Related to this is a bugfix where a missing program
1128
set in EDITOR would cause editing to fail, now the fallback program
1129
for the operating system is still tried.
1131
* Files that are not directories/symlinks/regular files will no longer
1132
cause bzr to fail, it will just ignore them by default. You cannot add
1133
them to the tree though - they are not versionable.
1138
* Refactor xml packing/unpacking.
1142
* Fixed 'bzr mv' by Ollie Rutherfurd.
1144
* Fixed strange error when trying to access a nonexistent http
1147
* Make sure that the hashcache gets written out if it can't be
1153
* Various Windows fixes from Ollie Rutherfurd.
1155
* Quieten warnings about locking; patch from Matt Lavin.
1158
bzr-0.0.7 2005-09-02
1162
* ``bzr shell-complete`` command contributed by Clint Adams to
1163
help with intelligent shell completion.
1165
* New expert command ``bzr find-merge-base`` for debugging merges.
1170
* Much better merge support.
1172
* merge3 conflicts are now reported with markers like '<<<<<<<'
1173
(seven characters) which is the same as CVS and pleases things
1179
* ``bzr upgrade`` no longer fails when trying to fix trees that
1180
mention revisions that are not present.
1182
* Fixed bugs in listing plugins from ``bzr plugins``.
1184
* Fix case of $EDITOR containing options for the editor.
1186
* Fix log -r refusing to show the last revision.
1187
(Patch from Goffredo Baroncelli.)
1192
* ``bzr log --show-ids`` shows the revision ids of all parents.
1194
* Externally provided commands on your $BZRPATH no longer need
1195
to recognize --bzr-usage to work properly, and can just handle
1201
* Changed trace messages to go through the standard logging
1202
framework, so that they can more easily be redirected by
1207
bzr-0.0.6 2005-08-18
1211
* Python plugins, automatically loaded from the directories on
1212
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1214
* New 'bzr mkdir' command.
1216
* Commit mesage is fetched from an editor if not given on the
1217
command line; patch from Torsten Marek.
1219
* ``bzr log -m FOO`` displays commits whose message matches regexp
1222
* ``bzr add`` with no arguments adds everything under the current directory.
1224
* ``bzr mv`` does move or rename depending on its arguments, like
1227
* ``bzr missing`` command shows a summary of the differences
1228
between two trees. (Merged from John Arbash-Meinel.)
1230
* An email address for commits to a particular tree can be
1231
specified by putting it into .bzr/email within a branch. (Based
1232
on a patch from Heikki Paajanen.)
1237
* Faster working tree operations.
1242
* 3rd-party modules shipped with bzr are copied within the bzrlib
1243
python package, so that they can be installed by the setup
1244
script without clashing with anything already existing on the
1245
system. (Contributed by Gustavo Niemeyer.)
1247
* Moved plugins directory to bzrlib/, so that there's a standard
1248
plugin directory which is not only installed with bzr itself but
1249
is also available when using bzr from the development tree.
1250
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1251
standard plugins directory.
1253
* When exporting to a tarball with ``bzr export --format tgz``, put
1254
everything under a top directory rather than dumping it into the
1255
current directory. This can be overridden with the ``--root``
1256
option. Patch from William Dodé and John Meinel.
1258
* New ``bzr upgrade`` command to upgrade the format of a branch,
1259
replacing ``bzr check --update``.
1261
* Files within store directories are no longer marked readonly on
1264
* Changed ``bzr log`` output to a more compact form suggested by
1265
John A Meinel. Old format is available with the ``--long`` or
1266
``-l`` option, patched by William Dodé.
1268
* By default the commit command refuses to record a revision with
1269
no changes unless the ``--unchanged`` option is given.
1271
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1272
line options must come before the command name because they
1273
affect what commands are available; all other options must come
1274
after the command name because their interpretation depends on
1277
* ``branch`` and ``clone`` added as aliases for ``branch``.
1279
* Default log format is back to the long format; the compact one
1280
is available with ``--short``.
1285
* Fix bugs in committing only selected files or within a subdirectory.
1288
bzr-0.0.5 2005-06-15
1292
* ``bzr`` with no command now shows help rather than giving an
1293
error. Suggested by Michael Ellerman.
1295
* ``bzr status`` output format changed, because svn-style output
1296
doesn't really match the model of bzr. Now files are grouped by
1297
status and can be shown with their IDs. ``bzr status --all``
1298
shows all versioned files and unknown files but not ignored files.
1300
* ``bzr log`` runs from most-recent to least-recent, the reverse
1301
of the previous order. The previous behaviour can be obtained
1302
with the ``--forward`` option.
1304
* ``bzr inventory`` by default shows only filenames, and also ids
1305
if ``--show-ids`` is given, in which case the id is the second
1311
* New 'bzr whoami --email' option shows only the email component
1312
of the user identification, from Jo Vermeulen.
1314
* New ``bzr ignore PATTERN`` command.
1316
* Nicer error message for broken pipe, interrupt and similar
1317
conditions that don't indicate an internal error.
1319
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1321
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1322
either read or write mode.
1324
* New option ``bzr log --show-ids`` shows revision and file ids.
1326
* New usage ``bzr log FILENAME`` shows only revisions that
1329
* Changed format for describing changes in ``bzr log -v``.
1331
* New option ``bzr commit --file`` to take a message from a file,
1332
suggested by LarstiQ.
1334
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1335
Oler. File may be in a branch other than the working directory.
1337
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1340
* Commands can now be defined by external programs or scripts
1341
in a directory on $BZRPATH.
1343
* New "stat cache" avoids reading the contents of files if they
1344
haven't changed since the previous time.
1346
* If the Python interpreter is too old, try to find a better one
1347
or give an error. Based on a patch from Fredrik Lundh.
1349
* New optional parameter ``bzr info [BRANCH]``.
1351
* New form ``bzr commit SELECTED`` to commit only selected files.
1353
* New form ``bzr log -r FROM:TO`` shows changes in selected
1354
range; contributed by John A Meinel.
1356
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1357
options through to an external GNU diff.
1359
* New option ``bzr add --no-recurse`` to add a directory but not
1362
* ``bzr --version`` now shows more information if bzr is being run
1368
* Fixed diff format so that added and removed files will be
1369
handled properly by patch. Fix from Lalo Martins.
1371
* Various fixes for files whose names contain spaces or other
1377
* Converted black-box test suites from Bourne shell into Python;
1378
now run using ``./testbzr``. Various structural improvements to
1381
* testbzr by default runs the version of bzr found in the same
1382
directory as the tests, or the one given as the first parameter.
1384
* testbzr also runs the internal tests, so the only command
1385
required to check is just ``./testbzr``.
1387
* testbzr requires python2.4, but can be used to test bzr running
1388
under a different version.
1390
* Tests added for many other changes in this release.
1395
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1397
* Refactor command functions into Command objects based on HCT by
1398
Scott James Remnant.
1400
* Better help messages for many commands.
1402
* Expose bzrlib.open_tracefile() to start the tracefile; until
1403
this is called trace messages are just discarded.
1405
* New internal function find_touching_revisions() and hidden
1406
command touching-revisions trace the changes to a given file.
1408
* Simpler and faster compare_inventories() function.
1410
* bzrlib.open_tracefile() takes a tracefilename parameter.
1412
* New AtomicFile class.
1414
* New developer commands ``added``, ``modified``.
1419
* Cope on Windows on python2.3 by using the weaker random seed.
1420
2.4 is now only recommended.
1423
bzr-0.0.4 2005-04-22
1427
* 'bzr diff' optionally takes a list of files to diff. Still a bit
1428
basic. Patch from QuantumG.
1430
* More default ignore patterns.
1432
* New 'bzr log --verbose' shows a list of files changed in the
1433
changeset. Patch from Sebastian Cote.
1435
* Roll over ~/.bzr.log if it gets too large.
1437
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
1440
* New 'bzr help commands' based on a patch from Denys Duchier.
1445
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
1446
or $EMAIL. All are decoded by the locale preferred encoding.
1447
If none of these are present user@hostname is used. The host's
1448
fully-qualified name is not used because that tends to fail when
1449
there are DNS problems.
1451
* New 'bzr whoami' command instead of username user-email.
1456
* Make commit safe for hardlinked bzr trees.
1458
* Some Unicode/locale fixes.
1460
* Partial workaround for difflib.unified_diff not handling
1461
trailing newlines properly.
1466
* Allow docstrings for help to be in PEP0257 format. Patch from
1469
* More tests in test.sh.
1471
* Write profile data to a temporary file not into working
1472
directory and delete it when done.
1474
* Smaller .bzr.log with process ids.
1479
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
1482
* Some improvements in handling paths on Windows, based on a patch
1486
bzr-0.0.3 2005-04-06
1490
* New "directories" internal command lists versioned directories
1493
* Can now say "bzr commit --help".
1495
* New "rename" command to rename one file to a different name
1498
* New "move" command to move one or more files into a different
1501
* New "renames" command lists files renamed since base revision.
1503
* New cat command contributed by janmar.
1507
* .bzr.log is placed in $HOME (not pwd) and is always written in
1508
UTF-8. (Probably not a completely good long-term solution, but
1513
* Workaround for difflib bug in Python 2.3 that causes an
1514
exception when comparing empty files. Reported by Erik Toubro
1519
* Refactored inventory storage to insert a root entry at the top.
1523
* Start of shell-based black-box testing in test.sh.
1530
* Win32 fixes from Steve Brown.
1533
bzr-0.0.2 "black cube" 2005-03-31
1537
* Default ignore list extended (see bzrlib/__init__.py).
1539
* Patterns in .bzrignore are now added to the default ignore list,
1540
rather than replacing it.
1542
* Ignore list isn't reread for every file.
1546
* Reinstate the 'bzr check' command to check invariants of the
1549
* New 'ignored' command lists which files are ignored and why;
1550
'deleted' lists files deleted in the current working tree.
1552
* Performance improvements.
1554
* New global --profile option.
1556
* Ignore patterns like './config.h' now correctly match files in
1557
the root directory only.
1560
bzr-0.0.1 2005-03-26
1564
* More information from info command.
1566
* Can now say "bzr help COMMAND" for more detailed help.
1568
* Less file flushing and faster performance when writing logs and
1569
committing to stores.
1571
* More useful verbose output from some commands.
1575
* Fix inverted display of 'R' and 'M' during 'commit -v'.
1579
* Include a subset of ElementTree-1.2.20040618 to make
1580
installation easier.
1582
* Fix time.localtime call to work with Python 2.3 (the minimum
1586
bzr-0.0.0.69 2005-03-22
1590
* First public release.
1592
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
