5
* New ``merge-directive`` command to generate machine- and human-readable
6
merge requests. (Aaron Bentley)
8
* New ``submit:`` revision specifier makes it easy to diff against the
9
common ancestor with the submit location (Aaron Bentley)
11
* Added support for Putty's SSH implementation. (Dmitry Vasiliev)
13
* Merge now autodetects the correct line-ending style for its conflict
14
markers. (Aaron Bentley)
18
* Refactored SSH vendor registration into SSHVendorManager class.
23
* New ``--numbered-dirs`` option to ``bzr selftest`` to use
24
numbered dirs for TestCaseInTempDir. This is default behavior
25
on Windows. Anyone can force named dirs on Windows
26
with ``--no-numbered-dirs``. (Alexander Belchenko)
28
* Fix ``RevisionSpec_revid`` to handle the Unicode strings passed in
29
from the command line. (Marien Zwart, #90501)
31
* Fix ``TreeTransform._iter_changes`` when both the source and
32
destination are missing. (Aaron Bentley, #88842)
34
* Fix commit of merges with symlinks in dirstate trees.
38
bzr 0.15rc1 2007-03-07
42
* The default disk format has changed. Please run 'bzr upgrade' in your
43
working trees to upgrade. This new default is compatible for network
44
operations, but not for local operations. That is, if you have two
45
versions of bzr installed locally, after upgrading you can only use the
46
bzr 0.15 version. This new default does not enable tags or nested-trees
47
as they are incompatible with bzr versions before 0.15 over the network.
49
* For users of bzrlib: Two major changes have been made to the working tree
50
api in bzrlib. The first is that many methods and attributes, including
51
the inventory attribute, are no longer valid for use until one of
52
lock_read/lock_write/lock_tree_write has been called, and become invalid
53
again after unlock is called. This has been done to improve performance
54
and correctness as part of the dirstate development. (Robert Collins,
55
John A Meinel, Martin Pool, and others).
57
* For users of bzrlib: The attribute 'tree.inventory' should be considered
58
readonly. Previously it was possible to directly alter this attribute, or
59
its contents, and have the tree notice this. This has been made
60
unsupported - it may work in some tree formats, but in the newer dirstate
61
format such actions will have no effect and will be ignored, or even
62
cause assertions. All operations possible can still be carried out by a
63
combination of the tree API, and the bzrlib.transform API. (Robert
64
Collins, John A Meinel, Martin Pool, and others).
68
* Support for OS Windows 98. Also .bzr.log on any windows system
69
saved in My Documents folder. (Alexander Belchenko)
71
* ``bzr mv`` enhanced to support already moved files.
72
In the past the mv command would have failed if the source file doesn't
73
exist. In this situation ``bzr mv`` would now detect that the file has
74
already moved and update the repository accordingly, if the target file
76
A new option ``--after`` has been added so that if two files already
77
exist, you could notify Bazaar that you have moved a (versioned) file
78
and replaced it with another. Thus in this case ``bzr move --after``
79
will only update the Bazaar identifier.
80
(Steffen Eichenberg, Marius Kruger)
82
* ``ls`` now works on treeless branches and remote branches.
85
* ``bzr help global-options`` describes the global options.
88
* ``bzr pull --overwrite`` will now correctly overwrite checkouts.
91
* Files are now allowed to change kind (e.g. from file to symlink).
92
Supported by ``commit``, ``revert`` and ``status``
95
* ``inventory`` and ``unknowns`` hidden in favour of ``ls``
98
* ``bzr help checkouts`` descibes what checkouts are and some possible
99
uses of them. (James Westby, Aaron Bentley)
101
* A new ``-d`` option to push, pull and merge overrides the default
102
directory. (Martin Pool)
104
* Branch format 6: smaller, and potentially faster than format 5. Supports
105
"append_history_only" mode, where the log view and revnos do not change,
106
except by being added to. Stores policy settings in
107
".bzr/branch/branch.conf".
109
* append_only branches: Format 6 branches may be configured so that log
110
view and revnos are always consistent. Either create the branch using
111
"bzr init --append-revisions-only" or edit the config file as descriped
112
in docs/configuration.txt.
114
* rebind: Format 6 branches retain the last-used bind location, so if you
115
"bzr unbind", you can "bzr bind" to bind to the previously-selected
118
* Builtin tags support, created and deleted by the ``tag`` command and
119
stored in the branch. Tags can be accessed with the revisionspec
120
``-rtag:``, and listed with ``bzr tags``. Tags are not versioned
121
at present. Tags require a network incompatible upgrade. To perform this
122
upgrade, run ``bzr upgrade --dirstate-with-subtree`` in your branch and
123
repositories. (Martin Pool)
125
* The bzr:// transport now has a well-known port number, 4155, which it will
126
use by default. (Andrew Bennetts, Martin Pool)
128
* Bazaar now looks for user-installed plugins before looking for site-wide
129
plugins. (Jonathan Lange)
131
* ``bzr resolve`` now detects and marks resolved text conflicts.
136
* Internally revision ids and file ids are now passed around as utf-8
137
bytestrings, rather than treating them as Unicode strings. This has
138
performance benefits for Knits, since we no longer need to decode the
139
revision id for each line of content, nor for each entry in the index.
140
This will also help with the future dirstate format.
143
* Reserved ids (any revision-id ending in a colon) are rejected by
144
versionedfiles, repositories, branches, and working trees
147
* Minor performance improvement by not creating a ProgressBar for
148
every KnitIndex we create. (about 90ms for a bzr.dev tree)
151
* New easier to use Branch hooks facility. There are five initial hooks,
152
all documented in bzrlib.branch.BranchHooks.__init__ - 'set_rh',
153
'post_push', 'post_pull', 'post_commit', 'post_uncommit'. These hooks
154
fire after the matching operation on a branch has taken place, and were
155
originally added for the branchrss plugin. (Robert Collins)
157
* New method ``Branch.push()`` which should be used when pushing from a
158
branch as it makes performance and policy decisions to match the UI
159
level command ``push``. (Robert Collins).
161
* Add a new method ``Tree.revision_tree`` which allows access to cached
162
trees for arbitrary revisions. This allows the in development dirstate
163
tree format to provide access to the callers to cached copies of
164
inventory data which are cheaper to access than inventories from the
166
(Robert Collins, Martin Pool)
168
* New Branch.last_revision_info method, this is being done to allow
169
optimization of requests for both the number of revisions and the last
170
revision of a branch with smartservers and potentially future branch
171
formats. (Wouter van Heyst, Robert Collins)
173
* Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not
174
yet been loaded by load_plugins(). This allows plugins to depend on each
175
other for code reuse without requiring users to perform file-renaming
176
gymnastics. (Robert Collins)
178
* New Repository method 'gather_stats' for statistic data collection.
179
This is expected to grow to cover a number of related uses mainly
180
related to bzr info. (Robert Collins)
182
* Log formatters are now managed with a registry.
183
``log.register_formatter`` continues to work, but callers accessing
184
the FORMATTERS dictionary directly will not.
186
* Allow a start message to be passed to the ``edit_commit_message``
187
function. This will be placed in the message offered to the user
188
for editing above the separator. It allows a template commit message
189
to be used more easily. (James Westby)
191
* ``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
192
you pass a Unicode string rather than an 8-bit string. Callers need
193
to be updated to encode first. (John Arbash Meinel)
195
* Branch.push, pull, merge now return Result objects with information
196
about what happened, rather than a scattering of various methods. These
197
are also passed to the post hooks. (Martin Pool)
199
* File formats and architecture is in place for managing a forest of trees
200
in bzr, and splitting up existing trees into smaller subtrees, and
201
finally joining trees to make a larger tree. This is the first iteration
202
of this support, and the user-facing aspects still require substantial
203
work. If you wish to experiment with it, use ``bzr upgrade
204
--dirstate-with-subtree`` in your working trees and repositories.
205
You can use the hidden commands ``split`` and ``join`` and to create
206
and manipulate nested trees, but please consider using the nested-trees
207
branch, which contains substantial UI improvements, instead.
208
http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/
209
(Aaron Bentley, Martin Pool, Robert Collins).
213
* ``bzr annotate`` now uses dotted revnos from the viewpoint of the
214
branch, rather than the last changed revision of the file.
215
(John Arbash Meinel, #82158)
217
* Lock operations no longer hang if they encounter a permission problem.
220
* ``bzr push`` can resume a push that was canceled before it finished.
221
Also, it can push even if the target directory exists if you supply
222
the ``--use-existing-dir`` flag.
223
(John Arbash Meinel, #30576, #45504)
225
* Fix http proxy authentication when user and an optional
226
password appears in the ``*_proxy`` vars. (Vincent Ladeuil,
229
* ``bzr log branch/file`` works for local treeless branches
230
(Aaron Bentley, #84247)
232
* Fix problem with UNC paths on Windows 98. (Alexander Belchenko, #84728)
234
* Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE),
235
and on win32 along the PATH. (Alexander Belchenko, #82086)
237
* ``bzr init`` works with unicode argument LOCATION.
238
(Alexander Belchenko, #85599)
240
* Raise DependencyNotPresent if pycurl do not support https. (Vincent
243
* Invalid proxy env variables should not cause a traceback.
244
(Vincent Ladeuil, #87765)
246
* Ignore patterns normalised to use '/' path separator.
247
(Kent Gibson, #86451)
249
* bzr rocks. It sure does! Fix case. (Vincent Ladeuil, #78026)
251
* Fix bzrtools shelve command for removed lines beginning with "--"
252
(Johan Dahlberg, #75577)
256
* New ``--first`` option to ``bzr selftest`` to run specified tests
257
before the rest of the suite. (Martin Pool)
264
* ``bzr help global-options`` describes the global options. (Aaron Bentley)
268
* Skip documentation generation tests if the tools to do so are not
269
available. Fixes running selftest for installled copies of bzr.
270
(John Arbash Meinel, #80330)
272
* Fix the code that discovers whether bzr is being run from it's
273
working tree to handle the case when it isn't but the directory
274
it is in is below a repository. (James Westby, #77306)
277
bzr 0.14rc1 2007-01-16
281
* New connection: ``bzr+http://`` which supports tunnelling the smart
282
protocol over an HTTP connection. If writing is enabled on the bzr
283
server, then you can write over the http connection.
284
(Andrew Bennetts, John Arbash Meinel)
286
* Aliases now support quotation marks, so they can contain whitespace
289
* PyCurlTransport now use a single curl object. By specifying explicitly
290
the 'Range' header, we avoid the need to use two different curl objects
291
(and two connections to the same server). (Vincent Ladeuil)
293
* ``bzr commit`` does not prompt for a message until it is very likely to
294
succeed. (Aaron Bentley)
296
* ``bzr conflicts`` now takes --text to list pathnames of text conflicts
299
* Fix ``iter_lines_added_or_present_in_versions`` to use a set instead
300
of a list while checking if a revision id was requested. Takes 10s
301
off of the ``fileids_affected_by_revision_ids`` time, which is 10s
302
of the ``bzr branch`` time. Also improve ``fileids_...`` time by
303
filtering lines with a regex rather than multiple ``str.find()``
304
calls. (saves another 300ms) (John Arbash Meinel)
306
* Policy can be set for each configuration key. This allows keys to be
307
inherited properly across configuration entries. For example, this
308
should enable you to do::
311
push_location = sftp://host/srv/project/
312
push_location:policy = appendpath
314
And then a branch like ``/home/user/project/mybranch`` should get an
315
automatic push location of ``sftp://host/srv/project/mybranch``.
318
* Added ``bzr status --short`` to make status report svn style flags
319
for each file. For example::
327
* 'bzr selftest --clean-output' allows easily clean temporary tests
328
directories without running tests. (Alexander Belchenko)
330
* ``bzr help hidden-commands`` lists all hidden commands. (Aaron Bentley)
332
* ``bzr merge`` now has an option ``--pull`` to fall back to pull if
333
local is fully merged into remote. (Jan Hudec)
335
* ``bzr help formats`` describes available directory formats. (Aaron Bentley)
339
* A few tweaks directly to ``fileids_affected_by_revision_ids`` to
340
help speed up processing, as well allowing to extract unannotated
341
lines. Between the two ``fileids_affected_by_revision_ids`` is
342
improved by approx 10%. (John Arbash Meinel)
344
* Change Revision serialization to only write out millisecond
345
resolution. Rather than expecting floating point serialization to
346
preserve more resolution than we need. (Henri Weichers, Martin Pool)
348
* Test suite ends cleanly on Windows. (Vincent Ladeuil)
350
* When 'encoding_type' attribute of class Command is equal to 'exact',
351
force sys.stdout to be a binary stream on Windows, and therefore
352
keep exact line-endings (without LF -> CRLF conversion).
353
(Alexander Belchenko)
355
* Single-letter short options are no longer globally declared. (Martin
358
* Before using detected user/terminal encoding bzr should check
359
that Python has corresponding codec. (Alexander Belchenko)
361
* Formats for end-user selection are provided via a FormatRegistry (Aaron Bentley)
365
* ``bzr missing --verbose`` was showing adds/removals in the wrong
366
direction. (John Arbash Meinel)
368
* ``bzr annotate`` now defaults to showing dotted revnos for merged
369
revisions. It cuts them off at a depth of 12 characters, but you can
370
supply ``--long`` to see the full number. You can also use
371
``--show-ids`` to display the original revision ids, rather than
372
revision numbers and committer names. (John Arbash Meinel, #75637)
374
* bzr now supports Win32 UNC path (e.g. \\HOST\path).
375
(Alexander Belchenko, #57869)
377
* Win32-specific: output of cat, bundle and diff commands don't mangle
378
line-endings (Alexander Belchenko, #55276)
380
* Replace broken fnmatch based ignore pattern matching with custom pattern
382
(Kent Gibson, Jan Hudec #57637)
384
* pycurl and urllib can detect short reads at different places. Update
385
the test suite to test more cases. Also detect http error code 416
386
which was raised for that specific bug. Also enhance the urllib
387
robustness by detecting invalid ranges (and pycurl's one by detecting
388
short reads during the initial GET). (Vincent Ladeuil, #73948)
390
* The urllib connection sharing interacts badly with urllib2
391
proxy setting (the connections didn't go thru the proxy
392
anymore). Defining a proper ProxyHandler solves the
393
problem. (Vincent Ladeuil, #74759)
395
* Use urlutils to generate relative URLs, not osutils
396
(Aaron Bentley, #76229)
398
* ``bzr status`` in a readonly directory should work without giving
399
lots of errors. (John Arbash Meinel, #76299)
401
* Mention the revisionspec topic for the revision option help.
402
(Wouter van Heyst, #31663)
404
* Allow plugins import from zip archives.
405
(Alexander Belchenko, #68124)
410
No changes from 0.13rc1
412
bzr 0.13rc1 2006-11-27
416
* New command ``bzr remove-tree`` allows the removal of the working
420
* urllib uses shared keep-alive connections, so http
421
operations are substantially faster.
422
(Vincent Ladeuil, #53654)
424
* ``bzr export`` allows an optional branch parameter, to export a bzr
425
tree from some other url. For example:
426
``bzr export bzr.tar.gz http://bazaar-vcs.org/bzr/bzr.dev``
429
* Added ``bzr help topics`` to the bzr help system. This gives a
430
location for general information, outside of a specific command.
431
This includes updates for ``bzr help revisionspec`` the first topic
432
included. (Goffredo Baroncelli, John Arbash Meinel, #42714)
434
* WSGI-compatible HTTP smart server. See ``doc/http_smart_server.txt``.
437
* Knit files will now cache full texts only when the size of the
438
deltas is as large as the size of the fulltext. (Or after 200
439
deltas, whichever comes first). This has the most benefit on large
440
files with small changes, such as the inventory for a large project.
441
(eg For a project with 2500 files, and 7500 revisions, it changes
442
the size of inventory.knit from 11MB to 5.4MB) (John Arbash Meinel)
446
* New -D option given before the command line turns on debugging output
447
for particular areas. -Derror shows tracebacks on all errors.
450
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
451
and remove benchmarks that take longer than 10min to run.
454
* Use ``time.time()`` instead of ``time.clock()`` to decide on
455
progress throttling. Because ``time.clock()`` is actually CPU time,
456
so over a high-latency connection, too many updates get throttled.
459
* ``MemoryTransport.list_dir()`` would strip the first character for
460
files or directories in root directory. (John Arbash Meinel)
462
* New ``ChrootTransportDecorator``, accessible via the ``chroot+`` url
463
prefix. It disallows any access to locations above a set URL. (Andrew
468
* Now _KnitIndex properly decode revision ids when loading index data.
469
And optimize the knit index parsing code. (Dmitry Vasiliev, John
472
* ``bzrlib/bzrdir.py`` was directly referencing ``bzrlib.workingtree``,
473
without importing it. This prevented ``bzr upgrade`` from working
474
unless a plugin already imported ``bzrlib.workingtree``
475
(John Arbash Meinel, #70716)
477
* Suppress the traceback on invalid URLs (Vincent Ladeuil, #70803).
479
* Give nicer error message when an http server returns a 403
480
error code. (Vincent Ladeuil, #57644).
482
* When a multi-range http GET request fails, try a single
483
range one. If it fails too, forget about ranges. Remember that until
484
the death of the transport and propagates that to the clones.
485
(Vincent Ladeuil, #62276, #62029).
487
* Handles user/passwords supplied in url from command
488
line (for the urllib implementation). Don't request already
489
known passwords (Vincent Ladeuil, #42383, #44647, #48527)
491
* _KnitIndex.add_versions() dictionary compresses revision ids as they
492
are added. This fixes bug where fetching remote revisions records
493
them as full references rather than integers. (John Arbash Meinel,
496
* ``bzr ignore`` strips trailing slashes in patterns.
497
Also ``bzr ignore`` rejects absolute paths. (Kent Gibson, #4559)
499
* ``bzr ignore`` takes multiple arguments. (Cheuksan Edward Wang, #29488)
501
* mv correctly handles paths that traverse symlinks.
502
(Aaron Bentley, #66964)
504
* Give nicer looking error messages when failing to connect over ssh.
505
(John Arbash Meinel, #49172)
507
* Pushing to a remote branch does not currently update the remote working
508
tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
509
machine now show that the working tree is out of date.
510
(Cheuksan Edward Wang #48136)
512
* Use patiencediff instead of difflib for determining deltas to insert
513
into knits. This avoids the O(N^3) behavior of difflib. Patience
514
diff should be O(N^2). (Cheuksan Edward Wang, #65714)
516
* Running ``bzr log`` on nonexistent file gives an error instead of the
517
entire log history. (Cheuksan Edward Wang #50793)
519
* ``bzr cat`` can look up contents of removed or renamed files. If the
520
pathname is ambiguous, i.e. the files in the old and new trees have
521
different id's, the default is the file in the new tree. The user can
522
use "--name-from-revision" to select the file in the old tree.
523
(Cheuksan Edward Wang, #30190)
527
* TestingHTTPRequestHandler really handles the Range header
528
(previously it was ignoring it and returning the whole file,).
534
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
535
and remove benchmarks that take longer than 10min to run.
538
bzr 0.12rc1 2006-10-23
542
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
543
rather than just showing a decimal revision number for revisions on the
544
mainline. These revision numbers are not yet accepted as input into bzr
545
commands such as log, diff etc. (Robert Collins)
547
* revisions can now be specified using dotted-decimal revision numbers.
548
For instance, ``bzr diff -r 1.2.1..1.2.3``. (Robert Collins)
550
* ``bzr help commands`` output is now shorter (Aaron Bentley)
552
* ``bzr`` now uses lazy importing to reduce the startup time. This has
553
a moderate effect on lots of actions, especially ones that have
554
little to do. For example ``bzr rocks`` time is down to 116ms from
555
283ms. (John Arbash Meinel)
557
* New Registry class to provide name-to-object registry-like support,
558
for example for schemes where plugins can register new classes to
559
do certain tasks (e.g. log formatters). Also provides lazy registration
560
to allow modules to be loaded on request. (John Arbash Meinel, Adeodato
565
* LogFormatter subclasses show now expect the 'revno' parameter to
566
show() to be a string rather than an int. (Robert Collins)
570
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
571
can take a ``working_dir='foo'`` parameter, which will change directory
572
for the command. (John Arbash Meinel)
574
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
575
around a regex, which defers compilation until first use.
578
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
579
``--no-plugins`` parameter to ensure test reproducability, and avoid
580
problems with system-wide installed plugins. (John Arbash Meinel)
582
* Unique tree root ids are now supported. Newly created trees still
583
use the common root id for compatibility with bzr versions before 0.12.
586
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
587
pass in inventory.ROOT_ID if you want the default root id value.
588
(Robert Collins, John Arbash Meinel)
590
* New method ``WorkingTree.flush()`` which will write the current memory
591
inventory out to disk. At the same time, read_working_inventory will
592
no longer trash the current tree inventory if it has been modified within
593
the current lock, and the tree will now ``flush()`` automatically on
594
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
595
advantage of this functionality. (Robert Collins, John Arbash Meinel)
597
* ``bzrlib.tsort.merge_sorted`` now accepts ``generate_revnos``. This
598
parameter will cause it to add another column to its output, which
599
contains the dotted-decimal revno for each revision, as a tuple.
602
* ``LogFormatter.show_merge`` is deprecated in favour of
603
``LogFormatter.show_merge_revno``. (Robert Collins)
607
* Avoid circular imports by creating a deprecated function for
608
``bzrlib.tree.RevisionTree``. Callers should have been using
609
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel,
612
* Don't use ``socket.MSG_WAITALL`` as it doesn't exist on all
613
platforms. (Martin Pool, #66356)
615
* Don't require ``Content-Type`` in range responses. Assume they are a
616
single range if ``Content-Type`` does not exist.
617
(John Arbash Meinel, #62473)
619
* bzr branch/pull no longer complain about progress bar cleanup when
620
interrupted during fetch. (Aaron Bentley, #54000)
622
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
623
the basis inventory, rather than going through the repository. This
624
allows us to have 1 inventory read, and 2 inventory writes when
625
committing a new tree. (John Arbash Meinel)
627
* When reverting, files that are not locally modified that do not exist
628
in the target are deleted, not just unversioned (Aaron Bentley)
630
* When trying to acquire a lock, don't fail immediately. Instead, try
631
a few times (up to 1 hour) before timing out. Also, report why the
632
lock is unavailable (John Arbash Meinel, #43521, #49556)
634
* Leave HttpTransportBase daughter classes decides how they
635
implement cloning. (Vincent Ladeuil, #61606)
637
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
639
* If a commit fails, the commit message is stored in a file at the root of
640
the tree for later commit. (Cheuksan Edward Wang, Stefan Metzmacher,
645
* New test base class TestCaseWithMemoryTransport offers memory-only
646
testing facilities: its not suitable for tests that need to mutate disk
647
state, but most tests should not need that and should be converted to
648
TestCaseWithMemoryTransport. (Robert Collins)
650
* ``TestCase.make_branch_and_memory_tree`` now takes a format
651
option to set the BzrDir, Repository and Branch formats of the
652
created objects. (Robert Collins, John Arbash Meinel)
656
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
658
bzr 0.11rc2 2006-09-27
662
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
664
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
667
bzr 0.11rc1 2006-09-25
671
* Knit files now wait to create their contents until the first data is
672
added. The old code used to create an empty .knit and a .kndx with just
673
the header. However, this caused a lot of extra round trips over sftp.
674
This can change the time for ``bzr push`` to create a new remote branch
675
from 160s down to 100s. This also affects ``bzr commit`` performance when
676
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
677
down to 40s (John Arbash Meinel, #44692)
679
* When an entire subtree has been deleted, commit will now report that
680
just the top of the subtree has been deleted, rather than reporting
681
all the individual items. (Robert Collins)
683
* Commit performs one less XML parse. (Robert Collins)
685
* ``bzr checkout`` now operates on readonly branches as well
686
as readwrite branches. This fixes bug #39542. (Robert Collins)
688
* ``bzr bind`` no longer synchronises history with the master branch.
689
Binding should be followed by an update or push to synchronise the
690
two branches. This is closely related to the fix for bug #39542.
693
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
694
objects. This allows all imports to stay at the global scope, but
695
modules will not actually be imported if they are not used.
698
* Support bzr:// and bzr+ssh:// urls to work with the new RPC-based
699
transport which will be used with the upcoming high-performance smart
700
server. The new command ``bzr serve`` will invoke bzr in server mode,
701
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
704
* New command ``bzr version-info`` which can be used to get a summary
705
of the current state of the tree. This is especially useful as part
706
of a build commands. See ``doc/version_info.txt`` for more information
711
* 'bzr inventory [FILE...]' allows restricting the file list to a
712
specific set of files. (John Arbash Meinel, #3631)
714
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
716
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
717
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
718
reading a nested Stanza. (John Arbash Meinel)
720
* Transform._set_mode() needs to stat the right file.
721
(John Arbash Meinel, #56549)
723
* Raise WeaveFormatError rather than StopIteration when trying to read
724
an empty Weave file. (John Arbash Meinel, #46871)
726
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
727
(Vincent Ladeuil, #59835)
729
* Handle boundary="" lines properly to allow access through a Squid proxy.
730
(John Arbash Meinel, #57723)
732
* revert now removes newly-added directories (Aaron Bentley, #54172)
734
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
735
isn't a working tree. (David Allouche, #40679)
737
* Give nicer error messages when a user supplies an invalid --revision
738
parameter. (John Arbash Meinel, #55420)
740
* Handle when LANG is not recognized by python. Emit a warning, but
741
just revert to using 'ascii'. (John Arbash Meinel, #35392)
743
* Don't use preexec_fn on win32, as it is not supported by subprocess.
746
* Skip specific tests when the dependencies aren't met. This includes
747
some ``setup.py`` tests when ``python-dev`` is not available, and
748
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
750
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
751
the system. (Andrew Bennetts, John Arbash Meinel)
753
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
754
other branch, and will not push or pull between the two branches.
755
API users will need to perform a push or pull or update operation if they
756
require branch synchronisation to take place. (Robert Collins, #47344)
758
* When creating a tarball or zipfile export, export unicode names as utf-8
759
paths. This may not work perfectly on all platforms, but has the best
760
chance of working in the common case. (John Arbash Meinel, #56816)
762
* When committing, only files that exist in working tree or basis tree
763
may be specified (Aaron Bentley, #50793)
767
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
771
* TestCaseInTempDir now creates a separate directory for HOME, rather
772
than having HOME set to the same location as the working directory.
775
* run_bzr_subprocess() can take an optional 'env_changes={}' parameter,
776
which will update os.environ inside the spawned child. It also can
777
take a 'universal_newlines=True', which helps when checking the output
778
of the command. (John Arbash Meinel)
780
* Refactor SFTP vendors to allow easier re-use when ssh is used.
783
* Transport.list_dir() and Transport.iter_files_recursive() should always
784
return urlescaped paths. This is now tested (there were bugs in a few
785
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
787
* New utility function symbol_versioning.deprecation_string. Returns the
788
formatted string for a callable, deprecation format pair. (Robert Collins)
790
* New TestCase helper applyDeprecated. This allows you to call a callable
791
which is deprecated without it spewing to the screen, just by supplying
792
the deprecation format string issued for it. (Robert Collins)
794
* Transport.append and Transport.put have been deprecated in favor of
795
.append_bytes, .append_file, .put_bytes, and .put_file. This removes the
796
ambiguity in what type of object the functions take.
797
Transport.non_atomic_put_{bytes,file} has also been added. Which works
798
similarly to Transport.append() except for SFTP, it doesn't have a round
799
trip when opening the file. Also, it provides functionality for creating
800
a parent directory when trying to create a file, rather than raise
801
NoSuchFile and forcing the caller to repeat their request.
804
* WorkingTree has a new api ``unversion`` which allow the unversioning of
805
entries by their file id. (Robert Collins)
807
* WorkingTree.pending_merges is deprecated. Please use the get_parent_ids
808
(introduced in 0.10) method instead. (Robert Collins)
810
* WorkingTree has a new lock_tree_write method which locks the branch for
811
read rather than write. This is appropriate for actions which only need
812
the branch data for reference rather than mutation. A new decorator
813
needs_tree_write_lock is provided in the workingtree module. Like the
814
needs_read_lock and needs_write_lock decorators this allows static
815
declaration of the locking requirements of a function to ensure that
816
a lock is taken out for casual scripts. (Robert Collins, #54107)
818
* All WorkingTree methods which write to the tree, but not to the branch
819
have been converted to use ``needs_tree_write_lock`` rather than
820
``needs_write_lock``. Also converted is the revert, conflicts and tree
821
transform modules. This provides a modest performance improvement on
822
metadir style trees, due to the reduce lock-acquisition, and a more
823
significant performance improvement on lightweight checkouts from
824
remote branches, where trivial operations used to pay a significant
825
penalty. It also provides the basis for allowing readonly checkouts.
828
* Special case importing the standard library 'copy' module. This shaves
829
off 40ms of startup time, while retaining compatibility. See:
830
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
832
* WorkingTree has a new parent class MutableTree which represents the
833
specialisations of Tree which are able to be altered. (Robert Collins)
835
* New methods mkdir and put_file_bytes_non_atomic on MutableTree that
836
mutate the tree and its contents. (Robert Collins)
838
* Transport behaviour at the root of the URL is now defined and tested.
839
(Andrew Bennetts, Robert Collins)
843
* New test helper classs MemoryTree. This is typically accessed via
844
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
846
* Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to
847
continue running concurrently with a subprocess of bzr. (Andrew Bennetts,
850
* Add a new method ``Transport.get_smart_client()``. This is provided to
851
allow upgrades to a richer interface than the VFS one provided by
852
Transport. (Andrew Bennetts, Martin Pool)
857
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
858
tree. (Aaron Bentley)
860
* 'bzr add --file-ids-from' can be used to specify another path to use
861
for creating file ids, rather than generating all new ones. Internally,
862
the 'action' passed to smart_add_tree() can return file_ids that
863
will be used, rather than having bzrlib generate new ones.
864
(John Arbash Meinel, #55781)
866
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
867
This will cache some of the intermediate trees, and decrease the
868
setup time for benchmark tests. (John Arbash Meinel)
870
* Inverse forms are provided for all boolean options. For example,
871
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
873
* Serialize out Inventories directly, rather than using ElementTree.
874
Writing out a kernel sized inventory drops from 2s down to ~350ms.
875
(Robert Collins, John Arbash Meinel)
879
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
881
* Change LockDir so that if the lock directory doesn't exist when
882
lock_write() is called, an attempt will be made to create it.
883
(John Arbash Meinel, #56974)
885
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
887
* Active FTP transport now works as intended. (ghozzy, #56472)
889
* Really fix mutter() so that it won't ever raise a UnicodeError.
890
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
891
But it is a debugging log, not a real user file.
892
(John Arbash Meinel, #56947, #53880)
894
* Change Command handle to allow Unicode command and options.
895
At present we cannot register Unicode command names, so we will get
896
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
897
But that is better than a UnicodeError + a traceback.
898
(John Arbash Meinel, #57123)
900
* Handle TZ=UTC properly when reading/writing revisions.
901
(John Arbash Meinel, #55783, #56290)
903
* Use GPG_TTY to allow gpg --cl to work with gpg-agent in a pipeline,
904
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
906
* External diff does the right thing for binaries even in foreign
907
languages. (John Arbash Meinel, #56307)
909
* Testament handles more cases when content is unicode. Specific bug was
910
in handling of revision properties. (John Arbash Meinel, Holger Krekel,
913
* The bzr selftest was failing on installed versions due to a bug in a new
914
test helper. (John Arbash Meinel, Robert Collins, #58057)
918
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
919
which can be used to cache the conversion between utf8 and Unicode.
920
Especially helpful for some of the knit annotation code, which has to
921
convert revision ids to utf8 to annotate lines in storage.
924
* ``setup.py`` now searches the filesystem to find all packages which
925
need to be installed. This should help make the life of packagers
926
easier. (John Arbash Meinel)
932
* The hard-coded built-in ignore rules have been removed. There are
933
now two rulesets which are enforced. A user global one in
934
~/.bazaar/ignore which will apply to every tree, and the tree
935
specific one '.bzrignore'.
936
~/.bazaar/ignore will be created if it does not exist, but with
937
a more conservative list than the old default.
938
This fixes bugs with default rules being enforced no matter what.
939
The old list of ignore rules from bzr is available by
940
running 'bzr ignore --old-default-rules'.
941
(Robert Collins, Martin Pool, John Arbash Meinel)
943
* 'branches.conf' has been changed to 'locations.conf', since it can apply
944
to more locations than just branch locations.
949
* The revision specifier "revno:" is extended to accept the syntax
950
revno:N:branch. For example,
951
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
952
bzr.dev. (Matthieu Moy)
954
* Tests updates to ensure proper URL handling, UNICODE support, and
955
proper printing when the user's terminal encoding cannot display
956
the path of a file that has been versioned.
957
``bzr branch`` can take a target URL rather than only a local directory.
958
Branch.get_parent()/set_parent() now save a relative path if possible,
959
and normalize the parent based on root, allowing access across
960
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
961
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
964
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
965
Use terminal width for single-line logs from ``bzr log --line`` and
966
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
969
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
970
(Alexander Belchenko)
972
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
974
* Show the correct number of revisions pushed when pushing a new branch.
977
* 'bzr selftest' now shows a progress bar with the number of tests, and
978
progress made. 'make check' shows tests in -v mode, to be more useful
979
for the PQM status window. (Robert Collins).
980
When using a progress bar, failed tests are printed out, rather than
981
being overwritten by the progress bar until the suite finishes.
984
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
985
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
986
profile data for the individual profiled calls, allowing for fine
987
grained analysis of performance.
988
(Robert Collins, Martin Pool).
990
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
991
where commit can take an appreciable time. (Robert Collins)
993
* 'bzr add' is now less verbose in telling you what ignore globs were
994
matched by files being ignored. Instead it just tells you how many
995
were ignored (because you might reasonably be expecting none to be
996
ignored). 'bzr add -v' is unchanged and will report every ignored
997
file. (Robert Collins).
999
* ftp now has a test server if medusa is installed. As part of testing,
1000
ftp support has been improved, including support for supplying a
1001
non-standard port. (John Arbash Meinel).
1003
* 'bzr log --line' shows the revision number, and uses only the
1004
first line of the log message (#5162, Alexander Belchenko;
1007
* 'bzr status' has had the --all option removed. The 'bzr ls' command
1008
should be used to retrieve all versioned files. (Robert Collins)
1010
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
1011
over email, and applied on the other end, while maintaining ancestry.
1012
This bundle can be applied with either 'bzr merge' or 'bzr pull',
1013
the same way you would apply another branch.
1014
(John Arbash Meinel, Aaron Bentley)
1016
* 'bzr whoami' can now be used to set your identity from the command line,
1017
for a branch or globally. (Robey Pointer)
1019
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
1022
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
1025
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
1026
Also updates things like 'http+pycurl://' if pycurl is not present.
1027
(John Arbash Meinel) (Malone #47821, #52204)
1029
* New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
1030
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
1031
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
1033
* Improve the help text for 'bzr diff' to explain what various options do.
1034
(John Arbash Meinel, #6391)
1036
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
1037
revision 10. This makes -r10 more in line with what other commands do.
1038
'bzr uncommit' also now saves the pending merges of the revisions that
1039
were removed. So it is safe to uncommit after a merge, fix something,
1040
and commit again. (John Arbash Meinel, #32526, #31426)
1042
* 'bzr init' now also works on remote locations.
1043
(Wouter van Heyst, #48904)
1045
* HTTP support has been updated. When using pycurl we now support
1046
connection keep-alive, which reduces dns requests and round trips.
1047
And for both urllib and pycurl we support multi-range requests,
1048
which decreases the number of round-trips. Performance results for
1049
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
1050
http branching is now 2-3x faster, and ``bzr pull`` in an existing
1051
branch is as much as 4x faster.
1052
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
1054
* Performance improvements for sftp. Branching and pulling are now up to
1055
2x faster. Utilize paramiko.readv() support for async requests if it
1056
is available (paramiko > 1.6) (John Arbash Meinel)
1060
* Fix shadowed definition of TestLocationConfig that caused some
1061
tests not to run. (#32587, Erik Bågfors, Michael Ellerman,
1064
* Fix unnecessary requirement of sign-my-commits that it be run from
1065
a working directory. (Martin Pool, Robert Collins)
1067
* 'bzr push location' will only remember the push location if it succeeds
1068
in connecting to the remote location. (#49742, John Arbash Meinel)
1070
* 'bzr revert' no longer toggles the executable bit on win32
1071
(#45010, John Arbash Meinel)
1073
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
1075
* sftp tests now work correctly on win32 if you have a newer paramiko
1076
(John Arbash Meinel)
1078
* Cleanup win32 test suite, and general cleanup of places where
1079
file handles were being held open. (John Arbash Meinel)
1081
* When specifying filenames for 'diff -r x..y', the name of the file in the
1082
working directory can be used, even if its name is different in both x
1085
* File-ids containing single- or double-quotes are handled correctly by
1086
push. (#52227, Aaron Bentley)
1088
* Normalize unicode filenames to ensure cross-platform consistency.
1089
(John Arbash Meinel, #43689)
1091
* The argument parser can now handle '-' as an argument. Currently
1092
no code interprets it specially (it is mostly handled as a file named
1093
'-'). But plugins, and future operations can use it.
1094
(John Arbash meinel, #50984)
1096
* Bundles can properly read binary files with a plain '\r' in them.
1097
(John Arbash Meinel, #51927)
1099
* Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)
1101
* Lots of win32 fixes (the test suite passes again).
1102
(John Arbash Meinel, #50155)
1104
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
1106
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
1108
* Removals are only committed if they match the filespec (or if there is
1109
no filespec). (#46635, Aaron Bentley)
1111
* smart-add recurses through all supplied directories
1112
(John Arbash Meinel, #52578)
1114
* Make the bundle reader extra lines before and after the bundle text.
1115
This allows you to parse an email with the bundle inline.
1116
(John Arbash Meinel, #49182)
1118
* Change the file id generator to squash a little bit more. Helps when
1119
working with long filenames on windows. (Also helps for unicode filenames
1120
not generating hidden files). (John Arbash Meinel, #43801)
1122
* Restore terminal mode on C-c while reading sftp password. (#48923,
1123
Nicholas Allen, Martin Pool)
1125
* Timestamps are rounded to 1ms, and revision entries can be recreated
1126
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
1128
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
1129
use local paths, since it is user visible (John Arbash Meinel, #53653)
1131
* ``bzr status foo`` when foo was unversioned used to cause a full delta
1132
to be generated (John Arbash Meinel, #53638)
1134
* When reading revision properties, an empty value should be considered
1135
the empty string, not None (John Arbash Meinel, #47782)
1137
* ``bzr diff --diff-options`` can now handle binary files being changed.
1138
Also, the output is consistent when --diff-options is not supplied.
1139
(John Arbash Meinel, #54651, #52930)
1141
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
1143
* Fix Branch.get_parent() to handle the case when the parent is not
1144
accessible (John Arbash Meinel, #52976)
1148
* Combine the ignore rules into a single regex rather than looping over
1149
them to reduce the threshold where N^2 behaviour occurs in operations
1150
like status. (Jan Hudec, Robert Collins).
1152
* Appending to bzrlib.DEFAULT_IGNORE is now deprecated. Instead, use
1153
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
1155
* 'bzr push' should only push the ancestry of the current revision, not
1156
all of the history in the repository. This is especially important for
1157
shared repositories. (John Arbash Meinel)
1159
* bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
1160
rather than randomly walking the inventories. (John Arbash Meinel)
1162
* Doctests are now run in temporary directories which are cleaned up when
1163
they finish, rather than using special ScratchDir/ScratchBranch objects.
1166
* Split ``check`` into separate methods on the branch and on the repository,
1167
so that it can be specialized in ways that are useful or efficient for
1168
different formats. (Martin Pool, Robert Collins)
1170
* Deprecate Repository.all_revision_ids; most methods don't really need
1171
the global revision graph but only that part leading up to a particular
1172
revision. (Martin Pool, Robert Collins)
1174
* Add a BzrDirFormat control_formats list which allows for control formats
1175
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
1176
(Robert Collins, Jelmer Vernooij).
1178
* bzrlib.diff.external_diff can be redirected to any file-like object.
1179
Uses subprocess instead of spawnvp.
1180
(#4047, #48914, James Henstridge, John Arbash Meinel)
1182
* New command line option '--profile-imports', which will install a custom
1183
importer to log time to import modules and regex compilation time to
1184
sys.stderr (John Arbash Meinel)
1186
* 'EmptyTree' is now deprecated, please use repository.revision_tree(None)
1187
instead. (Robert Collins)
1189
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
1191
bzr 0.8.2 2006-05-17
1195
* setup.py failed to install launchpad plugin. (Martin Pool)
1197
bzr 0.8.1 2006-05-16
1201
* Fix failure to commit a merge in a checkout. (Martin Pool,
1202
Robert Collins, Erik Bågfors, #43959)
1204
* Nicer messages from 'commit' in the case of renames, and correct
1205
messages when a merge has occured. (Robert Collins, Martin Pool)
1207
* Separate functionality from assert statements as they are skipped in
1208
optimized mode of python. Add the same check to pending merges.
1209
(#44443, Olaf Conradi)
1213
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
1215
* Add info on standalone branches without a working tree.
1216
(#44155, Olaf Conradi)
1218
* Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
1222
* Make editor invocation comply with Debian Policy. First check
1223
environment variables VISUAL and EDITOR, then try editor from
1224
alternatives system. If that all fails, fall back to the pre-defined
1225
list of editors. (#42904, Olaf Conradi)
1229
* New 'register-branch' command registers a public branch into
1230
Launchpad.net, where it can be associated with bugs, etc.
1231
(Martin Pool, Bjorn Tillenius, Robert Collins)
1235
* New public api in InventoryEntry - 'describe_change(old, new)' which
1236
provides a human description of the changes between two old and
1237
new. (Robert Collins, Martin Pool)
1241
* Fix test case for bzr info in upgrading a standalone branch to metadir,
1242
uses bzrlib api now. (Olaf Conradi)
1246
NOTES WHEN UPGRADING:
1248
Release 0.8 of bzr introduces a new format for history storage, called
1249
'knit', as an evolution of to the 'weave' format used in 0.7. Local
1250
and remote operations are faster using knits than weaves. Several
1251
operations including 'init', 'init-repo', and 'upgrade' take a
1252
--format option that controls this. Branching from an existing branch
1253
will keep the same format.
1255
It is possible to merge, pull and push between branches of different
1256
formats but this is slower than moving data between homogenous
1257
branches. It is therefore recommended (but not required) that you
1258
upgrade all branches for a project at the same time. Information on
1259
formats is shown by 'bzr info'.
1261
bzr 0.8 now allows creation of 'repositories', which hold the history
1262
of files and revisions for several branches. Previously bzr kept all
1263
the history for a branch within the .bzr directory at the root of the
1264
branch, and this is still the default. To create a repository, use
1265
the new 'bzr init-repo' command. Branches exist as directories under
1266
the repository and contain just a small amount of information
1267
indicating the current revision of the branch.
1269
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
1270
subversion. Checkouts are associated with a branch (optionally in a
1271
repository), which contains all the historical information. The
1272
result is that a checkout can be deleted without losing any
1273
already-committed revisions. A new 'update' command is also available.
1275
Repositories and checkouts are not supported with the 0.7 storage
1276
format. To use them you must upgrad to either knits, or to the
1277
'metaweave' format, which uses weaves but changes the .bzr directory
1283
* Sftp paths can now be relative, or local, according to the lftp
1284
convention. Paths now take the form:
1285
sftp://user:pass@host:port/~/relative/path
1287
sftp://user:pass@host:port/absolute/path
1289
* The FTP transport now tries to reconnect after a temporary
1290
failure. ftp put is made atomic. (Matthieu Moy)
1292
* The FTP transport now maintains a pool of connections, and
1293
reuses them to avoid multiple connections to the same host (like
1294
sftp did). (Daniel Silverstone)
1296
* The bzr_man.py file has been removed. To create the man page now,
1297
use ./generate_docs.py man. The new program can also create other files.
1298
Run "python generate_docs.py --help" for usage information. (Hans
1299
Ulrich Niedermann & James Blackwell).
1301
* Man Page now gives full help (James Blackwell). Help also updated to
1302
reflect user config now being stored in .bazaar (Hans Ulrich
1305
* It's now possible to set aliases in bazaar.conf (Erik Bågfors)
1307
* Pull now accepts a --revision argument (Erik Bågfors)
1309
* 'bzr re-sign' now allows multiple revisions to be supplied on the command
1310
line. You can now use the following command to sign all of your old
1313
find .bzr/revision-store// -name my@email-* \
1314
| sed 's/.*\/\/..\///' \
1317
* Upgrade can now upgrade over the network. (Robert Collins)
1319
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
1320
behaviour. By default they will cache history in the checkout, but
1321
with --lightweight almost all data is kept in the master branch.
1324
* 'revert' unversions newly-versioned files, instead of deleting them.
1326
* 'merge' is more robust. Conflict messages have changed.
1328
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
1331
* Default log format can be set in configuration and plugins can register
1332
their own formatters. (Erik Bågfors)
1334
* New 'reconcile' command will check branch consistency and repair indexes
1335
that can become out of sync in pre 0.8 formats. (Robert Collins,
1338
* New 'bzr init --format' and 'bzr upgrade --format' option to control
1339
what storage format is created or produced. (Robert Collins,
1342
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
1344
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
1346
* New 'init-repository' command, plus support for repositories in 'init'
1347
and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
1349
* Improve output of 'info' command. Show all relevant locations related to
1350
working tree, branch and repository. Use kibibytes for binary quantities.
1351
Fix off-by-one error in missing revisions of working tree. Make 'info'
1352
work on branches, repositories and remote locations. Show locations
1353
relative to the shared repository, if applicable. Show locking status
1354
of locations. (Olaf Conradi)
1356
* Diff and merge now safely handle binary files. (Aaron Bentley)
1358
* 'pull' and 'push' now normalise the revision history, so that any two
1359
branches with the same tip revision will have the same output from 'log'.
1362
* 'merge' accepts --remember option to store parent location, like 'push'
1363
and 'pull'. (Olaf Conradi)
1365
* bzr status and diff when files given as arguments do not exist
1366
in the relevant trees. (Martin Pool, #3619)
1368
* Add '.hg' to the default ignore list. (Martin Pool)
1370
* 'knit' is now the default disk format. This improves disk performance and
1371
utilization, increases incremental pull performance, robustness with SFTP
1372
and allows checkouts over SFTP to perform acceptably.
1373
The initial Knit code was contributed by Johan Rydberg based on a
1374
specification by Martin Pool.
1375
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
1377
* New tool to generate all-in-one html version of the manual. (Alexander
1380
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
1381
to be left in the SFTP repository. (Robert Collins, Martin Pool).
1383
* New option 'diff --prefix' to control how files are named in diff
1384
output, with shortcuts '-p0' and '-p1' corresponding to the options for
1385
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
1387
* Add --revision option to 'annotate' command. (Olaf Conradi)
1389
* If bzr shows an unexpected revision-history after pulling (perhaps due
1390
to a reweave) it can now be corrected by 'bzr reconcile'.
1395
* Commit is now verbose by default, and shows changed filenames and the
1396
new revision number. (Robert Collins, Martin Pool)
1398
* Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
1400
* 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking)
1402
* Make 'pull' and 'push' remember location on failure using --remember.
1405
* For compatibility, make old format for using weaves inside metadir
1406
available as 'metaweave' format. Rename format 'metadir' to 'default'.
1407
Clean up help for option --format in commands 'init', 'init-repo' and
1408
'upgrade'. (Olaf Conradi)
1412
* The internal storage of history, and logical branch identity have now
1413
been split into Branch, and Repository. The common locking and file
1414
management routines are now in bzrlib.lockablefiles.
1415
(Aaron Bentley, Robert Collins, Martin Pool)
1417
* Transports can now raise DependencyNotPresent if they need a library
1418
which is not installed, and then another implementation will be
1419
tried. (Martin Pool)
1421
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
1424
* Using Tree Transform for merge, revert, tree-building
1426
* WorkingTree.create, Branch.create, WorkingTree.create_standalone,
1427
Branch.initialize are now deprecated. Please see BzrDir.create_* for
1428
replacement API's. (Robert Collins)
1430
* New BzrDir class represents the .bzr control directory and manages
1431
formatting issues. (Robert Collins)
1433
* New repository.InterRepository class encapsulates Repository to
1434
Repository actions and allows for clean selection of optimised code
1435
paths. (Robert Collins)
1437
* bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
1438
please use 'branch.fetch' or 'repository.fetch' depending on your
1439
needs. (Robert Collins)
1441
* deprecated methods now have a 'is_deprecated' flag on them that can
1442
be checked, if you need to determine whether a given callable is
1443
deprecated at runtime. (Robert Collins)
1445
* Progress bars are now nested - see
1446
bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
1448
* New API call get_format_description() for each type of format.
1451
* Changed branch.set_parent() to accept None to remove parent.
1454
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
1456
* WorkingTree.branch is now a read only property. (Robert Collins)
1458
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
1459
can be None or a factory that will create a progress bar. This is
1460
useful for testing or for overriding the bzrlib.progress heuristic.
1463
* New API method get_physical_lock_status() to query locks present on a
1464
transport. (Olaf Conradi)
1466
* Repository.reconcile now takes a thorough keyword parameter to allow
1467
requesting an indepth reconciliation, rather than just a data-loss
1468
check. (Robert Collins)
1470
* bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
1471
the user for yes/no style input. (Robert Collins)
1475
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
1476
for testing SFTP protocol support. (Robey Pointer)
1478
* Branch formats are now tested once per implementation (see bzrlib.
1479
tests.branch_implementations. This is analagous to the transport
1480
interface tests, and has been followed up with working tree,
1481
repository and BzrDir tests. (Robert Collins)
1483
* New test base class TestCaseWithTransport provides a transport aware
1484
test environment, useful for testing any transport-interface using
1485
code. The test suite option --transport controls the transport used
1486
by this class (when its not being used as part of implementation
1487
contract testing). (Robert Collins)
1489
* Close logging handler on disabling the test log. This will remove the
1490
handler from the internal list inside python's logging module,
1491
preventing shutdown from closing it twice. (Olaf Conradi)
1493
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
1495
* run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
1496
will provide String("foo") to the command as its stdin.
1502
* .bzrignore is excluded from exports, on the grounds that it's a bzr
1503
internal-use file and may not be wanted. (Jamie Wilkinson)
1505
* The "bzr directories" command were removed in favor of the new
1506
--kind option to the "bzr inventory" command. To list all
1507
versioned directories, now use "bzr inventory --kind directory".
1510
* Under Windows configuration directory is now %APPDATA%\bazaar\2.0
1511
by default. (John Arbash Meinel)
1513
* The parent of Bzr configuration directory can be set by BZR_HOME
1514
environment variable. Now the path for it is searched in BZR_HOME, then
1515
in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
1516
points to C:\Documents and Settings\User Name\Application Data), HOME.
1517
(John Arbash Meinel)
1519
* Plugins with the same name in different directories in the bzr plugin
1520
path are no longer loaded: only the first successfully loaded one is
1521
used. (Robert Collins)
1523
* Use systems' external ssh command to open connections if possible.
1524
This gives better integration with user settings such as ProxyCommand.
1527
* Permissions on files underneath .bzr/ are inherited from the .bzr
1528
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
1529
will mean that future file will be created with group write permissions.
1531
* configure.in and config.guess are no longer in the builtin default
1534
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
1535
files. (John Arbash Meinel, Martin Pool)
1539
* "bzr INIT dir" now initializes the specified directory, and creates
1540
it if it does not exist. (John Arbash Meinel)
1542
* New remerge command (Aaron Bentley)
1544
* Better zsh completion script. (Steve Borho)
1546
* 'bzr diff' now returns 1 when there are changes in the working
1547
tree. (Robert Collins)
1549
* 'bzr push' now exists and can push changes to a remote location.
1550
This uses the transport infrastructure, and can store the remote
1551
location in the ~/.bazaar/branches.conf configuration file.
1554
* Test directories are only kept if the test fails and the user requests
1557
* Tweaks to short log printing
1559
* Added branch nicks, new nick command, printing them in log output.
1562
* If $BZR_PDB is set, pop into the debugger when an uncaught exception
1563
occurs. (Martin Pool)
1565
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
1566
the same as Subversion. (Martin Pool)
1568
* New ftp transport support (on ftplib), for ftp:// and aftp://
1569
URLs. (Daniel Silverstone)
1571
* Commit editor temporary files now start with 'bzr_log.', to allow
1572
text editors to match the file name and set up appropriate modes or
1573
settings. (Magnus Therning)
1575
* Improved performance when integrating changes from a remote weave.
1576
(Goffredo Baroncelli)
1578
* Sftp will attempt to cache the connection, so it is more likely that
1579
a connection will be reused, rather than requiring multiple password
1582
* bzr revno now takes an optional argument indicating the branch whose
1583
revno should be printed. (Michael Ellerman)
1585
* bzr cat defaults to printing the last version of the file.
1586
(#3632, Matthieu Moy)
1588
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
1589
profiler. (Denys Duchier)
1591
* Faster commits by reading only the headers of affected weave files.
1594
* 'bzr add' now takes a --dry-run parameter which shows you what would be
1595
added, but doesn't actually add anything. (Michael Ellerman)
1597
* 'bzr add' now lists how many files were ignored per glob. add --verbose
1598
lists the specific files. (Aaron Bentley)
1600
* 'bzr missing' now supports displaying changes in diverged trees and can
1601
be limited to show what either end of the comparison is missing.
1602
(Aaron Bently, with a little prompting from Daniel Silverstone)
1606
* SFTP can walk up to the root path without index errors. (Robert Collins)
1608
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
1610
* Error when run with -OO
1612
* Fix bug in reporting http errors that don't have an http error code.
1615
* Handle more cases of pipe errors in display commands
1617
* Change status to 3 for all errors
1619
* Files that are added and unlinked before committing are completely
1620
ignored by diff and status
1622
* Stores with some compressed texts and some uncompressed texts are now
1623
able to be used. (John A Meinel)
1625
* Fix for bzr pull failing sometimes under windows
1627
* Fix for sftp transport under windows when using interactive auth
1629
* Show files which are both renamed and modified as such in 'bzr
1630
status' output. (#4503, Daniel Silverstone)
1632
* Make annotate cope better with revisions committed without a valid
1633
email address. (Marien Zwart)
1635
* Fix representation of tab characters in commit messages. (Harald
1638
* List of plugin directories in BZR_PLUGIN_PATH environment variable is
1639
now parsed properly under Windows. (Alexander Belchenko)
1641
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
1643
* Keep a cached copy of the basis inventory to speed up operations
1644
that need to refer to it. (Johan Rydberg, Martin Pool)
1646
* Fix bugs in bzr status display of non-ascii characters. (Martin
1649
* Remove Makefile.in from default ignore list. (#6413, Tollef Fog
1652
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
1656
* Fix selftest asking for passwords when there are no SFTP keys.
1657
(Robey Pointer, Jelmer Vernooij)
1659
* Fix selftest run with 'python -O'. (Martin Pool)
1661
* Fix HTTP tests under Windows. (John Arbash Meinel)
1663
* Make tests work even if HOME is not set (Aaron Bentley)
1665
* Updated build_tree to use fixed line-endings for tests which read
1666
the file cotents and compare. Make some tests use this to pass under
1667
Windows. (John Arbash Meinel)
1669
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
1671
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
1672
(John Arbash Meinel)
1674
* Use terminal width to align verbose test output. (Martin Pool)
1676
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
1677
If adding a new test script please add that to
1678
bzrlib.tests.blackbox.__init__. (Robert Collins)
1680
* Much better error message if one of the test suites can't be
1681
imported. (Martin Pool)
1683
* Make check now runs the test suite twice - once with the default locale,
1684
and once with all locales forced to C, to expose bugs. This is not
1685
trivially done within python, so for now its only triggered by running
1686
Make check. Integrators and packagers who wish to check for full
1687
platform support should run 'make check' to test the source.
1690
* Tests can now run TestSkipped if they can't execute for any reason.
1691
(Martin Pool) (NB: TestSkipped should only be raised for correctable
1692
reasons - see the wiki spec ImprovingBzrTestSuite).
1694
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
1695
paths for the transport tests. Introduce blackbox remote sftp tests that
1696
test the same permutations. (Robert Collins, Robey Pointer)
1698
* Transport implementation tests are now independent of the local file
1699
system, which allows tests for esoteric transports, and for features
1700
not available in the local file system. They also repeat for variations
1701
on the URL scheme that can introduce issues in the transport code,
1702
see bzrlib.transport.TransportTestProviderAdapter() for this.
1705
* TestCase.build_tree uses the transport interface to build trees, pass
1706
in a transport parameter to give it an existing connection.
1711
* WorkingTree.pull has been split across Branch and WorkingTree,
1712
to allow Branch only pulls. (Robert Collins)
1714
* commands.display_command now returns the result of the decorated
1715
function. (Robert Collins)
1717
* LocationConfig now has a set_user_option(key, value) call to save
1718
a setting in its matching location section (a new one is created
1719
if needed). (Robert Collins)
1721
* Branch has two new methods, get_push_location and set_push_location
1722
to respectively, get and set the push location. (Robert Collins)
1724
* commands.register_command now takes an optional flag to signal that
1725
the registrant is planning to decorate an existing command. When
1726
given multiple plugins registering a command is not an error, and
1727
the original command class (whether built in or a plugin based one) is
1728
returned to the caller. There is a new error 'MustUseDecorated' for
1729
signalling when a wrapping command should switch to the original
1730
version. (Robert Collins)
1732
* Some option parsing errors will raise 'BzrOptionError', allowing
1733
granular detection for decorating commands. (Robert Collins).
1735
* Branch.read_working_inventory has moved to
1736
WorkingTree.read_working_inventory. This necessitated changes to
1737
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
1738
as well. To make it clear that a WorkingTree cannot always be obtained
1739
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
1740
be obtained. (Robert Collins)
1742
* All pending merges operations from Branch are now on WorkingTree.
1745
* The follow operations from Branch have moved to WorkingTree:
1753
* bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1755
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
1757
* Rename selftests to `bzrlib.tests.test_foo`. (John A Meinel, Martin
1760
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1761
query method. (Robert Collins)
1763
* New options to read only the table-of-contents of a weave.
1766
* Raise NoSuchFile when someone tries to add a non-existant file.
1769
* Simplify handling of DivergedBranches in cmd_pull().
1773
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
1774
is exposed as Branch().control_files. Also this has been altered with the
1775
controlfile pre/suffix replaced by simple method names like 'get' and
1776
'put'. (Aaron Bentley, Robert Collins).
1778
* Deprecated functions and methods can now be marked as such using the
1779
bzrlib.symbol_versioning module. Marked method have their docstring
1780
updated and will issue a DeprecationWarning using the warnings module
1781
when they are used. (Robert Collins)
1783
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1784
for functions that need unicode strings. (Robert Collins)
1790
* pull now takes --verbose to show you what revisions are added or removed
1793
* merge now takes a --show-base option to include the base text in
1797
* The config files are now read using ConfigObj, so '=' should be used as
1798
a separator, not ':'.
1801
* New 'bzr commit --strict' option refuses to commit if there are
1802
any unknown files in the tree. To commit, make sure all files are
1803
either ignored, added, or deleted. (Michael Ellerman)
1805
* The config directory is now ~/.bazaar, and there is a single file
1806
~/.bazaar/bazaar.conf storing email, editor and other preferences.
1809
* 'bzr add' no longer takes a --verbose option, and a --quiet option
1810
has been added that suppresses all output.
1812
* Improved zsh completion support in contrib/zsh, from Clint
1815
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
1816
Goffredo Baroncelli.
1818
* 'bzr check' now accepts -v for verbose reporting, and checks for
1819
ghosts in the branch. (Robert Collins)
1821
* New command 're-sign' which will regenerate the gpg signature for
1822
a revision. (Robert Collins)
1824
* If you set check_signatures=require for a path in
1825
~/.bazaar/branches.conf then bzr will invoke your
1826
gpg_signing_command (defaults to gpg) and record a digital signature
1827
of your commit. (Robert Collins)
1829
* New sftp transport, based on Paramiko. (Robey Pointer)
1831
* 'bzr pull' now accepts '--clobber' which will discard local changes
1832
and make this branch identical to the source branch. (Robert Collins)
1834
* Just give a quieter warning if a plugin can't be loaded, and
1835
put the details in .bzr.log. (Martin Pool)
1837
* 'bzr branch' will now set the branch-name to the last component of the
1838
output directory, if one was supplied.
1840
* If the option 'post_commit' is set to one (or more) python function
1841
names (must be in the bzrlib namespace), then they will be invoked
1842
after the commit has completed, with the branch and revision_id as
1843
parameters. (Robert Collins)
1845
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1847
* --merge-type weave is now supported for file contents. Tree-shape
1848
changes are still three-way based. (Martin Pool, Aaron Bentley)
1850
* 'bzr check' allows the first revision on revision-history to have
1851
parents - something that is expected for cheap checkouts, and occurs
1852
when conversions from baz do not have all history. (Robert Collins).
1854
* 'bzr merge' can now graft unrelated trees together, if your specify
1855
0 as a base. (Aaron Bentley)
1857
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
1860
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
1862
* 'bzr merge --reprocess' minimizes conflicts
1866
* The 'bzr selftest --pattern' option for has been removed, now
1867
test specifiers on the command line can be simple strings, or
1868
regexps, or both. (Robert Collins)
1870
* Passing -v to selftest will now show the time each test took to
1871
complete, which will aid in analysing performance regressions and
1872
related questions. (Robert Collins)
1874
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
1875
is given. (Martin Pool)
1877
* There is a new method for TestCaseInTempDir, assertFileEqual, which
1878
will check that a given content is equal to the content of the named
1879
file. (Robert Collins)
1881
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
1886
* New 'testament' command and concept for making gpg-signatures
1887
of revisions that are not tied to a particular internal
1888
representation. (Martin Pool).
1890
* Per-revision properties ('revprops') as key-value associated
1891
strings on each revision created when the revision is committed.
1892
Intended mainly for the use of external tools. (Martin Pool).
1894
* Config options have moved from bzrlib.osutils to bzrlib.config.
1897
* Improved command line option definitions allowing explanations
1898
for individual options, among other things. Contributed by
1901
* Config options have moved from bzrlib.osutils to bzrlib.config.
1902
Configuration is now done via the config.Config interface:
1903
Depending on whether you have a Branch, a Location or no information
1904
available, construct a ``*Config``, and use its ``signature_checking``,
1905
``username`` and ``user_email`` methods. (Robert Collins)
1907
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
1908
they are made available for other plugins to use. You should not
1909
import other plugins during the __init__ of your plugin though, as
1910
no ordering is guaranteed, and the plugins directory is not on the
1911
python path. (Robert Collins)
1913
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
1914
no longer takes an inventory, rather it takes an option branch
1915
parameter, and if None is given will open the branch at basedir
1916
implicitly. (Robert Collins)
1918
* Cleaner exception structure and error reporting. Suggested by
1919
Scott James Remnant. (Martin Pool)
1921
* Branch.remove has been moved to WorkingTree, which has also gained
1922
lock_read, lock_write and unlock methods for convenience. (Robert
1925
* Two decorators, needs_read_lock and needs_write_lock have been added
1926
to the branch module. Use these to cause a function to run in a
1927
read or write lock respectively. (Robert Collins)
1929
* Branch.open_containing now returns a tuple (Branch, relative-path),
1930
which allows direct access to the common case of 'get me this file
1931
from its branch'. (Robert Collins)
1933
* Transports can register using register_lazy_transport, and they
1934
will be loaded when first used. (Martin Pool)
1936
* 'pull' has been factored out of the command as WorkingTree.pull().
1937
A new option to WorkingTree.pull has been added, clobber, which will
1938
ignore diverged history and pull anyway.
1941
* config.Config has a 'get_user_option' call that accepts an option name.
1942
This will be looked up in branches.conf and bazaar.conf as normal.
1943
It is intended that this be used by plugins to support options -
1944
options of built in programs should have specific methods on the config.
1947
* merge.merge_inner now has tempdir as an optional parameter. (Robert
1950
* Tree.kind is not recorded at the top level of the hierarchy, as it was
1951
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
1954
* WorkingTree.__del__ has been removed, it was non deterministic and not
1955
doing what it was intended to. See WorkingTree.__init__ for a comment
1956
about future directions. (Robert Collins/Martin Pool)
1958
* bzrlib.transport.http has been modified so that only 404 urllib errors
1959
are returned as NoSuchFile. Other exceptions will propogate as normal.
1960
This allows debuging of actual errors. (Robert Collins)
1962
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
1963
to apis like 'put', 'get' and 'has'. This is to provide consistent
1964
behaviour - it operates on url's only. (Robert Collins)
1966
* Transports can register using register_lazy_transport, and they
1967
will be loaded when first used. (Martin Pool)
1969
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
1970
is called by merge_inner. This is so that the conflict count can be
1971
retrieved (and potentially manipulated) before returning to the caller
1972
of merge_inner. Likewise 'merge' now returns the conflict count to the
1973
caller. (Robert Collins)
1975
* 'revision.revision_graph can handle having only partial history for
1976
a revision - that is no revisions in the graph with no parents.
1979
* New builtins.branch_files uses the standard file_list rules to produce
1980
a branch and a list of paths, relative to that branch (Aaron Bentley)
1982
* New TestCase.addCleanup facility.
1984
* New bzrlib.version_info tuple (similar to sys.version_info), which can
1985
be used by programs importing bzrlib.
1989
* Better handling of branches in directories with non-ascii names.
1990
(Joel Rosdahl, Panagiotis Papadakos)
1992
* Upgrades of trees with no commits will not fail due to accessing
1993
[-1] in the revision-history. (Andres Salomon)
1996
bzr 0.1.1 2005-10-12
2000
* Fix problem in pulling over http from machines that do not
2001
allow directories to be listed.
2003
* Avoid harmless warning about invalid hash cache after
2004
upgrading branch format.
2008
* Avoid some unnecessary http operations in branch and pull.
2015
* 'bzr branch' over http initially gives a very high estimate
2016
of completion time but it should fall as the first few
2017
revisions are pulled in. branch is still slow on
2018
high-latency connections.
2022
* bzr-man.py has been updated to work again. Contributed by
2025
* Locking is now done with fcntl.lockf which works with NFS
2026
file systems. Contributed by Harald Meland.
2028
* When a merge encounters a file that has been deleted on
2029
one side and modified on the other, the old contents are
2030
written out to foo.BASE and foo.SIDE, where SIDE is this
2031
or OTHER. Contributed by Aaron Bentley.
2033
* Export was choosing incorrect file paths for the content of
2034
the tarball, this has been fixed by Aaron Bentley.
2036
* Commit will no longer commit without a log message, an
2037
error is returned instead. Contributed by Jelmer Vernooij.
2039
* If you commit a specific file in a sub directory, any of its
2040
parent directories that are added but not listed will be
2041
automatically included. Suggested by Michael Ellerman.
2043
* bzr commit and upgrade did not correctly record new revisions
2044
for files with only a change to their executable status.
2045
bzr will correct this when it encounters it. Fixed by
2048
* HTTP tests now force off the use of http_proxy for the duration.
2049
Contributed by Gustavo Niemeyer.
2051
* Fix problems in merging weave-based branches that have
2052
different partial views of history.
2054
* Symlink support: working with symlinks when not in the root of a
2055
bzr tree was broken, patch from Scott James Remnant.
2059
* 'branch' now accepts a --basis parameter which will take advantage
2060
of local history when making a new branch. This allows faster
2061
branching of remote branches. Contributed by Aaron Bentley.
2063
* New tree format based on weave files, called version 5.
2064
Existing branches can be upgraded to this format using
2067
* Symlinks are now versionable. Initial patch by
2068
Erik Toubro Nielsen, updated to head by Robert Collins.
2070
* Executable bits are tracked on files. Patch from Gustavo
2073
* 'bzr status' now shows unknown files inside a selected directory.
2074
Patch from Heikki Paajanen.
2076
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
2077
and 'resolve' have needed added, which list and remove those
2078
merge conflicts respectively. A conflicted tree cannot be committed
2079
in. Contributed by Aaron Bentley.
2081
* 'rm' is now an alias for 'remove'.
2083
* Stores now split out their content in a single byte prefixed hash,
2084
dropping the density of files per directory by 256. Contributed by
2087
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
2088
Contributed by Robert Collins.
2090
* 'bzr log' with the default formatter will show merged revisions,
2091
indented to the right. Initial implementation contributed by Gustavo
2092
Niemeyer, made incremental by Robert Collins.
2097
* Test case failures have the exception printed after the log
2098
for your viewing pleasure.
2100
* InventoryEntry is now an abstract base class, use one of the
2101
concrete InventoryDirectory etc classes instead.
2103
* Branch raises an UnsupportedFormatError when it detects a
2104
bzr branch it cannot understand. This allows for precise
2105
handling of such circumstances.
2110
* Removed testsweet module so that tests can be run after
2111
bzr installed by 'bzr selftest'.
2113
* 'bzr selftest' command-line arguments can now be partial ids
2114
of tests to run, e.g. 'bzr selftest test_weave'
2117
bzr 0.0.9 2005-09-23
2121
* Fixed "branch -r" option.
2123
* Fix remote access to branches containing non-compressed history.
2126
* Better reliability of http server tests. (John Arbash-Meinel)
2128
* Merge graph maximum distance calculation fix. (Aaron Bentley)
2130
* Various minor bug in windows support have been fixed, largely in the
2131
test suite. Contributed by Alexander Belchenko.
2135
* Status now accepts a -r argument to give status between chosen
2136
revisions. Contributed by Heikki Paajanen.
2138
* Revision arguments no longer use +/-/= to control ranges, instead
2139
there is a 'before' namespace, which limits the successive namespace.
2140
For example '$ bzr log -r date:yesterday..before:date:today' will
2141
select everything from yesterday and before today. Contributed by
2144
* There is now a bzr.bat file created by distutils when building on
2145
Windows. Contributed by Alexander Belchenko.
2149
* Removed uuid() as it was unused.
2151
* Improved 'fetch' code for pulling revisions from one branch into
2152
another (used by pull, merged, etc.)
2155
bzr 0.0.8 2005-09-20
2159
* Adding a file whose parent directory is not versioned will
2160
implicitly add the parent, and so on up to the root. This means
2161
you should never need to explictly add a directory, they'll just
2162
get added when you add a file in the directory. Contributed by
2165
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
2168
* If you set BZR_EDITOR in the environment, it is checked in
2169
preference to EDITOR and the config file for the interactive commit
2170
editing program. Related to this is a bugfix where a missing program
2171
set in EDITOR would cause editing to fail, now the fallback program
2172
for the operating system is still tried.
2174
* Files that are not directories/symlinks/regular files will no longer
2175
cause bzr to fail, it will just ignore them by default. You cannot add
2176
them to the tree though - they are not versionable.
2181
* Refactor xml packing/unpacking.
2185
* Fixed 'bzr mv' by Ollie Rutherfurd.
2187
* Fixed strange error when trying to access a nonexistent http
2190
* Make sure that the hashcache gets written out if it can't be
2196
* Various Windows fixes from Ollie Rutherfurd.
2198
* Quieten warnings about locking; patch from Matt Lavin.
2201
bzr-0.0.7 2005-09-02
2205
* ``bzr shell-complete`` command contributed by Clint Adams to
2206
help with intelligent shell completion.
2208
* New expert command ``bzr find-merge-base`` for debugging merges.
2213
* Much better merge support.
2215
* merge3 conflicts are now reported with markers like '<<<<<<<'
2216
(seven characters) which is the same as CVS and pleases things
2222
* ``bzr upgrade`` no longer fails when trying to fix trees that
2223
mention revisions that are not present.
2225
* Fixed bugs in listing plugins from ``bzr plugins``.
2227
* Fix case of $EDITOR containing options for the editor.
2229
* Fix log -r refusing to show the last revision.
2230
(Patch from Goffredo Baroncelli.)
2235
* ``bzr log --show-ids`` shows the revision ids of all parents.
2237
* Externally provided commands on your $BZRPATH no longer need
2238
to recognize --bzr-usage to work properly, and can just handle
2244
* Changed trace messages to go through the standard logging
2245
framework, so that they can more easily be redirected by
2250
bzr-0.0.6 2005-08-18
2254
* Python plugins, automatically loaded from the directories on
2255
BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
2257
* New 'bzr mkdir' command.
2259
* Commit mesage is fetched from an editor if not given on the
2260
command line; patch from Torsten Marek.
2262
* ``bzr log -m FOO`` displays commits whose message matches regexp
2265
* ``bzr add`` with no arguments adds everything under the current directory.
2267
* ``bzr mv`` does move or rename depending on its arguments, like
2270
* ``bzr missing`` command shows a summary of the differences
2271
between two trees. (Merged from John Arbash-Meinel.)
2273
* An email address for commits to a particular tree can be
2274
specified by putting it into .bzr/email within a branch. (Based
2275
on a patch from Heikki Paajanen.)
2280
* Faster working tree operations.
2285
* 3rd-party modules shipped with bzr are copied within the bzrlib
2286
python package, so that they can be installed by the setup
2287
script without clashing with anything already existing on the
2288
system. (Contributed by Gustavo Niemeyer.)
2290
* Moved plugins directory to bzrlib/, so that there's a standard
2291
plugin directory which is not only installed with bzr itself but
2292
is also available when using bzr from the development tree.
2293
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
2294
standard plugins directory.
2296
* When exporting to a tarball with ``bzr export --format tgz``, put
2297
everything under a top directory rather than dumping it into the
2298
current directory. This can be overridden with the ``--root``
2299
option. Patch from William Dodé and John Meinel.
2301
* New ``bzr upgrade`` command to upgrade the format of a branch,
2302
replacing ``bzr check --update``.
2304
* Files within store directories are no longer marked readonly on
2307
* Changed ``bzr log`` output to a more compact form suggested by
2308
John A Meinel. Old format is available with the ``--long`` or
2309
``-l`` option, patched by William Dodé.
2311
* By default the commit command refuses to record a revision with
2312
no changes unless the ``--unchanged`` option is given.
2314
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
2315
line options must come before the command name because they
2316
affect what commands are available; all other options must come
2317
after the command name because their interpretation depends on
2320
* ``branch`` and ``clone`` added as aliases for ``branch``.
2322
* Default log format is back to the long format; the compact one
2323
is available with ``--short``.
2328
* Fix bugs in committing only selected files or within a subdirectory.
2331
bzr-0.0.5 2005-06-15
2335
* ``bzr`` with no command now shows help rather than giving an
2336
error. Suggested by Michael Ellerman.
2338
* ``bzr status`` output format changed, because svn-style output
2339
doesn't really match the model of bzr. Now files are grouped by
2340
status and can be shown with their IDs. ``bzr status --all``
2341
shows all versioned files and unknown files but not ignored files.
2343
* ``bzr log`` runs from most-recent to least-recent, the reverse
2344
of the previous order. The previous behaviour can be obtained
2345
with the ``--forward`` option.
2347
* ``bzr inventory`` by default shows only filenames, and also ids
2348
if ``--show-ids`` is given, in which case the id is the second
2354
* New 'bzr whoami --email' option shows only the email component
2355
of the user identification, from Jo Vermeulen.
2357
* New ``bzr ignore PATTERN`` command.
2359
* Nicer error message for broken pipe, interrupt and similar
2360
conditions that don't indicate an internal error.
2362
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
2364
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
2365
either read or write mode.
2367
* New option ``bzr log --show-ids`` shows revision and file ids.
2369
* New usage ``bzr log FILENAME`` shows only revisions that
2372
* Changed format for describing changes in ``bzr log -v``.
2374
* New option ``bzr commit --file`` to take a message from a file,
2375
suggested by LarstiQ.
2377
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
2378
Oler. File may be in a branch other than the working directory.
2380
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
2383
* Commands can now be defined by external programs or scripts
2384
in a directory on $BZRPATH.
2386
* New "stat cache" avoids reading the contents of files if they
2387
haven't changed since the previous time.
2389
* If the Python interpreter is too old, try to find a better one
2390
or give an error. Based on a patch from Fredrik Lundh.
2392
* New optional parameter ``bzr info [BRANCH]``.
2394
* New form ``bzr commit SELECTED`` to commit only selected files.
2396
* New form ``bzr log -r FROM:TO`` shows changes in selected
2397
range; contributed by John A Meinel.
2399
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
2400
options through to an external GNU diff.
2402
* New option ``bzr add --no-recurse`` to add a directory but not
2405
* ``bzr --version`` now shows more information if bzr is being run
2411
* Fixed diff format so that added and removed files will be
2412
handled properly by patch. Fix from Lalo Martins.
2414
* Various fixes for files whose names contain spaces or other
2420
* Converted black-box test suites from Bourne shell into Python;
2421
now run using ``./testbzr``. Various structural improvements to
2424
* testbzr by default runs the version of bzr found in the same
2425
directory as the tests, or the one given as the first parameter.
2427
* testbzr also runs the internal tests, so the only command
2428
required to check is just ``./testbzr``.
2430
* testbzr requires python2.4, but can be used to test bzr running
2431
under a different version.
2433
* Tests added for many other changes in this release.
2438
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
2440
* Refactor command functions into Command objects based on HCT by
2441
Scott James Remnant.
2443
* Better help messages for many commands.
2445
* Expose bzrlib.open_tracefile() to start the tracefile; until
2446
this is called trace messages are just discarded.
2448
* New internal function find_touching_revisions() and hidden
2449
command touching-revisions trace the changes to a given file.
2451
* Simpler and faster compare_inventories() function.
2453
* bzrlib.open_tracefile() takes a tracefilename parameter.
2455
* New AtomicFile class.
2457
* New developer commands ``added``, ``modified``.
2462
* Cope on Windows on python2.3 by using the weaker random seed.
2463
2.4 is now only recommended.
2466
bzr-0.0.4 2005-04-22
2470
* 'bzr diff' optionally takes a list of files to diff. Still a bit
2471
basic. Patch from QuantumG.
2473
* More default ignore patterns.
2475
* New 'bzr log --verbose' shows a list of files changed in the
2476
changeset. Patch from Sebastian Cote.
2478
* Roll over ~/.bzr.log if it gets too large.
2480
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
2483
* New 'bzr help commands' based on a patch from Denys Duchier.
2488
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
2489
or $EMAIL. All are decoded by the locale preferred encoding.
2490
If none of these are present user@hostname is used. The host's
2491
fully-qualified name is not used because that tends to fail when
2492
there are DNS problems.
2494
* New 'bzr whoami' command instead of username user-email.
2499
* Make commit safe for hardlinked bzr trees.
2501
* Some Unicode/locale fixes.
2503
* Partial workaround for difflib.unified_diff not handling
2504
trailing newlines properly.
2509
* Allow docstrings for help to be in PEP0257 format. Patch from
2512
* More tests in test.sh.
2514
* Write profile data to a temporary file not into working
2515
directory and delete it when done.
2517
* Smaller .bzr.log with process ids.
2522
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
2525
* Some improvements in handling paths on Windows, based on a patch
2529
bzr-0.0.3 2005-04-06
2533
* New "directories" internal command lists versioned directories
2536
* Can now say "bzr commit --help".
2538
* New "rename" command to rename one file to a different name
2541
* New "move" command to move one or more files into a different
2544
* New "renames" command lists files renamed since base revision.
2546
* New cat command contributed by janmar.
2550
* .bzr.log is placed in $HOME (not pwd) and is always written in
2551
UTF-8. (Probably not a completely good long-term solution, but
2556
* Workaround for difflib bug in Python 2.3 that causes an
2557
exception when comparing empty files. Reported by Erik Toubro
2562
* Refactored inventory storage to insert a root entry at the top.
2566
* Start of shell-based black-box testing in test.sh.
2573
* Win32 fixes from Steve Brown.
2576
bzr-0.0.2 "black cube" 2005-03-31
2580
* Default ignore list extended (see bzrlib/__init__.py).
2582
* Patterns in .bzrignore are now added to the default ignore list,
2583
rather than replacing it.
2585
* Ignore list isn't reread for every file.
2589
* Reinstate the 'bzr check' command to check invariants of the
2592
* New 'ignored' command lists which files are ignored and why;
2593
'deleted' lists files deleted in the current working tree.
2595
* Performance improvements.
2597
* New global --profile option.
2599
* Ignore patterns like './config.h' now correctly match files in
2600
the root directory only.
2603
bzr-0.0.1 2005-03-26
2607
* More information from info command.
2609
* Can now say "bzr help COMMAND" for more detailed help.
2611
* Less file flushing and faster performance when writing logs and
2612
committing to stores.
2614
* More useful verbose output from some commands.
2618
* Fix inverted display of 'R' and 'M' during 'commit -v'.
2622
* Include a subset of ElementTree-1.2.20040618 to make
2623
installation easier.
2625
* Fix time.localtime call to work with Python 2.3 (the minimum
2629
bzr-0.0.0.69 2005-03-22
2633
* First public release.
2635
* Storage of local versions: init, add, remove, rm, info, log,
added
removed
NEWS
