1
bzr-0.0.5 NOT RELEASED YET
13
* The hard-coded built-in ignore rules have been removed. There are
14
now two rulesets which are enforced. A user global one in
15
~/.bazaar/ignore which will apply to every tree, and the tree
16
specific one '.bzrignore'.
17
~/.bazaar/ignore will be created if it does not exist, but with
18
a more conservative list than the old default.
19
This fixes bugs with default rules being enforced no matter what.
20
The old list of ignore rules from bzr is available by
21
running 'bzr ignore --old-default-rules'.
22
(Robert Collins, Martin Pool, John Arbash Meinel)
24
* 'branches.conf' has been changed to 'locations.conf', since it can apply
25
to more locations than just branch locations.
30
* The revision specifier "revno:" is extended to accept the syntax
31
revno:N:branch. For example,
32
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
33
bzr.dev. (Matthieu Moy)
35
* Tests updates to ensure proper URL handling, UNICODE support, and
36
proper printing when the user's terminal encoding cannot display
37
the path of a file that has been versioned.
38
``bzr branch`` can take a target URL rather than only a local directory.
39
Branch.get_parent()/set_parent() now save a relative path if possible,
40
and normalize the parent based on root, allowing access across
41
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
42
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
45
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
46
Use terminal width for single-line logs from ``bzr log --line`` and
47
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
50
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
53
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
55
* Show the correct number of revisions pushed when pushing a new branch.
58
* 'bzr selftest' now shows a progress bar with the number of tests, and
59
progress made. 'make check' shows tests in -v mode, to be more useful
60
for the PQM status window. (Robert Collins).
61
When using a progress bar, failed tests are printed out, rather than
62
being overwritten by the progress bar until the suite finishes.
65
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
66
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
67
profile data for the individual profiled calls, allowing for fine
68
grained analysis of performance.
69
(Robert Collins, Martin Pool).
71
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
72
where commit can take an appreciable time. (Robert Collins)
74
* 'bzr add' is now less verbose in telling you what ignore globs were
75
matched by files being ignored. Instead it just tells you how many
76
were ignored (because you might reasonably be expecting none to be
77
ignored). 'bzr add -v' is unchanged and will report every ignored
78
file. (Robert Collins).
80
* ftp now has a test server if medusa is installed. As part of testing,
81
ftp support has been improved, including support for supplying a
82
non-standard port. (John Arbash Meinel).
84
* 'bzr log --line' shows the revision number, and uses only the
85
first line of the log message (#5162, Alexander Belchenko;
88
* 'bzr status' has had the --all option removed. The 'bzr ls' command
89
should be used to retrieve all versioned files. (Robert Collins)
91
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
92
over email, and applied on the other end, while maintaining ancestry.
93
This bundle can be applied with either 'bzr merge' or 'bzr pull',
94
the same way you would apply another branch.
95
(John Arbash Meinel, Aaron Bentley)
97
* 'bzr whoami' can now be used to set your identity from the command line,
98
for a branch or globally. (Robey Pointer)
100
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
103
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
106
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
107
Also updates things like 'http+pycurl://' if pycurl is not present.
108
(John Arbash Meinel) (Malone #47821, #52204)
110
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
111
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
112
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
114
* Improve the help text for 'bzr diff' to explain what various options do.
115
(John Arbash Meinel, #6391)
117
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
118
revision 10. This makes -r10 more in line with what other commands do.
119
'bzr uncommit' also now saves the pending merges of the revisions that
120
were removed. So it is safe to uncommit after a merge, fix something,
121
and commit again. (John Arbash Meinel, #32526, #31426)
123
* 'bzr init' now also works on remote locations.
124
(Wouter van Heyst, #48904)
126
* HTTP support has been updated. When using pycurl we now support
127
connection keep-alive, which reduces dns requests and round trips.
128
And for both urllib and pycurl we support multi-range requests,
129
which decreases the number of round-trips. Performance results for
130
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
131
http branching is now 2-3x faster, and ``bzr pull`` in an existing
132
branch is as much as 4x faster.
133
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
135
* Performance improvements for sftp. Branching and pulling are now up to
136
2x faster. Utilize paramiko.readv() support for async requests if it
137
is available (paramiko > 1.6) (John Arbash Meinel)
141
* Fix shadowed definition of TestLocationConfig that caused some
142
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
145
* Fix unnecessary requirement of sign-my-commits that it be run from
146
a working directory. (Martin Pool, Robert Collins)
148
* 'bzr push location' will only remember the push location if it succeeds
149
in connecting to the remote location. (#49742, John Arbash Meinel)
151
* 'bzr revert' no longer toggles the executable bit on win32
152
(#45010, John Arbash Meinel)
154
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
156
* sftp tests now work correctly on win32 if you have a newer paramiko
159
* Cleanup win32 test suite, and general cleanup of places where
160
file handles were being held open. (John Arbash Meinel)
162
* When specifying filenames for 'diff -r x..y', the name of the file in the
163
working directory can be used, even if its name is different in both x
166
* File-ids containing single- or double-quotes are handled correctly by
167
push. (#52227, Aaron Bentley)
169
* Normalize unicode filenames to ensure cross-platform consistency.
170
(John Arbash Meinel, #43689)
172
* The argument parser can now handle '-' as an argument. Currently
173
no code interprets it specially (it is mostly handled as a file named
174
'-'). But plugins, and future operations can use it.
175
(John Arbash meinel, #50984)
177
* Bundles can properly read binary files with a plain '\r' in them.
178
(John Arbash Meinel, #51927)
180
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
182
* Lots of win32 fixes (the test suite passes again).
183
(John Arbash Meinel, #50155)
185
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
187
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
189
* Removals are only committed if they match the filespec (or if there is
190
no filespec). (#46635, Aaron Bentley)
192
* smart-add recurses through all supplied directories
193
(John Arbash Meinel, #52578)
195
* Make the bundle reader extra lines before and after the bundle text.
196
This allows you to parse an email with the bundle inline.
197
(John Arbash Meinel, #49182)
199
* Change the file id generator to squash a little bit more. Helps when
200
working with long filenames on windows. (Also helps for unicode filenames
201
not generating hidden files). (John Arbash Meinel, #43801)
203
* Restore terminal mode on C-c while reading sftp password. (#48923,
204
Nicholas Allen, Martin Pool)
206
* Timestamps are rounded to 1ms, and revision entries can be recreated
207
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
209
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
210
use local paths, since it is user visible (John Arbash Meinel, #53653)
212
* ``bzr status foo`` when foo was unversioned used to cause a full delta
213
to be generated (John Arbash Meinel, #53638)
215
* When reading revision properties, an empty value should be considered
216
the empty string, not None (John Arbash Meinel, #47782)
218
* ``bzr diff --diff-options`` can now handle binary files being changed.
219
Also, the output is consistent when --diff-options is not supplied.
220
(John Arbash Meinel, #54651, #52930)
222
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
224
* Fix Branch.get_parent() to handle the case when the parent is not
225
accessible (John Arbash Meinel, #52976)
229
* Combine the ignore rules into a single regex rather than looping over
230
them to reduce the threshold where N^2 behaviour occurs in operations
231
like status. (Jan Hudec, Robert Collins).
233
* Appending to bzrlib.DEFAULT_IGNORE is now deprecated. Instead, use
234
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
236
* 'bzr push' should only push the ancestry of the current revision, not
237
all of the history in the repository. This is especially important for
238
shared repositories. (John Arbash Meinel)
240
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
241
rather than randomly walking the inventories. (John Arbash Meinel)
243
* Doctests are now run in temporary directories which are cleaned up when
244
they finish, rather than using special ScratchDir/ScratchBranch objects.
247
* Split ``check`` into separate methods on the branch and on the repository,
248
so that it can be specialized in ways that are useful or efficient for
249
different formats. (Martin Pool, Robert Collins)
251
* Deprecate Repository.all_revision_ids; most methods don't really need
252
the global revision graph but only that part leading up to a particular
253
revision. (Martin Pool, Robert Collins)
255
* Add a BzrDirFormat control_formats list which allows for control formats
256
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
257
(Robert Collins, Jelmer Vernooij).
259
* bzrlib.diff.external_diff can be redirected to any file-like object.
260
Uses subprocess instead of spawnvp.
261
(#4047, #48914, James Henstridge, John Arbash Meinel)
263
* New command line option '--profile-imports', which will install a custom
264
importer to log time to import modules and regex compilation time to
265
sys.stderr (John Arbash Meinel)
267
* 'EmptyTree' is now deprecated, please use repository.revision_tree(None)
268
instead. (Robert Collins)
270
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
276
* setup.py failed to install launchpad plugin. (Martin Pool)
282
* Fix failure to commit a merge in a checkout. (Martin Pool,
283
Robert Collins, Erik Bågfors, #43959)
285
* Nicer messages from 'commit' in the case of renames, and correct
286
messages when a merge has occured. (Robert Collins, Martin Pool)
288
* Separate functionality from assert statements as they are skipped in
289
optimized mode of python. Add the same check to pending merges.
290
(#44443, Olaf Conradi)
294
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
296
* Add info on standalone branches without a working tree.
297
(#44155, Olaf Conradi)
299
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
303
* Make editor invocation comply with Debian Policy. First check
304
environment variables VISUAL and EDITOR, then try editor from
305
alternatives system. If that all fails, fall back to the pre-defined
306
list of editors. (#42904, Olaf Conradi)
310
* New 'register-branch' command registers a public branch into
311
Launchpad.net, where it can be associated with bugs, etc.
312
(Martin Pool, Bjorn Tillenius, Robert Collins)
316
* New public api in InventoryEntry - 'describe_change(old, new)' which
317
provides a human description of the changes between two old and
318
new. (Robert Collins, Martin Pool)
322
* Fix test case for bzr info in upgrading a standalone branch to metadir,
323
uses bzrlib api now. (Olaf Conradi)
327
NOTES WHEN UPGRADING:
329
Release 0.8 of bzr introduces a new format for history storage, called
330
'knit', as an evolution of to the 'weave' format used in 0.7. Local
331
and remote operations are faster using knits than weaves. Several
332
operations including 'init', 'init-repo', and 'upgrade' take a
333
--format option that controls this. Branching from an existing branch
334
will keep the same format.
336
It is possible to merge, pull and push between branches of different
337
formats but this is slower than moving data between homogenous
338
branches. It is therefore recommended (but not required) that you
339
upgrade all branches for a project at the same time. Information on
340
formats is shown by 'bzr info'.
342
bzr 0.8 now allows creation of 'repositories', which hold the history
343
of files and revisions for several branches. Previously bzr kept all
344
the history for a branch within the .bzr directory at the root of the
345
branch, and this is still the default. To create a repository, use
346
the new 'bzr init-repo' command. Branches exist as directories under
347
the repository and contain just a small amount of information
348
indicating the current revision of the branch.
350
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
351
subversion. Checkouts are associated with a branch (optionally in a
352
repository), which contains all the historical information. The
353
result is that a checkout can be deleted without losing any
354
already-committed revisions. A new 'update' command is also available.
356
Repositories and checkouts are not supported with the 0.7 storage
357
format. To use them you must upgrad to either knits, or to the
358
'metaweave' format, which uses weaves but changes the .bzr directory
364
* Sftp paths can now be relative, or local, according to the lftp
365
convention. Paths now take the form:
366
sftp://user:pass@host:port/~/relative/path
368
sftp://user:pass@host:port/absolute/path
370
* The FTP transport now tries to reconnect after a temporary
371
failure. ftp put is made atomic. (Matthieu Moy)
373
* The FTP transport now maintains a pool of connections, and
374
reuses them to avoid multiple connections to the same host (like
375
sftp did). (Daniel Silverstone)
377
* The bzr_man.py file has been removed. To create the man page now,
378
use ./generate_docs.py man. The new program can also create other files.
379
Run "python generate_docs.py --help" for usage information. (Hans
380
Ulrich Niedermann & James Blackwell).
382
* Man Page now gives full help (James Blackwell). Help also updated to
383
reflect user config now being stored in .bazaar (Hans Ulrich
386
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
388
* Pull now accepts a --revision argument (Erik Bågfors)
390
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
391
line. You can now use the following command to sign all of your old commits.
392
find .bzr/revision-store// -name my@email-* \
393
| sed 's/.*\/\/..\///' \
396
* Upgrade can now upgrade over the network. (Robert Collins)
398
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
399
behaviour. By default they will cache history in the checkout, but
400
with --lightweight almost all data is kept in the master branch.
403
* 'revert' unversions newly-versioned files, instead of deleting them.
405
* 'merge' is more robust. Conflict messages have changed.
407
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
410
* Default log format can be set in configuration and plugins can register
411
their own formatters. (Erik Bågfors)
413
* New 'reconcile' command will check branch consistency and repair indexes
414
that can become out of sync in pre 0.8 formats. (Robert Collins,
417
* New 'bzr init --format' and 'bzr upgrade --format' option to control
418
what storage format is created or produced. (Robert Collins,
421
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
423
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
425
* New 'init-repository' command, plus support for repositories in 'init'
426
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
428
* Improve output of 'info' command. Show all relevant locations related to
429
working tree, branch and repository. Use kibibytes for binary quantities.
430
Fix off-by-one error in missing revisions of working tree. Make 'info'
431
work on branches, repositories and remote locations. Show locations
432
relative to the shared repository, if applicable. Show locking status
433
of locations. (Olaf Conradi)
435
* Diff and merge now safely handle binary files. (Aaron Bentley)
437
* 'pull' and 'push' now normalise the revision history, so that any two
438
branches with the same tip revision will have the same output from 'log'.
441
* 'merge' accepts --remember option to store parent location, like 'push'
442
and 'pull'. (Olaf Conradi)
444
* bzr status and diff when files given as arguments do not exist
445
in the relevant trees. (Martin Pool, #3619)
447
* Add '.hg' to the default ignore list. (Martin Pool)
449
* 'knit' is now the default disk format. This improves disk performance and
450
utilization, increases incremental pull performance, robustness with SFTP
451
and allows checkouts over SFTP to perform acceptably.
452
The initial Knit code was contributed by Johan Rydberg based on a
453
specification by Martin Pool.
454
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
456
* New tool to generate all-in-one html version of the manual. (Alexander
459
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
460
to be left in the SFTP repository. (Robert Collins, Martin Pool).
462
* New option 'diff --prefix' to control how files are named in diff
463
output, with shortcuts '-p0' and '-p1' corresponding to the options for
464
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
466
* Add --revision option to 'annotate' command. (Olaf Conradi)
468
* If bzr shows an unexpected revision-history after pulling (perhaps due
469
to a reweave) it can now be corrected by 'bzr reconcile'.
474
* Commit is now verbose by default, and shows changed filenames and the
475
new revision number. (Robert Collins, Martin Pool)
477
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
479
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
481
* Make 'pull' and 'push' remember location on failure using --remember.
484
* For compatibility, make old format for using weaves inside metadir
485
available as 'metaweave' format. Rename format 'metadir' to 'default'.
486
Clean up help for option --format in commands 'init', 'init-repo' and
487
'upgrade'. (Olaf Conradi)
491
* The internal storage of history, and logical branch identity have now
492
been split into Branch, and Repository. The common locking and file
493
management routines are now in bzrlib.lockablefiles.
494
(Aaron Bentley, Robert Collins, Martin Pool)
496
* Transports can now raise DependencyNotPresent if they need a library
497
which is not installed, and then another implementation will be
500
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
503
* Using Tree Transform for merge, revert, tree-building
505
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
506
Branch.initialize are now deprecated. Please see BzrDir.create_* for
507
replacement API's. (Robert Collins)
509
* New BzrDir class represents the .bzr control directory and manages
510
formatting issues. (Robert Collins)
512
* New repository.InterRepository class encapsulates Repository to
513
Repository actions and allows for clean selection of optimised code
514
paths. (Robert Collins)
516
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
517
please use 'branch.fetch' or 'repository.fetch' depending on your
518
needs. (Robert Collins)
520
* deprecated methods now have a 'is_deprecated' flag on them that can
521
be checked, if you need to determine whether a given callable is
522
deprecated at runtime. (Robert Collins)
524
* Progress bars are now nested - see
525
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
527
* New API call get_format_description() for each type of format.
530
* Changed branch.set_parent() to accept None to remove parent.
533
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
535
* WorkingTree.branch is now a read only property. (Robert Collins)
537
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
538
can be None or a factory that will create a progress bar. This is
539
useful for testing or for overriding the bzrlib.progress heuristic.
542
* New API method get_physical_lock_status() to query locks present on a
543
transport. (Olaf Conradi)
545
* Repository.reconcile now takes a thorough keyword parameter to allow
546
requesting an indepth reconciliation, rather than just a data-loss
547
check. (Robert Collins)
549
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
550
the user for yes/no style input. (Robert Collins)
554
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
555
for testing SFTP protocol support. (Robey Pointer)
557
* Branch formats are now tested once per implementation (see bzrlib.
558
tests.branch_implementations. This is analagous to the transport
559
interface tests, and has been followed up with working tree,
560
repository and BzrDir tests. (Robert Collins)
562
* New test base class TestCaseWithTransport provides a transport aware
563
test environment, useful for testing any transport-interface using
564
code. The test suite option --transport controls the transport used
565
by this class (when its not being used as part of implementation
566
contract testing). (Robert Collins)
568
* Close logging handler on disabling the test log. This will remove the
569
handler from the internal list inside python's logging module,
570
preventing shutdown from closing it twice. (Olaf Conradi)
572
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
574
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
575
will provide String("foo") to the command as its stdin.
581
* .bzrignore is excluded from exports, on the grounds that it's a bzr
582
internal-use file and may not be wanted. (Jamie Wilkinson)
584
* The "bzr directories" command were removed in favor of the new
585
--kind option to the "bzr inventory" command. To list all
586
versioned directories, now use "bzr inventory --kind directory".
589
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
590
by default. (John Arbash Meinel)
592
* The parent of Bzr configuration directory can be set by BZR_HOME
593
environment variable. Now the path for it is searched in BZR_HOME, then
594
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
595
points to C:\Documents and Settings\User Name\Application Data), HOME.
598
* Plugins with the same name in different directories in the bzr plugin
599
path are no longer loaded: only the first successfully loaded one is
600
used. (Robert Collins)
602
* Use systems' external ssh command to open connections if possible.
603
This gives better integration with user settings such as ProxyCommand.
606
* Permissions on files underneath .bzr/ are inherited from the .bzr
607
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
608
will mean that future file will be created with group write permissions.
610
* configure.in and config.guess are no longer in the builtin default
613
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
614
files. (John Arbash Meinel, Martin Pool)
618
* "bzr INIT dir" now initializes the specified directory, and creates
619
it if it does not exist. (John Arbash Meinel)
621
* New remerge command (Aaron Bentley)
623
* Better zsh completion script. (Steve Borho)
625
* 'bzr diff' now returns 1 when there are changes in the working
626
tree. (Robert Collins)
628
* 'bzr push' now exists and can push changes to a remote location.
629
This uses the transport infrastructure, and can store the remote
630
location in the ~/.bazaar/branches.conf configuration file.
633
* Test directories are only kept if the test fails and the user requests
636
* Tweaks to short log printing
638
* Added branch nicks, new nick command, printing them in log output.
641
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
642
occurs. (Martin Pool)
644
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
645
the same as Subversion. (Martin Pool)
647
* New ftp transport support (on ftplib), for ftp:// and aftp://
648
URLs. (Daniel Silverstone)
650
* Commit editor temporary files now start with 'bzr_log.', to allow
651
text editors to match the file name and set up appropriate modes or
652
settings. (Magnus Therning)
654
* Improved performance when integrating changes from a remote weave.
655
(Goffredo Baroncelli)
657
* Sftp will attempt to cache the connection, so it is more likely that
658
a connection will be reused, rather than requiring multiple password
661
* bzr revno now takes an optional argument indicating the branch whose
662
revno should be printed. (Michael Ellerman)
664
* bzr cat defaults to printing the last version of the file.
665
(#3632, Matthieu Moy)
667
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
668
profiler. (Denys Duchier)
670
* Faster commits by reading only the headers of affected weave files.
673
* 'bzr add' now takes a --dry-run parameter which shows you what would be
674
added, but doesn't actually add anything. (Michael Ellerman)
676
* 'bzr add' now lists how many files were ignored per glob. add --verbose
677
lists the specific files. (Aaron Bentley)
679
* 'bzr missing' now supports displaying changes in diverged trees and can
680
be limited to show what either end of the comparison is missing.
681
(Aaron Bently, with a little prompting from Daniel Silverstone)
685
* SFTP can walk up to the root path without index errors. (Robert Collins)
687
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
689
* Error when run with -OO
691
* Fix bug in reporting http errors that don't have an http error code.
694
* Handle more cases of pipe errors in display commands
696
* Change status to 3 for all errors
698
* Files that are added and unlinked before committing are completely
699
ignored by diff and status
701
* Stores with some compressed texts and some uncompressed texts are now
702
able to be used. (John A Meinel)
704
* Fix for bzr pull failing sometimes under windows
706
* Fix for sftp transport under windows when using interactive auth
708
* Show files which are both renamed and modified as such in 'bzr
709
status' output. (#4503, Daniel Silverstone)
711
* Make annotate cope better with revisions committed without a valid
712
email address. (Marien Zwart)
714
* Fix representation of tab characters in commit messages. (Harald
717
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
718
now parsed properly under Windows. (Alexander Belchenko)
720
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
722
* Keep a cached copy of the basis inventory to speed up operations
723
that need to refer to it. (Johan Rydberg, Martin Pool)
725
* Fix bugs in bzr status display of non-ascii characters. (Martin
728
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
731
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
735
* Fix selftest asking for passwords when there are no SFTP keys.
736
(Robey Pointer, Jelmer Vernooij)
738
* Fix selftest run with 'python -O'. (Martin Pool)
740
* Fix HTTP tests under Windows. (John Arbash Meinel)
742
* Make tests work even if HOME is not set (Aaron Bentley)
744
* Updated build_tree to use fixed line-endings for tests which read
745
the file cotents and compare. Make some tests use this to pass under
746
Windows. (John Arbash Meinel)
748
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
750
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
753
* Use terminal width to align verbose test output. (Martin Pool)
755
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
756
If adding a new test script please add that to
757
bzrlib.tests.blackbox.__init__. (Robert Collins)
759
* Much better error message if one of the test suites can't be
760
imported. (Martin Pool)
762
* Make check now runs the test suite twice - once with the default locale,
763
and once with all locales forced to C, to expose bugs. This is not
764
trivially done within python, so for now its only triggered by running
765
Make check. Integrators and packagers who wish to check for full
766
platform support should run 'make check' to test the source.
769
* Tests can now run TestSkipped if they can't execute for any reason.
770
(Martin Pool) (NB: TestSkipped should only be raised for correctable
771
reasons - see the wiki spec ImprovingBzrTestSuite).
773
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
774
paths for the transport tests. Introduce blackbox remote sftp tests that
775
test the same permutations. (Robert Collins, Robey Pointer)
777
* Transport implementation tests are now independent of the local file
778
system, which allows tests for esoteric transports, and for features
779
not available in the local file system. They also repeat for variations
780
on the URL scheme that can introduce issues in the transport code,
781
see bzrlib.transport.TransportTestProviderAdapter() for this.
784
* TestCase.build_tree uses the transport interface to build trees, pass
785
in a transport parameter to give it an existing connection.
790
* WorkingTree.pull has been split across Branch and WorkingTree,
791
to allow Branch only pulls. (Robert Collins)
793
* commands.display_command now returns the result of the decorated
794
function. (Robert Collins)
796
* LocationConfig now has a set_user_option(key, value) call to save
797
a setting in its matching location section (a new one is created
798
if needed). (Robert Collins)
800
* Branch has two new methods, get_push_location and set_push_location
801
to respectively, get and set the push location. (Robert Collins)
803
* commands.register_command now takes an optional flag to signal that
804
the registrant is planning to decorate an existing command. When
805
given multiple plugins registering a command is not an error, and
806
the original command class (whether built in or a plugin based one) is
807
returned to the caller. There is a new error 'MustUseDecorated' for
808
signalling when a wrapping command should switch to the original
809
version. (Robert Collins)
811
* Some option parsing errors will raise 'BzrOptionError', allowing
812
granular detection for decorating commands. (Robert Collins).
814
* Branch.read_working_inventory has moved to
815
WorkingTree.read_working_inventory. This necessitated changes to
816
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
817
as well. To make it clear that a WorkingTree cannot always be obtained
818
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
819
be obtained. (Robert Collins)
821
* All pending merges operations from Branch are now on WorkingTree.
824
* The follow operations from Branch have moved to WorkingTree:
832
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
834
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
836
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
839
* bzrlib.plugin.all_plugins has been changed from an attribute to a
840
query method. (Robert Collins)
842
* New options to read only the table-of-contents of a weave.
845
* Raise NoSuchFile when someone tries to add a non-existant file.
848
* Simplify handling of DivergedBranches in cmd_pull().
852
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
853
is exposed as Branch().control_files. Also this has been altered with the
854
controlfile pre/suffix replaced by simple method names like 'get' and
855
'put'. (Aaron Bentley, Robert Collins).
857
* Deprecated functions and methods can now be marked as such using the
858
bzrlib.symbol_versioning module. Marked method have their docstring
859
updated and will issue a DeprecationWarning using the warnings module
860
when they are used. (Robert Collins)
862
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
863
for functions that need unicode strings. (Robert Collins)
869
* pull now takes --verbose to show you what revisions are added or removed
872
* merge now takes a --show-base option to include the base text in
876
* The config files are now read using ConfigObj, so '=' should be used as
877
a separator, not ':'.
880
* New 'bzr commit --strict' option refuses to commit if there are
881
any unknown files in the tree. To commit, make sure all files are
882
either ignored, added, or deleted. (Michael Ellerman)
884
* The config directory is now ~/.bazaar, and there is a single file
885
~/.bazaar/bazaar.conf storing email, editor and other preferences.
888
* 'bzr add' no longer takes a --verbose option, and a --quiet option
889
has been added that suppresses all output.
891
* Improved zsh completion support in contrib/zsh, from Clint
894
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
897
* 'bzr check' now accepts -v for verbose reporting, and checks for
898
ghosts in the branch. (Robert Collins)
900
* New command 're-sign' which will regenerate the gpg signature for
901
a revision. (Robert Collins)
903
* If you set check_signatures=require for a path in
904
~/.bazaar/branches.conf then bzr will invoke your
905
gpg_signing_command (defaults to gpg) and record a digital signature
906
of your commit. (Robert Collins)
908
* New sftp transport, based on Paramiko. (Robey Pointer)
910
* 'bzr pull' now accepts '--clobber' which will discard local changes
911
and make this branch identical to the source branch. (Robert Collins)
913
* Just give a quieter warning if a plugin can't be loaded, and
914
put the details in .bzr.log. (Martin Pool)
916
* 'bzr branch' will now set the branch-name to the last component of the
917
output directory, if one was supplied.
919
* If the option 'post_commit' is set to one (or more) python function
920
names (must be in the bzrlib namespace), then they will be invoked
921
after the commit has completed, with the branch and revision_id as
922
parameters. (Robert Collins)
924
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
926
* --merge-type weave is now supported for file contents. Tree-shape
927
changes are still three-way based. (Martin Pool, Aaron Bentley)
929
* 'bzr check' allows the first revision on revision-history to have
930
parents - something that is expected for cheap checkouts, and occurs
931
when conversions from baz do not have all history. (Robert Collins).
933
* 'bzr merge' can now graft unrelated trees together, if your specify
934
0 as a base. (Aaron Bentley)
936
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
939
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
941
* 'bzr merge --reprocess' minimizes conflicts
945
* The 'bzr selftest --pattern' option for has been removed, now
946
test specifiers on the command line can be simple strings, or
947
regexps, or both. (Robert Collins)
949
* Passing -v to selftest will now show the time each test took to
950
complete, which will aid in analysing performance regressions and
951
related questions. (Robert Collins)
953
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
954
is given. (Martin Pool)
956
* There is a new method for TestCaseInTempDir, assertFileEqual, which
957
will check that a given content is equal to the content of the named
958
file. (Robert Collins)
960
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
965
* New 'testament' command and concept for making gpg-signatures
966
of revisions that are not tied to a particular internal
967
representation. (Martin Pool).
969
* Per-revision properties ('revprops') as key-value associated
970
strings on each revision created when the revision is committed.
971
Intended mainly for the use of external tools. (Martin Pool).
973
* Config options have moved from bzrlib.osutils to bzrlib.config.
976
* Improved command line option definitions allowing explanations
977
for individual options, among other things. Contributed by
980
* Config options have moved from bzrlib.osutils to bzrlib.config.
981
Configuration is now done via the config.Config interface:
982
Depending on whether you have a Branch, a Location or no information
983
available, construct a *Config, and use its signature_checking,
984
username and user_email methods. (Robert Collins)
986
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
987
they are made available for other plugins to use. You should not
988
import other plugins during the __init__ of your plugin though, as
989
no ordering is guaranteed, and the plugins directory is not on the
990
python path. (Robert Collins)
992
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
993
no longer takes an inventory, rather it takes an option branch
994
parameter, and if None is given will open the branch at basedir
995
implicitly. (Robert Collins)
997
* Cleaner exception structure and error reporting. Suggested by
998
Scott James Remnant. (Martin Pool)
1000
* Branch.remove has been moved to WorkingTree, which has also gained
1001
lock_read, lock_write and unlock methods for convenience. (Robert
1004
* Two decorators, needs_read_lock and needs_write_lock have been added
1005
to the branch module. Use these to cause a function to run in a
1006
read or write lock respectively. (Robert Collins)
1008
* Branch.open_containing now returns a tuple (Branch, relative-path),
1009
which allows direct access to the common case of 'get me this file
1010
from its branch'. (Robert Collins)
1012
* Transports can register using register_lazy_transport, and they
1013
will be loaded when first used. (Martin Pool)
1015
* 'pull' has been factored out of the command as WorkingTree.pull().
1016
A new option to WorkingTree.pull has been added, clobber, which will
1017
ignore diverged history and pull anyway.
1020
* config.Config has a 'get_user_option' call that accepts an option name.
1021
This will be looked up in branches.conf and bazaar.conf as normal.
1022
It is intended that this be used by plugins to support options -
1023
options of built in programs should have specific methods on the config.
1026
* merge.merge_inner now has tempdir as an optional parameter. (Robert
1029
* Tree.kind is not recorded at the top level of the hierarchy, as it was
1030
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
1033
* WorkingTree.__del__ has been removed, it was non deterministic and not
1034
doing what it was intended to. See WorkingTree.__init__ for a comment
1035
about future directions. (Robert Collins/Martin Pool)
1037
* bzrlib.transport.http has been modified so that only 404 urllib errors
1038
are returned as NoSuchFile. Other exceptions will propogate as normal.
1039
This allows debuging of actual errors. (Robert Collins)
1041
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
1042
to apis like 'put', 'get' and 'has'. This is to provide consistent
1043
behaviour - it operates on url's only. (Robert Collins)
1045
* Transports can register using register_lazy_transport, and they
1046
will be loaded when first used. (Martin Pool)
1048
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
1049
is called by merge_inner. This is so that the conflict count can be
1050
retrieved (and potentially manipulated) before returning to the caller
1051
of merge_inner. Likewise 'merge' now returns the conflict count to the
1052
caller. (Robert Collins)
1054
* 'revision.revision_graph can handle having only partial history for
1055
a revision - that is no revisions in the graph with no parents.
1058
* New builtins.branch_files uses the standard file_list rules to produce
1059
a branch and a list of paths, relative to that branch (Aaron Bentley)
1061
* New TestCase.addCleanup facility.
1063
* New bzrlib.version_info tuple (similar to sys.version_info), which can
1064
be used by programs importing bzrlib.
1068
* Better handling of branches in directories with non-ascii names.
1069
(Joel Rosdahl, Panagiotis Papadakos)
1071
* Upgrades of trees with no commits will not fail due to accessing
1072
[-1] in the revision-history. (Andres Salomon)
1075
bzr 0.1.1 2005-10-12
1079
* Fix problem in pulling over http from machines that do not
1080
allow directories to be listed.
1082
* Avoid harmless warning about invalid hash cache after
1083
upgrading branch format.
1087
* Avoid some unnecessary http operations in branch and pull.
1094
* 'bzr branch' over http initially gives a very high estimate
1095
of completion time but it should fall as the first few
1096
revisions are pulled in. branch is still slow on
1097
high-latency connections.
1101
* bzr-man.py has been updated to work again. Contributed by
1104
* Locking is now done with fcntl.lockf which works with NFS
1105
file systems. Contributed by Harald Meland.
1107
* When a merge encounters a file that has been deleted on
1108
one side and modified on the other, the old contents are
1109
written out to foo.BASE and foo.SIDE, where SIDE is this
1110
or OTHER. Contributed by Aaron Bentley.
1112
* Export was choosing incorrect file paths for the content of
1113
the tarball, this has been fixed by Aaron Bentley.
1115
* Commit will no longer commit without a log message, an
1116
error is returned instead. Contributed by Jelmer Vernooij.
1118
* If you commit a specific file in a sub directory, any of its
1119
parent directories that are added but not listed will be
1120
automatically included. Suggested by Michael Ellerman.
1122
* bzr commit and upgrade did not correctly record new revisions
1123
for files with only a change to their executable status.
1124
bzr will correct this when it encounters it. Fixed by
1127
* HTTP tests now force off the use of http_proxy for the duration.
1128
Contributed by Gustavo Niemeyer.
1130
* Fix problems in merging weave-based branches that have
1131
different partial views of history.
1133
* Symlink support: working with symlinks when not in the root of a
1134
bzr tree was broken, patch from Scott James Remnant.
1138
* 'branch' now accepts a --basis parameter which will take advantage
1139
of local history when making a new branch. This allows faster
1140
branching of remote branches. Contributed by Aaron Bentley.
1142
* New tree format based on weave files, called version 5.
1143
Existing branches can be upgraded to this format using
1146
* Symlinks are now versionable. Initial patch by
1147
Erik Toubro Nielsen, updated to head by Robert Collins.
1149
* Executable bits are tracked on files. Patch from Gustavo
1152
* 'bzr status' now shows unknown files inside a selected directory.
1153
Patch from Heikki Paajanen.
1155
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
1156
and 'resolve' have needed added, which list and remove those
1157
merge conflicts respectively. A conflicted tree cannot be committed
1158
in. Contributed by Aaron Bentley.
1160
* 'rm' is now an alias for 'remove'.
1162
* Stores now split out their content in a single byte prefixed hash,
1163
dropping the density of files per directory by 256. Contributed by
1166
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
1167
Contributed by Robert Collins.
1169
* 'bzr log' with the default formatter will show merged revisions,
1170
indented to the right. Initial implementation contributed by Gustavo
1171
Niemeyer, made incremental by Robert Collins.
1176
* Test case failures have the exception printed after the log
1177
for your viewing pleasure.
1179
* InventoryEntry is now an abstract base class, use one of the
1180
concrete InventoryDirectory etc classes instead.
1182
* Branch raises an UnsupportedFormatError when it detects a
1183
bzr branch it cannot understand. This allows for precise
1184
handling of such circumstances.
1189
* Removed testsweet module so that tests can be run after
1190
bzr installed by 'bzr selftest'.
1192
* 'bzr selftest' command-line arguments can now be partial ids
1193
of tests to run, e.g. 'bzr selftest test_weave'
1196
bzr 0.0.9 2005-09-23
1200
* Fixed "branch -r" option.
1202
* Fix remote access to branches containing non-compressed history.
1205
* Better reliability of http server tests. (John Arbash-Meinel)
1207
* Merge graph maximum distance calculation fix. (Aaron Bentley)
1209
* Various minor bug in windows support have been fixed, largely in the
1210
test suite. Contributed by Alexander Belchenko.
1214
* Status now accepts a -r argument to give status between chosen
1215
revisions. Contributed by Heikki Paajanen.
1217
* Revision arguments no longer use +/-/= to control ranges, instead
1218
there is a 'before' namespace, which limits the successive namespace.
1219
For example '$ bzr log -r date:yesterday..before:date:today' will
1220
select everything from yesterday and before today. Contributed by
1223
* There is now a bzr.bat file created by distutils when building on
1224
Windows. Contributed by Alexander Belchenko.
1228
* Removed uuid() as it was unused.
1230
* Improved 'fetch' code for pulling revisions from one branch into
1231
another (used by pull, merged, etc.)
1234
bzr 0.0.8 2005-09-20
1238
* Adding a file whose parent directory is not versioned will
1239
implicitly add the parent, and so on up to the root. This means
1240
you should never need to explictly add a directory, they'll just
1241
get added when you add a file in the directory. Contributed by
1244
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
1247
* If you set BZR_EDITOR in the environment, it is checked in
1248
preference to EDITOR and the config file for the interactive commit
1249
editing program. Related to this is a bugfix where a missing program
1250
set in EDITOR would cause editing to fail, now the fallback program
1251
for the operating system is still tried.
1253
* Files that are not directories/symlinks/regular files will no longer
1254
cause bzr to fail, it will just ignore them by default. You cannot add
1255
them to the tree though - they are not versionable.
1260
* Refactor xml packing/unpacking.
1264
* Fixed 'bzr mv' by Ollie Rutherfurd.
1266
* Fixed strange error when trying to access a nonexistent http
1269
* Make sure that the hashcache gets written out if it can't be
1275
* Various Windows fixes from Ollie Rutherfurd.
1277
* Quieten warnings about locking; patch from Matt Lavin.
1280
bzr-0.0.7 2005-09-02
1284
* ``bzr shell-complete`` command contributed by Clint Adams to
1285
help with intelligent shell completion.
1287
* New expert command ``bzr find-merge-base`` for debugging merges.
1292
* Much better merge support.
1294
* merge3 conflicts are now reported with markers like '<<<<<<<'
1295
(seven characters) which is the same as CVS and pleases things
1301
* ``bzr upgrade`` no longer fails when trying to fix trees that
1302
mention revisions that are not present.
1304
* Fixed bugs in listing plugins from ``bzr plugins``.
1306
* Fix case of $EDITOR containing options for the editor.
1308
* Fix log -r refusing to show the last revision.
1309
(Patch from Goffredo Baroncelli.)
1314
* ``bzr log --show-ids`` shows the revision ids of all parents.
1316
* Externally provided commands on your $BZRPATH no longer need
1317
to recognize --bzr-usage to work properly, and can just handle
1323
* Changed trace messages to go through the standard logging
1324
framework, so that they can more easily be redirected by
1329
bzr-0.0.6 2005-08-18
1333
* Python plugins, automatically loaded from the directories on
1334
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1336
* New 'bzr mkdir' command.
1338
* Commit mesage is fetched from an editor if not given on the
1339
command line; patch from Torsten Marek.
1341
* ``bzr log -m FOO`` displays commits whose message matches regexp
1344
* ``bzr add`` with no arguments adds everything under the current directory.
1346
* ``bzr mv`` does move or rename depending on its arguments, like
1349
* ``bzr missing`` command shows a summary of the differences
1350
between two trees. (Merged from John Arbash-Meinel.)
1352
* An email address for commits to a particular tree can be
1353
specified by putting it into .bzr/email within a branch. (Based
1354
on a patch from Heikki Paajanen.)
1359
* Faster working tree operations.
1364
* 3rd-party modules shipped with bzr are copied within the bzrlib
1365
python package, so that they can be installed by the setup
1366
script without clashing with anything already existing on the
1367
system. (Contributed by Gustavo Niemeyer.)
1369
* Moved plugins directory to bzrlib/, so that there's a standard
1370
plugin directory which is not only installed with bzr itself but
1371
is also available when using bzr from the development tree.
1372
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1373
standard plugins directory.
1375
* When exporting to a tarball with ``bzr export --format tgz``, put
1376
everything under a top directory rather than dumping it into the
1377
current directory. This can be overridden with the ``--root``
1378
option. Patch from William Dodé and John Meinel.
1380
* New ``bzr upgrade`` command to upgrade the format of a branch,
1381
replacing ``bzr check --update``.
1383
* Files within store directories are no longer marked readonly on
1386
* Changed ``bzr log`` output to a more compact form suggested by
1387
John A Meinel. Old format is available with the ``--long`` or
1388
``-l`` option, patched by William Dodé.
1390
* By default the commit command refuses to record a revision with
1391
no changes unless the ``--unchanged`` option is given.
1393
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1394
line options must come before the command name because they
1395
affect what commands are available; all other options must come
1396
after the command name because their interpretation depends on
1399
* ``branch`` and ``clone`` added as aliases for ``branch``.
1401
* Default log format is back to the long format; the compact one
1402
is available with ``--short``.
1407
* Fix bugs in committing only selected files or within a subdirectory.
1410
bzr-0.0.5 2005-06-15
1414
* ``bzr`` with no command now shows help rather than giving an
1415
error. Suggested by Michael Ellerman.
1417
* ``bzr status`` output format changed, because svn-style output
1418
doesn't really match the model of bzr. Now files are grouped by
1419
status and can be shown with their IDs. ``bzr status --all``
1420
shows all versioned files and unknown files but not ignored files.
1422
* ``bzr log`` runs from most-recent to least-recent, the reverse
1423
of the previous order. The previous behaviour can be obtained
1424
with the ``--forward`` option.
1426
* ``bzr inventory`` by default shows only filenames, and also ids
1427
if ``--show-ids`` is given, in which case the id is the second
5
1433
* New 'bzr whoami --email' option shows only the email component
6
1434
of the user identification, from Jo Vermeulen.
8
* New 'bzr ignore PATTERN' command.
1436
* New ``bzr ignore PATTERN`` command.
10
1438
* Nicer error message for broken pipe, interrupt and similar
11
1439
conditions that don't indicate an internal error.
13
* Add ``.*.swp .*.tmp *,v`` to default ignore patterns.
1441
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
15
1443
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
16
1444
either read or write mode.
added
removed
NEWS
