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 checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
76
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
81
* Fix shadowed definition of TestLocationConfig that caused some
82
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
85
* Fix unnecessary requirement of sign-my-commits that it be run from
86
a working directory. (Martin Pool, Robert Collins)
88
* 'bzr push location' will only remember the push location if it succeeds
89
in connecting to the remote location. (#49742, John Arbash Meinel)
91
* 'bzr revert' no longer toggles the executable bit on win32
92
(#45010, John Arbash Meinel)
94
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
96
* sftp tests now work correctly on win32 if you have a newer paramiko
101
* Combine the ignore rules into a single regex rather than looping over
102
them to reduce the threshold where N^2 behaviour occurs in operations
103
like status. (Jan Hudec, Robert Collins).
105
* 'bzr push' should only push the ancestry of the current revision, not
106
all of the history in the repository. This is especially important for
107
shared repositories. (John Arbash Meinel)
109
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
110
rather than randomly walking the inventories. (John Arbash Meinel)
112
* Doctests are now run in temporary directories which are cleaned up when
113
they finish, rather than using special ScratchDir/ScratchBranch objects.
116
* Split ``check`` into separate methods on the branch and on the repository,
117
so that it can be specialized in ways that are useful or efficient for
118
different formats. (Martin Pool, Robert Collins)
120
* Deprecate Repository.all_revision_ids; most methods don't really need
121
the global revision graph but only that part leading up to a particular
122
revision. (Martin Pool, Robert Collins)
124
* Add a BzrDirFormat control_formats list which allows for control formats
125
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
126
(Robert Collins, Jelmer Vernooij).
128
* bzrlib.diff.external_diff can be redirected to any file-like object.
129
Uses subprocess instead of spawnvp.
130
(#4047, #48914, James Henstridge, John Arbash Meinel)
132
* New command line option '--profile-imports', which will install a custom
133
importer to log time to import modules and regex compilation time to
134
sys.stderr (John Arbash Meinel)
140
* setup.py failed to install launchpad plugin. (Martin Pool)
146
* Fix failure to commit a merge in a checkout. (Martin Pool,
147
Robert Collins, Erik Bågfors, #43959)
149
* Nicer messages from 'commit' in the case of renames, and correct
150
messages when a merge has occured. (Robert Collins, Martin Pool)
152
* Separate functionality from assert statements as they are skipped in
153
optimized mode of python. Add the same check to pending merges.
154
(#44443, Olaf Conradi)
158
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
160
* Add info on standalone branches without a working tree.
161
(#44155, Olaf Conradi)
163
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
167
* Make editor invocation comply with Debian Policy. First check
168
environment variables VISUAL and EDITOR, then try editor from
169
alternatives system. If that all fails, fall back to the pre-defined
170
list of editors. (#42904, Olaf Conradi)
174
* New 'register-branch' command registers a public branch into
175
Launchpad.net, where it can be associated with bugs, etc.
176
(Martin Pool, Bjorn Tillenius, Robert Collins)
180
* New public api in InventoryEntry - 'describe_change(old, new)' which
181
provides a human description of the changes between two old and
182
new. (Robert Collins, Martin Pool)
186
* Fix test case for bzr info in upgrading a standalone branch to metadir,
187
uses bzrlib api now. (Olaf Conradi)
191
NOTES WHEN UPGRADING:
193
Release 0.8 of bzr introduces a new format for history storage, called
194
'knit', as an evolution of to the 'weave' format used in 0.7. Local
195
and remote operations are faster using knits than weaves. Several
196
operations including 'init', 'init-repo', and 'upgrade' take a
197
--format option that controls this. Branching from an existing branch
198
will keep the same format.
200
It is possible to merge, pull and push between branches of different
201
formats but this is slower than moving data between homogenous
202
branches. It is therefore recommended (but not required) that you
203
upgrade all branches for a project at the same time. Information on
204
formats is shown by 'bzr info'.
206
bzr 0.8 now allows creation of 'repositories', which hold the history
207
of files and revisions for several branches. Previously bzr kept all
208
the history for a branch within the .bzr directory at the root of the
209
branch, and this is still the default. To create a repository, use
210
the new 'bzr init-repo' command. Branches exist as directories under
211
the repository and contain just a small amount of information
212
indicating the current revision of the branch.
214
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
215
subversion. Checkouts are associated with a branch (optionally in a
216
repository), which contains all the historical information. The
217
result is that a checkout can be deleted without losing any
218
already-committed revisions. A new 'update' command is also available.
220
Repositories and checkouts are not supported with the 0.7 storage
221
format. To use them you must upgrad to either knits, or to the
222
'metaweave' format, which uses weaves but changes the .bzr directory
228
* Sftp paths can now be relative, or local, according to the lftp
229
convention. Paths now take the form:
230
sftp://user:pass@host:port/~/relative/path
232
sftp://user:pass@host:port/absolute/path
234
* The FTP transport now tries to reconnect after a temporary
235
failure. ftp put is made atomic. (Matthieu Moy)
237
* The FTP transport now maintains a pool of connections, and
238
reuses them to avoid multiple connections to the same host (like
239
sftp did). (Daniel Silverstone)
241
* The bzr_man.py file has been removed. To create the man page now,
242
use ./generate_docs.py man. The new program can also create other files.
243
Run "python generate_docs.py --help" for usage information. (Hans
244
Ulrich Niedermann & James Blackwell).
246
* Man Page now gives full help (James Blackwell). Help also updated to
247
reflect user config now being stored in .bazaar (Hans Ulrich
250
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
252
* Pull now accepts a --revision argument (Erik Bågfors)
254
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
255
line. You can now use the following command to sign all of your old commits.
256
find .bzr/revision-store// -name my@email-* \
257
| sed 's/.*\/\/..\///' \
260
* Upgrade can now upgrade over the network. (Robert Collins)
262
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
263
behaviour. By default they will cache history in the checkout, but
264
with --lightweight almost all data is kept in the master branch.
267
* 'revert' unversions newly-versioned files, instead of deleting them.
269
* 'merge' is more robust. Conflict messages have changed.
271
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
274
* Default log format can be set in configuration and plugins can register
275
their own formatters. (Erik Bågfors)
277
* New 'reconcile' command will check branch consistency and repair indexes
278
that can become out of sync in pre 0.8 formats. (Robert Collins,
281
* New 'bzr init --format' and 'bzr upgrade --format' option to control
282
what storage format is created or produced. (Robert Collins,
285
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
287
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
289
* New 'init-repository' command, plus support for repositories in 'init'
290
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
292
* Improve output of 'info' command. Show all relevant locations related to
293
working tree, branch and repository. Use kibibytes for binary quantities.
294
Fix off-by-one error in missing revisions of working tree. Make 'info'
295
work on branches, repositories and remote locations. Show locations
296
relative to the shared repository, if applicable. Show locking status
297
of locations. (Olaf Conradi)
299
* Diff and merge now safely handle binary files. (Aaron Bentley)
301
* 'pull' and 'push' now normalise the revision history, so that any two
302
branches with the same tip revision will have the same output from 'log'.
305
* 'merge' accepts --remember option to store parent location, like 'push'
306
and 'pull'. (Olaf Conradi)
308
* bzr status and diff when files given as arguments do not exist
309
in the relevant trees. (Martin Pool, #3619)
311
* Add '.hg' to the default ignore list. (Martin Pool)
313
* 'knit' is now the default disk format. This improves disk performance and
314
utilization, increases incremental pull performance, robustness with SFTP
315
and allows checkouts over SFTP to perform acceptably.
316
The initial Knit code was contributed by Johan Rydberg based on a
317
specification by Martin Pool.
318
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
320
* New tool to generate all-in-one html version of the manual. (Alexander
323
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
324
to be left in the SFTP repository. (Robert Collins, Martin Pool).
326
* New option 'diff --prefix' to control how files are named in diff
327
output, with shortcuts '-p0' and '-p1' corresponding to the options for
328
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
330
* Add --revision option to 'annotate' command. (Olaf Conradi)
332
* If bzr shows an unexpected revision-history after pulling (perhaps due
333
to a reweave) it can now be corrected by 'bzr reconcile'.
338
* Commit is now verbose by default, and shows changed filenames and the
339
new revision number. (Robert Collins, Martin Pool)
341
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
343
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
345
* Make 'pull' and 'push' remember location on failure using --remember.
348
* For compatibility, make old format for using weaves inside metadir
349
available as 'metaweave' format. Rename format 'metadir' to 'default'.
350
Clean up help for option --format in commands 'init', 'init-repo' and
351
'upgrade'. (Olaf Conradi)
355
* The internal storage of history, and logical branch identity have now
356
been split into Branch, and Repository. The common locking and file
357
management routines are now in bzrlib.lockablefiles.
358
(Aaron Bentley, Robert Collins, Martin Pool)
360
* Transports can now raise DependencyNotPresent if they need a library
361
which is not installed, and then another implementation will be
364
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
367
* Using Tree Transform for merge, revert, tree-building
369
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
370
Branch.initialize are now deprecated. Please see BzrDir.create_* for
371
replacement API's. (Robert Collins)
373
* New BzrDir class represents the .bzr control directory and manages
374
formatting issues. (Robert Collins)
376
* New repository.InterRepository class encapsulates Repository to
377
Repository actions and allows for clean selection of optimised code
378
paths. (Robert Collins)
380
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
381
please use 'branch.fetch' or 'repository.fetch' depending on your
382
needs. (Robert Collins)
384
* deprecated methods now have a 'is_deprecated' flag on them that can
385
be checked, if you need to determine whether a given callable is
386
deprecated at runtime. (Robert Collins)
388
* Progress bars are now nested - see
389
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
391
* New API call get_format_description() for each type of format.
394
* Changed branch.set_parent() to accept None to remove parent.
397
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
399
* WorkingTree.branch is now a read only property. (Robert Collins)
401
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
402
can be None or a factory that will create a progress bar. This is
403
useful for testing or for overriding the bzrlib.progress heuristic.
406
* New API method get_physical_lock_status() to query locks present on a
407
transport. (Olaf Conradi)
409
* Repository.reconcile now takes a thorough keyword parameter to allow
410
requesting an indepth reconciliation, rather than just a data-loss
411
check. (Robert Collins)
413
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
414
the user for yes/no style input. (Robert Collins)
418
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
419
for testing SFTP protocol support. (Robey Pointer)
421
* Branch formats are now tested once per implementation (see bzrlib.
422
tests.branch_implementations. This is analagous to the transport
423
interface tests, and has been followed up with working tree,
424
repository and BzrDir tests. (Robert Collins)
426
* New test base class TestCaseWithTransport provides a transport aware
427
test environment, useful for testing any transport-interface using
428
code. The test suite option --transport controls the transport used
429
by this class (when its not being used as part of implementation
430
contract testing). (Robert Collins)
432
* Close logging handler on disabling the test log. This will remove the
433
handler from the internal list inside python's logging module,
434
preventing shutdown from closing it twice. (Olaf Conradi)
436
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
438
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
439
will provide String("foo") to the command as its stdin.
445
* .bzrignore is excluded from exports, on the grounds that it's a bzr
446
internal-use file and may not be wanted. (Jamie Wilkinson)
448
* The "bzr directories" command were removed in favor of the new
449
--kind option to the "bzr inventory" command. To list all
450
versioned directories, now use "bzr inventory --kind directory".
453
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
454
by default. (John Arbash Meinel)
456
* The parent of Bzr configuration directory can be set by BZR_HOME
457
environment variable. Now the path for it is searched in BZR_HOME, then
458
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
459
points to C:\Documents and Settings\User Name\Application Data), HOME.
462
* Plugins with the same name in different directories in the bzr plugin
463
path are no longer loaded: only the first successfully loaded one is
464
used. (Robert Collins)
466
* Use systems' external ssh command to open connections if possible.
467
This gives better integration with user settings such as ProxyCommand.
470
* Permissions on files underneath .bzr/ are inherited from the .bzr
471
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
472
will mean that future file will be created with group write permissions.
474
* configure.in and config.guess are no longer in the builtin default
477
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
478
files. (John Arbash Meinel, Martin Pool)
482
* "bzr INIT dir" now initializes the specified directory, and creates
483
it if it does not exist. (John Arbash Meinel)
485
* New remerge command (Aaron Bentley)
487
* Better zsh completion script. (Steve Borho)
489
* 'bzr diff' now returns 1 when there are changes in the working
490
tree. (Robert Collins)
492
* 'bzr push' now exists and can push changes to a remote location.
493
This uses the transport infrastructure, and can store the remote
494
location in the ~/.bazaar/branches.conf configuration file.
497
* Test directories are only kept if the test fails and the user requests
500
* Tweaks to short log printing
502
* Added branch nicks, new nick command, printing them in log output.
505
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
506
occurs. (Martin Pool)
508
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
509
the same as Subversion. (Martin Pool)
511
* New ftp transport support (on ftplib), for ftp:// and aftp://
512
URLs. (Daniel Silverstone)
514
* Commit editor temporary files now start with 'bzr_log.', to allow
515
text editors to match the file name and set up appropriate modes or
516
settings. (Magnus Therning)
518
* Improved performance when integrating changes from a remote weave.
519
(Goffredo Baroncelli)
521
* Sftp will attempt to cache the connection, so it is more likely that
522
a connection will be reused, rather than requiring multiple password
525
* bzr revno now takes an optional argument indicating the branch whose
526
revno should be printed. (Michael Ellerman)
528
* bzr cat defaults to printing the last version of the file.
529
(#3632, Matthieu Moy)
531
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
532
profiler. (Denys Duchier)
534
* Faster commits by reading only the headers of affected weave files.
537
* 'bzr add' now takes a --dry-run parameter which shows you what would be
538
added, but doesn't actually add anything. (Michael Ellerman)
540
* 'bzr add' now lists how many files were ignored per glob. add --verbose
541
lists the specific files. (Aaron Bentley)
543
* 'bzr missing' now supports displaying changes in diverged trees and can
544
be limited to show what either end of the comparison is missing.
545
(Aaron Bently, with a little prompting from Daniel Silverstone)
549
* SFTP can walk up to the root path without index errors. (Robert Collins)
551
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
553
* Error when run with -OO
555
* Fix bug in reporting http errors that don't have an http error code.
558
* Handle more cases of pipe errors in display commands
560
* Change status to 3 for all errors
562
* Files that are added and unlinked before committing are completely
563
ignored by diff and status
565
* Stores with some compressed texts and some uncompressed texts are now
566
able to be used. (John A Meinel)
568
* Fix for bzr pull failing sometimes under windows
570
* Fix for sftp transport under windows when using interactive auth
572
* Show files which are both renamed and modified as such in 'bzr
573
status' output. (#4503, Daniel Silverstone)
575
* Make annotate cope better with revisions committed without a valid
576
email address. (Marien Zwart)
578
* Fix representation of tab characters in commit messages. (Harald
581
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
582
now parsed properly under Windows. (Alexander Belchenko)
584
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
586
* Keep a cached copy of the basis inventory to speed up operations
587
that need to refer to it. (Johan Rydberg, Martin Pool)
589
* Fix bugs in bzr status display of non-ascii characters. (Martin
592
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
595
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
599
* Fix selftest asking for passwords when there are no SFTP keys.
600
(Robey Pointer, Jelmer Vernooij)
602
* Fix selftest run with 'python -O'. (Martin Pool)
604
* Fix HTTP tests under Windows. (John Arbash Meinel)
606
* Make tests work even if HOME is not set (Aaron Bentley)
608
* Updated build_tree to use fixed line-endings for tests which read
609
the file cotents and compare. Make some tests use this to pass under
610
Windows. (John Arbash Meinel)
612
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
614
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
617
* Use terminal width to align verbose test output. (Martin Pool)
619
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
620
If adding a new test script please add that to
621
bzrlib.tests.blackbox.__init__. (Robert Collins)
623
* Much better error message if one of the test suites can't be
624
imported. (Martin Pool)
626
* Make check now runs the test suite twice - once with the default locale,
627
and once with all locales forced to C, to expose bugs. This is not
628
trivially done within python, so for now its only triggered by running
629
Make check. Integrators and packagers who wish to check for full
630
platform support should run 'make check' to test the source.
633
* Tests can now run TestSkipped if they can't execute for any reason.
634
(Martin Pool) (NB: TestSkipped should only be raised for correctable
635
reasons - see the wiki spec ImprovingBzrTestSuite).
637
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
638
paths for the transport tests. Introduce blackbox remote sftp tests that
639
test the same permutations. (Robert Collins, Robey Pointer)
641
* Transport implementation tests are now independent of the local file
642
system, which allows tests for esoteric transports, and for features
643
not available in the local file system. They also repeat for variations
644
on the URL scheme that can introduce issues in the transport code,
645
see bzrlib.transport.TransportTestProviderAdapter() for this.
648
* TestCase.build_tree uses the transport interface to build trees, pass
649
in a transport parameter to give it an existing connection.
654
* WorkingTree.pull has been split across Branch and WorkingTree,
655
to allow Branch only pulls. (Robert Collins)
657
* commands.display_command now returns the result of the decorated
658
function. (Robert Collins)
660
* LocationConfig now has a set_user_option(key, value) call to save
661
a setting in its matching location section (a new one is created
662
if needed). (Robert Collins)
664
* Branch has two new methods, get_push_location and set_push_location
665
to respectively, get and set the push location. (Robert Collins)
667
* commands.register_command now takes an optional flag to signal that
668
the registrant is planning to decorate an existing command. When
669
given multiple plugins registering a command is not an error, and
670
the original command class (whether built in or a plugin based one) is
671
returned to the caller. There is a new error 'MustUseDecorated' for
672
signalling when a wrapping command should switch to the original
673
version. (Robert Collins)
675
* Some option parsing errors will raise 'BzrOptionError', allowing
676
granular detection for decorating commands. (Robert Collins).
678
* Branch.read_working_inventory has moved to
679
WorkingTree.read_working_inventory. This necessitated changes to
680
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
681
as well. To make it clear that a WorkingTree cannot always be obtained
682
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
683
be obtained. (Robert Collins)
685
* All pending merges operations from Branch are now on WorkingTree.
688
* The follow operations from Branch have moved to WorkingTree:
696
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
698
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
700
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
703
* bzrlib.plugin.all_plugins has been changed from an attribute to a
704
query method. (Robert Collins)
706
* New options to read only the table-of-contents of a weave.
709
* Raise NoSuchFile when someone tries to add a non-existant file.
712
* Simplify handling of DivergedBranches in cmd_pull().
716
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
717
is exposed as Branch().control_files. Also this has been altered with the
718
controlfile pre/suffix replaced by simple method names like 'get' and
719
'put'. (Aaron Bentley, Robert Collins).
721
* Deprecated functions and methods can now be marked as such using the
722
bzrlib.symbol_versioning module. Marked method have their docstring
723
updated and will issue a DeprecationWarning using the warnings module
724
when they are used. (Robert Collins)
726
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
727
for functions that need unicode strings. (Robert Collins)
733
* pull now takes --verbose to show you what revisions are added or removed
736
* merge now takes a --show-base option to include the base text in
740
* The config files are now read using ConfigObj, so '=' should be used as
741
a separator, not ':'.
744
* New 'bzr commit --strict' option refuses to commit if there are
745
any unknown files in the tree. To commit, make sure all files are
746
either ignored, added, or deleted. (Michael Ellerman)
748
* The config directory is now ~/.bazaar, and there is a single file
749
~/.bazaar/bazaar.conf storing email, editor and other preferences.
752
* 'bzr add' no longer takes a --verbose option, and a --quiet option
753
has been added that suppresses all output.
755
* Improved zsh completion support in contrib/zsh, from Clint
758
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
761
* 'bzr check' now accepts -v for verbose reporting, and checks for
762
ghosts in the branch. (Robert Collins)
764
* New command 're-sign' which will regenerate the gpg signature for
765
a revision. (Robert Collins)
767
* If you set check_signatures=require for a path in
768
~/.bazaar/branches.conf then bzr will invoke your
769
gpg_signing_command (defaults to gpg) and record a digital signature
770
of your commit. (Robert Collins)
772
* New sftp transport, based on Paramiko. (Robey Pointer)
774
* 'bzr pull' now accepts '--clobber' which will discard local changes
775
and make this branch identical to the source branch. (Robert Collins)
777
* Just give a quieter warning if a plugin can't be loaded, and
778
put the details in .bzr.log. (Martin Pool)
780
* 'bzr branch' will now set the branch-name to the last component of the
781
output directory, if one was supplied.
783
* If the option 'post_commit' is set to one (or more) python function
784
names (must be in the bzrlib namespace), then they will be invoked
785
after the commit has completed, with the branch and revision_id as
786
parameters. (Robert Collins)
788
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
790
* --merge-type weave is now supported for file contents. Tree-shape
791
changes are still three-way based. (Martin Pool, Aaron Bentley)
793
* 'bzr check' allows the first revision on revision-history to have
794
parents - something that is expected for cheap checkouts, and occurs
795
when conversions from baz do not have all history. (Robert Collins).
797
* 'bzr merge' can now graft unrelated trees together, if your specify
798
0 as a base. (Aaron Bentley)
800
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
803
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
805
* 'bzr merge --reprocess' minimizes conflicts
809
* The 'bzr selftest --pattern' option for has been removed, now
810
test specifiers on the command line can be simple strings, or
811
regexps, or both. (Robert Collins)
813
* Passing -v to selftest will now show the time each test took to
814
complete, which will aid in analysing performance regressions and
815
related questions. (Robert Collins)
817
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
818
is given. (Martin Pool)
820
* There is a new method for TestCaseInTempDir, assertFileEqual, which
821
will check that a given content is equal to the content of the named
822
file. (Robert Collins)
824
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
829
* New 'testament' command and concept for making gpg-signatures
830
of revisions that are not tied to a particular internal
831
representation. (Martin Pool).
833
* Per-revision properties ('revprops') as key-value associated
834
strings on each revision created when the revision is committed.
835
Intended mainly for the use of external tools. (Martin Pool).
837
* Config options have moved from bzrlib.osutils to bzrlib.config.
840
* Improved command line option definitions allowing explanations
841
for individual options, among other things. Contributed by
844
* Config options have moved from bzrlib.osutils to bzrlib.config.
845
Configuration is now done via the config.Config interface:
846
Depending on whether you have a Branch, a Location or no information
847
available, construct a *Config, and use its signature_checking,
848
username and user_email methods. (Robert Collins)
850
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
851
they are made available for other plugins to use. You should not
852
import other plugins during the __init__ of your plugin though, as
853
no ordering is guaranteed, and the plugins directory is not on the
854
python path. (Robert Collins)
856
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
857
no longer takes an inventory, rather it takes an option branch
858
parameter, and if None is given will open the branch at basedir
859
implicitly. (Robert Collins)
861
* Cleaner exception structure and error reporting. Suggested by
862
Scott James Remnant. (Martin Pool)
864
* Branch.remove has been moved to WorkingTree, which has also gained
865
lock_read, lock_write and unlock methods for convenience. (Robert
868
* Two decorators, needs_read_lock and needs_write_lock have been added
869
to the branch module. Use these to cause a function to run in a
870
read or write lock respectively. (Robert Collins)
872
* Branch.open_containing now returns a tuple (Branch, relative-path),
873
which allows direct access to the common case of 'get me this file
874
from its branch'. (Robert Collins)
876
* Transports can register using register_lazy_transport, and they
877
will be loaded when first used. (Martin Pool)
879
* 'pull' has been factored out of the command as WorkingTree.pull().
880
A new option to WorkingTree.pull has been added, clobber, which will
881
ignore diverged history and pull anyway.
884
* config.Config has a 'get_user_option' call that accepts an option name.
885
This will be looked up in branches.conf and bazaar.conf as normal.
886
It is intended that this be used by plugins to support options -
887
options of built in programs should have specific methods on the config.
890
* merge.merge_inner now has tempdir as an optional parameter. (Robert
893
* Tree.kind is not recorded at the top level of the hierarchy, as it was
894
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
897
* WorkingTree.__del__ has been removed, it was non deterministic and not
898
doing what it was intended to. See WorkingTree.__init__ for a comment
899
about future directions. (Robert Collins/Martin Pool)
901
* bzrlib.transport.http has been modified so that only 404 urllib errors
902
are returned as NoSuchFile. Other exceptions will propogate as normal.
903
This allows debuging of actual errors. (Robert Collins)
905
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
906
to apis like 'put', 'get' and 'has'. This is to provide consistent
907
behaviour - it operates on url's only. (Robert Collins)
909
* Transports can register using register_lazy_transport, and they
910
will be loaded when first used. (Martin Pool)
912
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
913
is called by merge_inner. This is so that the conflict count can be
914
retrieved (and potentially manipulated) before returning to the caller
915
of merge_inner. Likewise 'merge' now returns the conflict count to the
916
caller. (Robert Collins)
918
* 'revision.revision_graph can handle having only partial history for
919
a revision - that is no revisions in the graph with no parents.
922
* New builtins.branch_files uses the standard file_list rules to produce
923
a branch and a list of paths, relative to that branch (Aaron Bentley)
925
* New TestCase.addCleanup facility.
927
* New bzrlib.version_info tuple (similar to sys.version_info), which can
928
be used by programs importing bzrlib.
932
* Better handling of branches in directories with non-ascii names.
933
(Joel Rosdahl, Panagiotis Papadakos)
935
* Upgrades of trees with no commits will not fail due to accessing
936
[-1] in the revision-history. (Andres Salomon)
943
* Fix problem in pulling over http from machines that do not
944
allow directories to be listed.
946
* Avoid harmless warning about invalid hash cache after
947
upgrading branch format.
951
* Avoid some unnecessary http operations in branch and pull.
958
* 'bzr branch' over http initially gives a very high estimate
959
of completion time but it should fall as the first few
960
revisions are pulled in. branch is still slow on
961
high-latency connections.
965
* bzr-man.py has been updated to work again. Contributed by
968
* Locking is now done with fcntl.lockf which works with NFS
969
file systems. Contributed by Harald Meland.
971
* When a merge encounters a file that has been deleted on
972
one side and modified on the other, the old contents are
973
written out to foo.BASE and foo.SIDE, where SIDE is this
974
or OTHER. Contributed by Aaron Bentley.
976
* Export was choosing incorrect file paths for the content of
977
the tarball, this has been fixed by Aaron Bentley.
979
* Commit will no longer commit without a log message, an
980
error is returned instead. Contributed by Jelmer Vernooij.
982
* If you commit a specific file in a sub directory, any of its
983
parent directories that are added but not listed will be
984
automatically included. Suggested by Michael Ellerman.
986
* bzr commit and upgrade did not correctly record new revisions
987
for files with only a change to their executable status.
988
bzr will correct this when it encounters it. Fixed by
991
* HTTP tests now force off the use of http_proxy for the duration.
992
Contributed by Gustavo Niemeyer.
994
* Fix problems in merging weave-based branches that have
995
different partial views of history.
997
* Symlink support: working with symlinks when not in the root of a
998
bzr tree was broken, patch from Scott James Remnant.
1003
* 'branch' now accepts a --basis parameter which will take advantage
1004
of local history when making a new branch. This allows faster
1005
branching of remote branches. Contributed by Aaron Bentley.
1007
* New tree format based on weave files, called version 5.
1008
Existing branches can be upgraded to this format using
1011
* Symlinks are now versionable. Initial patch by
1012
Erik Toubro Nielsen, updated to head by Robert Collins.
1014
* Executable bits are tracked on files. Patch from Gustavo
1017
* 'bzr status' now shows unknown files inside a selected directory.
1018
Patch from Heikki Paajanen.
1020
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1021
and 'resolve' have needed added, which list and remove those
1022
merge conflicts respectively. A conflicted tree cannot be committed
1023
in. Contributed by Aaron Bentley.
1025
* 'rm' is now an alias for 'remove'.
1027
* Stores now split out their content in a single byte prefixed hash,
1028
dropping the density of files per directory by 256. Contributed by
1031
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1032
Contributed by Robert Collins.
1034
* 'bzr log' with the default formatter will show merged revisions,
1035
indented to the right. Initial implementation contributed by Gustavo
1036
Niemeyer, made incremental by Robert Collins.
1041
* Test case failures have the exception printed after the log
1042
for your viewing pleasure.
1044
* InventoryEntry is now an abstract base class, use one of the
1045
concrete InventoryDirectory etc classes instead.
1047
* Branch raises an UnsupportedFormatError when it detects a
1048
bzr branch it cannot understand. This allows for precise
1049
handling of such circumstances.
1054
* Removed testsweet module so that tests can be run after
1055
bzr installed by 'bzr selftest'.
1057
* 'bzr selftest' command-line arguments can now be partial ids
1058
of tests to run, e.g. 'bzr selftest test_weave'
1061
bzr 0.0.9 2005-09-23
1065
* Fixed "branch -r" option.
1067
* Fix remote access to branches containing non-compressed history.
1070
* Better reliability of http server tests. (John Arbash-Meinel)
1072
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1074
* Various minor bug in windows support have been fixed, largely in the
1075
test suite. Contributed by Alexander Belchenko.
1079
* Status now accepts a -r argument to give status between chosen
1080
revisions. Contributed by Heikki Paajanen.
1082
* Revision arguments no longer use +/-/= to control ranges, instead
1083
there is a 'before' namespace, which limits the successive namespace.
1084
For example '$ bzr log -r date:yesterday..before:date:today' will
1085
select everything from yesterday and before today. Contributed by
1088
* There is now a bzr.bat file created by distutils when building on
1089
Windows. Contributed by Alexander Belchenko.
1093
* Removed uuid() as it was unused.
1095
* Improved 'fetch' code for pulling revisions from one branch into
1096
another (used by pull, merged, etc.)
1099
bzr 0.0.8 2005-09-20
1103
* Adding a file whose parent directory is not versioned will
1104
implicitly add the parent, and so on up to the root. This means
1105
you should never need to explictly add a directory, they'll just
1106
get added when you add a file in the directory. Contributed by
1109
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1112
* If you set BZR_EDITOR in the environment, it is checked in
1113
preference to EDITOR and the config file for the interactive commit
1114
editing program. Related to this is a bugfix where a missing program
1115
set in EDITOR would cause editing to fail, now the fallback program
1116
for the operating system is still tried.
1118
* Files that are not directories/symlinks/regular files will no longer
1119
cause bzr to fail, it will just ignore them by default. You cannot add
1120
them to the tree though - they are not versionable.
1125
* Refactor xml packing/unpacking.
1129
* Fixed 'bzr mv' by Ollie Rutherfurd.
1131
* Fixed strange error when trying to access a nonexistent http
1134
* Make sure that the hashcache gets written out if it can't be
1140
* Various Windows fixes from Ollie Rutherfurd.
1142
* Quieten warnings about locking; patch from Matt Lavin.
1145
bzr-0.0.7 2005-09-02
1149
* ``bzr shell-complete`` command contributed by Clint Adams to
1150
help with intelligent shell completion.
1152
* New expert command ``bzr find-merge-base`` for debugging merges.
1157
* Much better merge support.
1159
* merge3 conflicts are now reported with markers like '<<<<<<<'
1160
(seven characters) which is the same as CVS and pleases things
1166
* ``bzr upgrade`` no longer fails when trying to fix trees that
1167
mention revisions that are not present.
1169
* Fixed bugs in listing plugins from ``bzr plugins``.
1171
* Fix case of $EDITOR containing options for the editor.
1173
* Fix log -r refusing to show the last revision.
1174
(Patch from Goffredo Baroncelli.)
1179
* ``bzr log --show-ids`` shows the revision ids of all parents.
1181
* Externally provided commands on your $BZRPATH no longer need
1182
to recognize --bzr-usage to work properly, and can just handle
1188
* Changed trace messages to go through the standard logging
1189
framework, so that they can more easily be redirected by
1194
bzr-0.0.6 2005-08-18
1198
* Python plugins, automatically loaded from the directories on
1199
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1201
* New 'bzr mkdir' command.
1203
* Commit mesage is fetched from an editor if not given on the
1204
command line; patch from Torsten Marek.
1206
* ``bzr log -m FOO`` displays commits whose message matches regexp
1209
* ``bzr add`` with no arguments adds everything under the current directory.
1211
* ``bzr mv`` does move or rename depending on its arguments, like
1214
* ``bzr missing`` command shows a summary of the differences
1215
between two trees. (Merged from John Arbash-Meinel.)
1217
* An email address for commits to a particular tree can be
1218
specified by putting it into .bzr/email within a branch. (Based
1219
on a patch from Heikki Paajanen.)
1224
* Faster working tree operations.
1229
* 3rd-party modules shipped with bzr are copied within the bzrlib
1230
python package, so that they can be installed by the setup
1231
script without clashing with anything already existing on the
1232
system. (Contributed by Gustavo Niemeyer.)
1234
* Moved plugins directory to bzrlib/, so that there's a standard
1235
plugin directory which is not only installed with bzr itself but
1236
is also available when using bzr from the development tree.
1237
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1238
standard plugins directory.
1240
* When exporting to a tarball with ``bzr export --format tgz``, put
1241
everything under a top directory rather than dumping it into the
1242
current directory. This can be overridden with the ``--root``
1243
option. Patch from William Dodé and John Meinel.
1245
* New ``bzr upgrade`` command to upgrade the format of a branch,
1246
replacing ``bzr check --update``.
1248
* Files within store directories are no longer marked readonly on
1251
* Changed ``bzr log`` output to a more compact form suggested by
1252
John A Meinel. Old format is available with the ``--long`` or
1253
``-l`` option, patched by William Dodé.
1255
* By default the commit command refuses to record a revision with
1256
no changes unless the ``--unchanged`` option is given.
1258
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1259
line options must come before the command name because they
1260
affect what commands are available; all other options must come
1261
after the command name because their interpretation depends on
1264
* ``branch`` and ``clone`` added as aliases for ``branch``.
1266
* Default log format is back to the long format; the compact one
1267
is available with ``--short``.
1272
* Fix bugs in committing only selected files or within a subdirectory.
1275
bzr-0.0.5 2005-06-15
1279
* ``bzr`` with no command now shows help rather than giving an
1280
error. Suggested by Michael Ellerman.
1282
* ``bzr status`` output format changed, because svn-style output
1283
doesn't really match the model of bzr. Now files are grouped by
1284
status and can be shown with their IDs. ``bzr status --all``
1285
shows all versioned files and unknown files but not ignored files.
1287
* ``bzr log`` runs from most-recent to least-recent, the reverse
1288
of the previous order. The previous behaviour can be obtained
1289
with the ``--forward`` option.
1291
* ``bzr inventory`` by default shows only filenames, and also ids
1292
if ``--show-ids`` is given, in which case the id is the second
1298
* New 'bzr whoami --email' option shows only the email component
1299
of the user identification, from Jo Vermeulen.
1301
* New ``bzr ignore PATTERN`` command.
1303
* Nicer error message for broken pipe, interrupt and similar
1304
conditions that don't indicate an internal error.
1306
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
1308
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
1309
either read or write mode.
1311
* New option ``bzr log --show-ids`` shows revision and file ids.
1313
* New usage ``bzr log FILENAME`` shows only revisions that
1316
* Changed format for describing changes in ``bzr log -v``.
1318
* New option ``bzr commit --file`` to take a message from a file,
1319
suggested by LarstiQ.
1321
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
1322
Oler. File may be in a branch other than the working directory.
1324
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
1327
* Commands can now be defined by external programs or scripts
1328
in a directory on $BZRPATH.
1330
* New "stat cache" avoids reading the contents of files if they
1331
haven't changed since the previous time.
1333
* If the Python interpreter is too old, try to find a better one
1334
or give an error. Based on a patch from Fredrik Lundh.
1336
* New optional parameter ``bzr info [BRANCH]``.
1338
* New form ``bzr commit SELECTED`` to commit only selected files.
1340
* New form ``bzr log -r FROM:TO`` shows changes in selected
1341
range; contributed by John A Meinel.
1343
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
1344
options through to an external GNU diff.
1346
* New option ``bzr add --no-recurse`` to add a directory but not
1349
* ``bzr --version`` now shows more information if bzr is being run
1355
* Fixed diff format so that added and removed files will be
1356
handled properly by patch. Fix from Lalo Martins.
1358
* Various fixes for files whose names contain spaces or other
1364
* Converted black-box test suites from Bourne shell into Python;
1365
now run using ``./testbzr``. Various structural improvements to
1368
* testbzr by default runs the version of bzr found in the same
1369
directory as the tests, or the one given as the first parameter.
1371
* testbzr also runs the internal tests, so the only command
1372
required to check is just ``./testbzr``.
1374
* testbzr requires python2.4, but can be used to test bzr running
1375
under a different version.
1377
* Tests added for many other changes in this release.
1382
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1384
* Refactor command functions into Command objects based on HCT by
1385
Scott James Remnant.
1387
* Better help messages for many commands.
1389
* Expose bzrlib.open_tracefile() to start the tracefile; until
1390
this is called trace messages are just discarded.
1392
* New internal function find_touching_revisions() and hidden
1393
command touching-revisions trace the changes to a given file.
1395
* Simpler and faster compare_inventories() function.
1397
* bzrlib.open_tracefile() takes a tracefilename parameter.
1399
* New AtomicFile class.
1401
* New developer commands ``added``, ``modified``.
1406
* Cope on Windows on python2.3 by using the weaker random seed.
1407
2.4 is now only recommended.
1410
bzr-0.0.4 2005-04-22
1414
* 'bzr diff' optionally takes a list of files to diff. Still a bit
1415
basic. Patch from QuantumG.
1417
* More default ignore patterns.
1419
* New 'bzr log --verbose' shows a list of files changed in the
1420
changeset. Patch from Sebastian Cote.
1422
* Roll over ~/.bzr.log if it gets too large.
1424
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
1427
* New 'bzr help commands' based on a patch from Denys Duchier.
1432
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
1433
or $EMAIL. All are decoded by the locale preferred encoding.
1434
If none of these are present user@hostname is used. The host's
1435
fully-qualified name is not used because that tends to fail when
1436
there are DNS problems.
1438
* New 'bzr whoami' command instead of username user-email.
1443
* Make commit safe for hardlinked bzr trees.
1445
* Some Unicode/locale fixes.
1447
* Partial workaround for difflib.unified_diff not handling
1448
trailing newlines properly.
1453
* Allow docstrings for help to be in PEP0257 format. Patch from
1456
* More tests in test.sh.
1458
* Write profile data to a temporary file not into working
1459
directory and delete it when done.
1461
* Smaller .bzr.log with process ids.
1466
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
1469
* Some improvements in handling paths on Windows, based on a patch
1473
bzr-0.0.3 2005-04-06
1477
* New "directories" internal command lists versioned directories
1480
* Can now say "bzr commit --help".
1482
* New "rename" command to rename one file to a different name
1485
* New "move" command to move one or more files into a different
1488
* New "renames" command lists files renamed since base revision.
1490
* New cat command contributed by janmar.
1494
* .bzr.log is placed in $HOME (not pwd) and is always written in
1495
UTF-8. (Probably not a completely good long-term solution, but
1500
* Workaround for difflib bug in Python 2.3 that causes an
1501
exception when comparing empty files. Reported by Erik Toubro
1506
* Refactored inventory storage to insert a root entry at the top.
1510
* Start of shell-based black-box testing in test.sh.
1517
* Win32 fixes from Steve Brown.
1520
bzr-0.0.2 "black cube" 2005-03-31
1524
* Default ignore list extended (see bzrlib/__init__.py).
1526
* Patterns in .bzrignore are now added to the default ignore list,
1527
rather than replacing it.
1529
* Ignore list isn't reread for every file.
1533
* Reinstate the 'bzr check' command to check invariants of the
1536
* New 'ignored' command lists which files are ignored and why;
1537
'deleted' lists files deleted in the current working tree.
1539
* Performance improvements.
1541
* New global --profile option.
1543
* Ignore patterns like './config.h' now correctly match files in
1544
the root directory only.
1547
bzr-0.0.1 2005-03-26
1551
* More information from info command.
1553
* Can now say "bzr help COMMAND" for more detailed help.
1555
* Less file flushing and faster performance when writing logs and
1556
committing to stores.
1558
* More useful verbose output from some commands.
1562
* Fix inverted display of 'R' and 'M' during 'commit -v'.
1566
* Include a subset of ElementTree-1.2.20040618 to make
1567
installation easier.
1569
* Fix time.localtime call to work with Python 2.3 (the minimum
1573
bzr-0.0.0.69 2005-03-22
1577
* First public release.
1579
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
