This release of Bazaar includes several updates to the documentation, and fixes to prepare for making rich root support the default format. Many bugs have been squashed, including fixes to log, bzr+ssh inter-operation with older servers.
CHANGES:
- Suppress deprecation warnings when bzrlib is a 'final' release. This way users of packaged software won't be bothered with DeprecationWarnings, but developers and testers will still see them. (John Arbash Meinel)
DOCUMENTATION:
- Incorporate feedback from Jelmer Vernooij and Neil Martinsen-Burrell on the plugin and integration chapters of the User Guide. (Ian Clatworthy)
NOTES WHEN UPGRADING:
CHANGES:
- Broader support of GNU Emacs mail clients. Set mail_client=emacsclient in your bazaar.conf and send will pop the bundle in a mail buffer according to the value of mail-user-agent variable. (Xavier Maillard)
FEATURES:
IMPROVEMENTS:
- Diff now handles revision specs like "branch:" and "submit:" more efficiently. (Aaron Bentley)
- More friendly error given when attempt to start the smart server on an address already in use. (Andrea Corbellini, #200575)
- Pull completes much faster when there is nothing to pull. (Aaron Bentley)
BUGFIXES:
- Authentication.conf can define sections without password. (Vincent Ladeuil, #199440)
- Avoid muttering every time a child update does not cause a progress bar update. (John Arbash Meinel, #213771)
- Branch.reconcile() is now implemented. This allows bzr reconcile to fix when a Branch has a non-canonical mainline history. bzr check also detects this condition. (John Arbash Meinel, #177855)
- bzr commit now works with Microsoft's FTP service. (Andreas Deininger)
- Catch definitions outside sections in authentication.conf. (Vincent Ladeuil, #217650)
- Conversion from non-rich-root to rich-root(-pack) updates inventory sha1s, even when bundles are used. (Aaron Bentley, #181391)
- Conversion from non-rich-root to rich-root(-pack) works correctly even though search keys are not topologically sorted. (Aaron Bentley)
- Conversion from non-rich-root to rich-root(-pack) works even when a parent revision has a different root id. (Aaron Bentley, #177874)
- Disable strace testing until strace is fixed (see bug #103133) and emit a warning when selftest ends to remind us of leaking tests. (Vincent Ladeuil, #226769)
- Fetching all revisions from a repository does not cause pack collisions. (Robert Collins, Aaron Bentley, #212908)
- Fix error about "attempt to add line-delta in non-delta knit". (Andrew Bennetts, #217701)
- Pushing a branch in "dirstate" format (Branch5) over bzr+ssh would break if the remote server was < version 1.2. This was due to a bug in the RemoteRepository.get_parent_map() fallback code. (John Arbash Meinel, #214894)
- Remove leftover code in bzr_branch that inappropriately creates a branch-name file in the branch control directory. (Martin Pool)
- Set SO_REUSEADDR on server sockets of bzr serve to avoid problems rebinding the socket when starting the server a second time. (John Arbash Meinel, Martin Pool, #164288)
- Severe performance degradation in fetching from knit repositories to knits and packs due to parsing the entire revisions.kndx on every graph walk iteration fixed by using the Repository.get_graph API. There was another regression in knit => knit fetching which re-read the index for every revision each side had in common. (Robert Collins, John Arbash Meinel)
- When logging the changes to a particular file, there was a bug if there were ghosts in the revision ancestry. (John Arbash Meinel, #209948)
DOCUMENTATION:
- Expanded the User Guide to include new chapters on popular plugins and integrating Bazaar into your environment. The Best practices chapter was renamed to Miscellaneous topics as suggested by community feedback as well. (Ian Clatworthy)
- Document outlining strategies for TortoiseBzr. (Mark Hammond)
- Improved the documentation on hooks. (Ian Clatworthy)
- Update authentication docs regarding ssh agents. (Vincent Ladeuil, #183705)
TESTING:
- Add thread_name_suffix parameter to SmartTCPServer_for_testing, to make it easy to identify which test spawned a thread with an unhandled exception. (Andrew Bennetts)
- New --debugflag/-E option to bzr selftest for setting options for debugging tests, these are complementary to the the -D options. The -Dselftest_debug global option has been replaced by the -E=allow_debug option for selftest. (Andrew Bennetts)
- Parameterised test ids are preserved correctly to aid diagnosis of test failures. (Robert Collins, Andrew Bennetts)
- The test suite modules have been modified to define load_tests() instead of test_suite(). That speeds up selective loading (via --load-list) significantly and provides many examples on how to migrate (grep for load_tests). (Vincent Ladeuil)
INTERNALS:
- Hooks.install_hook is now deprecated in favour of Hooks.install_named_hook which adds a required name parameter, to avoid having to call Hooks.name_hook. (Daniel Watkins)
- Implement xml8 serializer. (Aaron Bentley)
- New form @deprecated_method(deprecated_in(1, 5, 0)) for making deprecation wrappers. (Martin Pool)
- Repository.revision_parents is now deprecated in favour of Repository.get_parent_map([revid])[revid]. (Jelmer Vernooij)
- The Python assert statement is no longer used in Bazaar source, and a test checks this. (Martin Pool)
API BREAKS:
- bzrlib.status.show_pending_merges requires the repository to be locked by the caller. Callers should have been doing it anyway, but it will now raise an exception if they do not. (John Arbash Meinel)
- Repository.get_data_stream, Repository.get_data_stream_for_search(), Repository.get_deltas_for_revsions(), Repository.revision_trees(), Repository.item_keys_introduced_by() no longer take read locks. (Aaron Bentley)
- LockableFiles.get_utf8 is deprecated, as a start towards removing LockableFiles and .control_files entirely. (Martin Pool)
- Methods deprecated prior to 1.1 have been removed. (Martin Pool)
This release of Bazaar includes handy improvements to the speed of log and status, new options for several commands, improved documentation, and better hooks, including initial code for server-side hooks. A number of bugs have been fixed, particularly in interoperability between different formats or different releases of Bazaar over there network. There's been substantial internal work in both the repository and network code to enable new features and faster performance.
BUG FIXES:
- Pushing a branch in "dirstate" format (Branch5) over bzr+ssh would break if the remote server was < version 1.2. This was due to a bug in the RemoteRepository.get_parent_map() fallback code. (John Arbash Meinel, Andrew Bennetts, #214894)
BUG FIXES:
- bzr log -r ..X bzr:// was failing, because it was getting a request for revision_id=None which was not a string. (John Arbash Meinel, #211661)
- Fixed a bug in handling ghost revisions when logging changes in a particular file. (John Arbash Meinel, #209948)
- Fix error about "attempt to add line-delta in non-delta knit". (Andrew Bennetts, #205156)
- Fixed performance degradation in fetching from knit repositories to knits and packs due to parsing the entire revisions.kndx on every graph walk iteration fixed by using the Repository.get_graph API. There was another regression in knit => knit fetching which re-read the index for every revision each side had in common. (Robert Collins, John Arbash Meinel)
CHANGES:
- bzr main script cannot be imported (Benjamin Peterson)
- On Linux bzr additionally looks for plugins in arch-independent site directory. (Toshio Kuratomi)
- The set_rh branch hook is now deprecated. Please migrate any plugins using this hook to use an alternative, e.g. post_change_branch_tip. (Ian Clatworthy)
- When a plugin cannot be loaded as the file path is not a valid python module name bzr will now strip a bzr_ prefix from the front of the suggested name, as many plugins (e.g. bzr-svn) want to be installed without this prefix. It is a common mistake to have a folder named "bzr-svn" for that plugin, especially as this is what bzr branch lp:bzr-svn will give you. (James Westby, Andrew Cowie)
- UniqueIntegerBugTracker now appends bug-ids instead of joining them to the base URL. Plugins that register bug trackers may need a trailing / added to the base URL if one is not already there. (James Wesby, Andrew Cowie)
FEATURES:
- Added start_commit hook for mutable trees. (Jelmer Vernooij, #186422)
- status now accepts --no-pending to show the status without listing pending merges, which speeds up the command a lot on large histories. (James Westby, #202830)
- New post_change_branch_tip hook that is called after the branch tip is moved but while the branch is still write-locked. See the User Reference for signature details. (Ian Clatworthy, James Henstridge)
- Reconfigure can convert a branch to be standalone or to use a shared repository. (Aaron Bentley)
IMPROVEMENTS:
- The smart protocol now has support for setting branches' revision info directly. This should make operations like push slightly faster, and is a step towards server-side hooks. The new request method name is Branch.set_last_revision_info. (Andrew Bennetts)
- bzr commit --fixes now recognises "gnome" as a tag by default. (James Westby, Andrew Cowie)
- bzr switch will attempt to find branches to switch to relative to the current branch. E.g. bzr switch branchname will look for current_branch/../branchname. (Robert Collins, Jelmer Vernooij, Wouter van Heyst)
- Diff is now more specific about execute-bit changes it describes (Chad Miller)
- Fetching data over HTTP is a bit faster when urllib is used. This is done by forcing it to recv 64k at a time when reading lines in HTTP headers, rather than just 1 byte at a time. (Andrew Bennetts)
- Log --short and --line are much faster when -r is not specified. (Aaron Bentley)
- Merge is faster. We no longer check a file's existence unnecessarily when merging the execute bit. (Aaron Bentley)
- bzr status on an explicit list of files no longer shows pending merges, making it much faster on large trees. (John Arbash Meinel)
- The launchpad directory service now warns the user if they have not set their launchpad login and are trying to resolve a URL using it, just in case they want to do a write operation with it. (James Westby)
- The smart protocol client is slightly faster, because it now only queries the server for the protocol version once per connection. Also, the HTTP transport will now automatically probe for and use a smart server if one is present. You can use the new nosmart+ transport decorator to get the old behaviour. (Andrew Bennetts)
- The version command takes a --short option to print just the version number, for easier use in scripts. (Martin Pool)
- Various operations with revision specs and commands that calculate revnos and revision ids are faster. (John A. Meinel, Aaron Bentley)
BUGFIXES:
- Add root_client_path parameter to SmartWSGIApp and SmartServerRequest. This makes it possible to publish filesystem locations that don't exactly match URL paths. SmartServerRequest subclasses should use the new translate_client_path and transport_from_client_path methods when dealing with paths received from a client to take this into account. (Andrew Bennetts, #124089)
- bzr mv a b can be now used also to rename previously renamed directories, not only files. (Lukáš Lalinský, #107967)
- bzr uncommit --local can now remove revisions from the local branch to be symmetric with bzr commit --local. (John Arbash Meinel, #93412)
- Don't ask for a password if there is no real terminal. (Alexander Belchenko, #69851)
- Fix a bug causing a ValueError crash in parse_line_delta_iter when fetching revisions from a knit to pack repository or vice versa using bzr:// (including over http or ssh). (#208418, Andrew Bennetts, Martin Pool, Robert Collins)
- Fixed _get_line in bzrlib.smart.medium, which was buggy. Also fixed _get_bytes in the same module to use the push back buffer. These bugs had no known impact in normal use, but were problematic for developers working on the code, and were likely to cause real bugs sooner or later. (Andrew Bennetts)
- Implement handling of basename parameter for DefaultMail. (James Westby)
- Incompatibility with Paramiko versions newer than 1.7.2 was fixed. (Andrew Bennetts, #213425)
- Launchpad locations (lp: URLs) can be pulled. (Aaron Bentley, #181945)
- Merges that add files to deleted root directories complete. They do create conflicts. (Aaron Bentley, #210092)
- vsftp's return 550 RNFR command failed. supported. (Marcus Trautwig, #129786)
DOCUMENTATION:
- Improved documentation on send/merge relationship. (Peter Schuller)
- Minor fixes to the User Guide. (Matthew Fuller)
- Reduced the evangelism in the User Guide. (Ian Clatworthy)
- Added Integrating with Bazaar document for developers (Martin Albisetti)
API BREAKS:
- Attempting to pull data from a ghost aware repository (e.g. knits) into a non-ghost aware repository such as weaves will now fail if there are ghosts. (Robert Collins)
- KnitVersionedFile no longer accepts an access_mode parameter, and now requires the index and access_method parameters to be supplied. A compatible shim has been kept in the new function knit.make_file_knit. (Robert Collins)
- Log formatters must now provide log_revision instead of show and show_merge_revno methods. The latter had been deprecated since the 0.17 release. (James Westby)
- LoopbackSFTP is now called SocketAsChannelAdapter. (Andrew Bennetts)
- osutils.backup_file is removed. (Alexander Belchenko)
- Repository.get_revision_graph is deprecated, with no replacement method. The method was size(history) and not desirable. (Robert Collins)
- revision.revision_graph is deprecated, with no replacement function. The function was size(history) and not desirable. (Robert Collins)
- Transport.get_shared_medium is deprecated. Use Transport.get_smart_medium instead. (Andrew Bennetts)
- VersionedFile factories now accept a get_scope parameter rather than using a call to transaction_finished, allowing the removal of the fixed list of versioned files per repository. (Robert Collins)
- VersionedFile.annotate_iter is deprecated. While in principle this allowed lower memory use, all users of annotations wanted full file annotations, and there is no storage format suitable for incremental line-by-line annotation. (Robert Collins)
- VersionedFile.clone_text is deprecated. This performance optimisation is no longer used - reading the content of a file that is undergoing a file level merge to identical state on two branches is rare enough, and not expensive enough to special case. (Robert Collins)
- VersionedFile.clear_cache and enable_cache are deprecated. These methods added significant complexity to the VersionedFile implementation, but were only used for optimising fetches from knits - which can be done from outside the knit layer, or via a caching decorator. As knits are not the default format, the complexity is no longer worth paying. (Robert Collins)
- VersionedFile.create_empty is removed. This method presupposed a sensible mapping to a transport for individual files, but pack backed versioned files have no such mapping. (Robert Collins)
- VersionedFile.get_graph is deprecated, with no replacement method. The method was size(history) and not desirable. (Robert Collins)
- VersionedFile.get_graph_with_ghosts is deprecated, with no replacement method. The method was size(history) and not desirable. (Robert Collins)
- VersionedFile.get_parents is deprecated, please use VersionedFile.get_parent_map. (Robert Collins)
- VersionedFile.get_sha1 is deprecated, please use VersionedFile.get_sha1s. (Robert Collins)
- VersionedFile.has_ghost is now deprecated, as it is both expensive and unused outside of a single test. (Robert Collins)
- VersionedFile.iter_parents is now deprecated in favour of get_parent_map which can be used to instantiate a Graph on a VersionedFile. (Robert Collins)
TESTING:
New -Dselftest_debug flag disables clearing of the debug flags during tests. This is useful if you want to use e.g. -Dhpss to help debug a failing test. Be aware that using this feature is likely to cause spurious test failures if used with the full suite. (Andrew Bennetts)
selftest --load-list now uses a new more agressive test loader that will avoid loading unneeded modules and building their tests. Plugins can use this new loader by defining a load_tests function instead of a test_suite function. (a forthcoming patch will provide many examples on how to implement this). (Vincent Ladeuil)
selftest --load-list now does some sanity checks regarding duplicate test IDs and tests present in the list but not found in the actual test suite. (Vincent Ladeuil)
Slightly more concise format for the selftest progress bar, so there's more space to show the test name. (Martin Pool)
[2500/10884, 1fail, 3miss in 1m29s] test_revisionnamespaces.TestRevThe test suite takes much less memory to run, and is a bit faster. This is done by clearing most attributes of TestCases after running them, if they succeeded. (Andrew Bennetts)
INTERNALS:
- Added _build_client_protocol to _SmartClient. (Andrew Bennetts)
- Added basic infrastructure for automatic plugin suggestion. (Martin Albisetti)
- If a LockableFiles object is not explicitly unlocked (for example because of a missing try/finally block, it will give a warning but not automatically unlock itself. (Previously they did.) This sometimes caused knock-on errors if for example the network connection had already failed, and should not be relied upon by code. (Martin Pool, #109520)
- make dist target to build a release tarball, and also check-dist-tarball and dist-upload-escudero. (Martin Pool)
- The read_response_tuple method of SmartClientRequestProtocol* classes will now raise UnknownSmartMethod when appropriate, so that callers don't need to try distinguish unknown request errors from other errors. (Andrew Bennetts)
- set_make_working_trees is now implemented provided on all repository implementations (Aaron Bentley)
- VersionedFile now has a new method get_parent_map which, like Graph.get_parent_map returns a dict of key:parents. (Robert Collins)
No changes from 1.3.1rc1.
BUG FIXES:
- Fix a bug causing a ValueError crash in parse_line_delta_iter when fetching revisions from a knit to pack repository or vice versa using bzr:// (including over http or ssh). (#208418, Andrew Bennetts, Martin Pool, Robert Collins)
Bazaar has become part of the GNU project <http://www.gnu.org>
Many operations that act on history, including log and annotate are now substantially faster. Several bugs have been fixed and several new options and features have been added.
TESTING:
- Avoid spurious failure of TestVersion.test_version matching directory names. (#202778, Martin Pool)
NOTES WHEN UPGRADING:
- The backup directory created by upgrade is now called backup.bzr, not .bzr.backup. (Martin Albisetti)
CHANGES:
- A new repository format 'development' has been added. This format will represent the latest 'in-progress' format that the bzr developers are interested in getting early-adopter testing and feedback on. doc/developers/development-repo.txt has detailed information. (Robert Collins)
- BZR_LOG environment variable controls location of .bzr.log trace file. User can suppress writing messages to .bzr.log by using '/dev/null' filename (on Linux) or 'NUL' (on Windows). If BZR_LOG variable is not defined but BZR_HOME is defined then default location for .bzr.log trace file is $BZR_HOME/.bzr.log. (Alexander Belchenko)
- launchpad builtin plugin now shipped as separate part in standalone bzr.exe, installed to C:\Program Files\Bazaar\plugins directory, and standalone installer allows user to skip installation of this plugin. (Alexander Belchenko)
- Restore auto-detection of plink.exe on Windows. (Dmitry Vasiliev)
- Version number is now shown as "1.2" or "1.2pr2", without zeroed or missing final fields. (Martin Pool)
FEATURES:
- branch and checkout can hard-link working tree files, which is faster and saves space. (Aaron Bentley)
- bzr send will now also look at the child_submit_to setting in the submit branch to determine the email address to send to. (Jelmer Vernooij)
IMPROVEMENTS:
- BzrBranch._lefthand_history is faster on pack repos. (Aaron Bentley)
- Branch6.generate_revision_history is faster. (Aaron Bentley)
- Directory services can now be registered, allowing special URLs to be dereferenced into real URLs. This is a generalization and cleanup of the lp: transport lookup. (Aaron Bentley)
- Merge directives that are automatically attached to emails have nicer filenames, based on branch-nick + revno. (Aaron Bentley)
- push has a --revision option, to specify what revision to push up to. (Daniel Watkins)
- Significantly reducing execution time and network traffic for trivial case of running bzr missing command for two identical branches. (Alexander Belchenko)
- Speed up operations that look at the revision graph (such as 'bzr log'). KnitPackRepositor.get_revision_graph uses Graph.iter_ancestry to extract the revision history. This allows filtering ghosts while stepping instead of needing to peek ahead. (John Arbash Meinel)
- The hooks command lists installed hooks, to assist in debugging. (Daniel Watkins)
- Updates to how annotate work. Should see a measurable improvement in performance and memory consumption for file with a lot of merges. Also, correctly handle when a line is introduced by both parents (it should be attributed to the first merge which notices this, and not to all subsequent merges.) (John Arbash Meinel)
BUGFIXES:
- Autopacking no longer holds the full set of inventory lines in memory while copying. For large repositories, this can amount to hundreds of MB of ram consumption. (Ian Clatworthy, John Arbash Meinel)
- Cherrypicking when using --format=merge3 now explictly excludes BASE lines. (John Arbash Meinel, #151731)
- Disable plink's interactive prompt for password. (#107593, Dmitry Vasiliev)
- Encode command line arguments from unicode to user_encoding before invoking external mail client in bzr send command. (#139318, Alexander Belchenko)
- Fixed problem connecting to bzr+https:// servers. (#198793, John Ferlito)
- Improved error reporting in the Launchpad plugin. (Daniel Watkins, #196618)
- Include quick-start-summary.svg file to python-based installer(s) for Windows. (#192924, Alexander Belchenko)
- lca merge now respects specified files. (Aaron Bentley)
- Make version-info --custom imply --all. (#195560, James Westby)
- merge --preview now works for merges that add or modify symlinks (James Henstridge)
- Redirecting the output from bzr merge (when the remembered location is used) now works. (John Arbash Meinel)
- setup.py script explicitly checks for Python version. (Jari Aalto, Alexander Belchenko, #200569)
- UnknownFormatErrors no longer refer to branches regardless of kind of unknown format. (Daniel Watkins, #173980)
- Upgrade bundled ConfigObj to version 4.5.2, which properly quotes # signs, among other small improvements. (Matt Nordhoff, #86838)
- Use correct indices when emitting LCA conflicts. This fixes IndexError errors. (Aaron Bentley, #196780)
DOCUMENTATION:
- Explained how to use version-info --custom in the User Guide. (Neil Martinsen-Burrell)
API BREAKS:
- Support for loading plugins from zip files and bzrlib.plugin.load_from_zip() function are deprecated. (Alexander Belchenko)
TESTING:
- The branch interface tests were invalid for branches using rich-root repositories because the empty string is not a valid file-id. (Robert Collins)
INTERNALS:
- Graph.iter_ancestry returns the ancestry of revision ids. Similar to Repository.get_revision_graph() except it includes ghosts and you can stop part-way through. (John Arbash Meinel)
- New module tools/package_mf.py provide custom module finder for python packages (improves standard python library's modulefinder.py) used by setup.py script while building standalone bzr.exe. (Alexander Belchenko)
- New remote method RemoteBzrDir.find_repositoryV2 adding support for detecting external lookup support on remote repositories. This method is now attempted first when lookup up repositories, leading to an extra round trip on older bzr smart servers. (Robert Collins)
- Repository formats have a new supported-feature attribute supports_external_lookups used to indicate repositories which support falling back to other repositories when they have partial data. (Robert Collins)
- Repository.get_revision_graph_with_ghosts and bzrlib.revision.(common_ancestor,MultipleRevisionSources,common_graph) have been deprecated. (John Arbash Meinel)
- Tree.iter_changes is now a public API, replacing the work-in-progress Tree._iter_changes. The api is now considered stable and ready for external users. (Aaron Bentley)
- The bzrdir format registry now accepts an alias keyword to register_metadir, used to indicate that a format name is an alias for some other format and thus should not be reported when describing the format. (Robert Collins)
BUG FIXES:
- Fix failing test in Launchpad plugin. (Martin Pool)
NOTES WHEN UPGRADING:
- Fetching via the smart protocol may need to reconnect once during a fetch if the remote server is running Bazaar 1.1 or earlier, because the client attempts to use more efficient requests that confuse older servers. You may be required to re-enter a password or passphrase when this happens. This won't happen if the server is upgraded to Bazaar 1.2. (Andrew Bennetts)
CHANGES:
- Fetching via bzr+ssh will no longer fill ghosts by default (this is consistent with pack-0.92 fetching over SFTP). (Robert Collins)
- Formatting of bzr plugins output is changed to be more human- friendly. Full path of plugins locations will be shown only with --verbose command-line option. (Alexander Belchenko)
- merge now prefers to use the submit branch, but will fall back to parent branch. For many users, this has no effect. But some users who pull and merge on the same branch will notice a change. This change makes it easier to work on a branch on two different machines, pulling between the machines, while merging from the upstream. merge --remember can now be used to set the submit_branch. (Aaron Bentley)
FEATURES:
- merge --preview produces a diff of the changes merge would make, but does not actually perform the merge. (Aaron Bentley)
- New smart method Repository.get_parent_map for getting revision parent data. This returns additional parent information topologically adjacent to the requested data to reduce round trip latency impacts. (Robert Collins)
- New smart method, Repository.stream_revisions_chunked, for fetching revision data that streams revision data via a chunked encoding. This avoids buffering large amounts of revision data on the server and on the client, and sends less data to the server to request the revisions. (Andrew Bennetts, Robert Collins, #178353)
- The launchpad plugin now handles lp urls of the form lp://staging/, lp://demo/, lp://dev/ to use the appropriate launchpad instance to do the resolution of the branch identities. This is primarily of use to Launchpad developers, but can also be used by other users who want to try out Launchpad as a branch location without messing up their public Launchpad account. Branches that are pushed to the staging environment have an expected lifetime of one day. (Tim Penhey)
IMPROVEMENTS:
- Creating a new branch no longer tries to read the entire revision-history unnecessarily over smart server operations. (Robert Collins)
- Fetching between different repository formats with compatible models now takes advantage of the smart method to stream revisions. (Andrew Bennetts)
- The --coverage option is now global, rather specific to bzr selftest. (Andrew Bennetts)
- The register-branch command will now use the public url of the branch containing the current directory, if one has been set and no explicit branch is provided. (Robert Collins)
- Tweak the reannotate code path to optimize the 2-parent case. Speeds up bzr annotate with a pack repository by approx 3:2. (John Arbash Meinel)
BUGFIXES:
- Calculate remote path relative to the shared medium in _SmartClient. This is related to the problem in bug #124089. (Andrew Bennetts)
- Cleanly handle connection errors in smart protocol version two, the same way as they are handled by version one. (Andrew Bennetts)
- Clearer error when version-info --custom is used without --template (Lukáš Lalinský)
- Don't raise UnavailableFeature during test setup when medusa is not available or tearDown is never called leading to nasty side effects. (#137823, Vincent Ladeuil)
- If a plugin's test suite cannot be loaded, for example because of a syntax error in the tests, then selftest fails, rather than just printing a warning. (Martin Pool, #189771)
- List possible values for BZR_SSH environment variable in env-variables help topic. (Alexander Belchenko, #181842)
- New methods push_log_file and pop_log_file to intercept messages: popping the log redirection now precisely restores the previous state, which makes it easier to use bzr log output from other programs. TestCaseInTempDir no longer depends on a log redirection being established by the test framework, which lets bzr tests cleanly run from a normal unittest runner. (#124153, #124849, Martin Pool, Jonathan Lange)
- pull --quiet is now more quiet, in particular a message is no longer printed when the remembered pull location is used. (James Westby, #185907)
- reconfigure can safely be interrupted while fetching. (Aaron Bentley, #179316)
- reconfigure preserves tags when converting to and from lightweight checkouts. (Aaron Bentley, #182040)
- Stop polluting /tmp when running selftest. (Vincent Ladeuil, #123623)
- Switch from NFKC => NFC for normalization checks. NFC allows a few more characters which should be considered valid. (John Arbash Meinel, #185458)
- The launchpad plugin now uses the edge xmlrpc server to avoid interacting badly with a bug on the launchpad side. (Robert Collins)
- Unknown hostnames when connecting to a bzr:// URL no longer cause tracebacks. (Andrew Bennetts, #182849)
API BREAKS:
- Classes implementing Merge types like Merge3Merger must now accept (and honour) a do_merge flag in their constructor. (Aaron Bentley)
- Repository.add_inventory and add_revision now require the caller to previously take a write lock (and start a write group.) (Martin Pool)
TESTING:
- selftest now accepts --load-list <file> to load a test id list. This speeds up running the test suite on a limited set of tests. (Vincent Ladeuil)
INTERNALS:
- Add a new method get_result to graph search objects. The resulting SearchResult can be used to recreate the search later, which will be useful in reducing network traffic. (Robert Collins)
- Use convenience function to check whether two repository handles are referring to the same repository in Repository.get_graph. (Jelmer Vernooij, #187162)
- Fetching now passes the find_ghosts flag through to the InterRepository.missing_revision_ids call consistently for all repository types. This will enable faster missing revision discovery with bzr+ssh. (Robert Collins)
- Fix error handling in Repository.insert_data_stream. (Lukas Lalinsky)
- InterRepository.missing_revision_ids is now deprecated in favour of InterRepository.search_missing_revision_ids which returns a bzrlib.graph.SearchResult suitable for making requests from the smart server. (Robert Collins)
- New error NoPublicBranch for commands that need a public branch to operate. (Robert Collins)
- New method iter_inventories on Repository for access to many inventories. This is primarily used by the revision_trees method, as direct access to inventories is discouraged. (Robert Collins)
- New method next_with_ghosts on the Graph breadth-first-search objects which will split out ghosts and present parents into two separate sets, useful for code which needs to be aware of ghosts (e.g. fetching data cares about ghosts during revision selection). (Robert Collins)
- Record a timestamp against each mutter to the trace file, relative to the first import of bzrlib. (Andrew Bennetts)
- Repository.get_data_stream is now deprecated in favour of Repository.get_data_stream_for_search which allows less network traffic when requesting data streams over a smart server. (Robert Collins)
- RemoteBzrDir._get_tree_branch no longer triggers _ensure_real, removing one round trip on many network operations. (Robert Collins)
- RemoteTransport's recommended_page_size method now returns 64k, like SFTPTransport and HttpTransportBase. (Andrew Bennetts)
- Repository has a new method has_revisions which signals the presence of many revisions by returning a set of the revisions listed which are present. This can be done by index queries without reading data for parent revision names etc. (Robert Collins)
(no changes from 1.1rc1)
CHANGES:
- Dotted revision numbers have been revised. Instead of growing longer with nested branches the branch number just increases. (eg instead of 1.1.1.1.1 we now report 1.2.1.) This helps scale long lived branches which have many feature branches merged between them. (John Arbash Meinel)
- The syntax bzr diff branch1 branch2 is no longer supported. Use bzr diff branch1 --new branch2 instead. This change has been made to remove the ambiguity where branch2 is in fact a specific file to diff within branch1.
FEATURES:
- New option to use custom template-based formats in bzr version-info. (Lukáš Lalinský)
- diff '--using' allows an external diff tool to be used for files. (Aaron Bentley)
- New "lca" merge-type for fast everyday merging that also supports criss-cross merges. (Aaron Bentley)
IMPROVEMENTS:
- annotate now doesn't require a working tree. (Lukáš Lalinský, #90049)
- branch and checkout can now use files from a working tree to to speed up the process. For checkout, this requires the new --files-from flag. (Aaron Bentley)
- bzr diff now sorts files in alphabetical order. (Aaron Bentley)
- bzr diff now works on branches without working trees. Tree-less branches can also be compared to each other and to working trees using the new diff options --old and --new. Diffing between branches, with or without trees, now supports specific file filtering as well. (Ian Clatworthy, #6700)
- bzr pack now orders revision texts in topological order, with newest at the start of the file, promoting linear reads for bzr log and the like. This partially fixes #154129. (Robert Collins)
- Merge directives now fetch prerequisites from the target branch if needed. (Aaron Bentley)
- pycurl now handles digest authentication. (Vincent Ladeuil)
- reconfigure can now convert from repositories. (Aaron Bentley)
- -l is now a short form for --limit in log. (Matt Nordhoff)
- merge now warns when merge directives cause cherrypicks. (Aaron Bentley)
- split now supported, to enable splitting large trees into smaller pieces. (Aaron Bentley)
BUGFIXES:
- Avoid AttributeError when unlocking a pack repository when an error occurs. (Martin Pool, #180208)
- Better handle short reads when processing multiple range requests. (Vincent Ladeuil, #179368)
- build_tree acceleration uses the correct path when a file has been moved. (Aaron Bentley)
- commit now succeeds when a checkout and its master branch share a repository. (Aaron Bentley, #177592)
- Fixed error reporting of unsupported timezone format in log --timezone. (Lukáš Lalinský, #178722)
- Fixed Unicode encoding error in ignored when the output is redirected to a pipe. (Lukáš Lalinský)
- Fix traceback when sending large response bodies over the smart protocol on Windows. (Andrew Bennetts, #115781)
- Fix urlutils.relative_url for the case of two file:/// URLs pointed to different logical drives on Windows. (Alexander Belchenko, #90847)
- HTTP test servers are now compatible with the http protocol version 1.1. (Vincent Ladeuil, #175524)
- _KnitParentsProvider.get_parent_map now handles requests for ghosts correctly, instead of erroring or attributing incorrect parents to ghosts. (Aaron Bentley)
- merge --weave --uncommitted now works. (Aaron Bentley)
- pycurl authentication handling was broken and incomplete. Fix handling of user:pass embedded in the urls. (Vincent Ladeuil, #177643)
- Files inside non-directories are now handled like other conflict types. (Aaron Bentley, #177390)
- reconfigure is able to convert trees into lightweight checkouts. (Aaron Bentley)
- Reduce lockdir timeout to 0 when running bzr serve. (Andrew Bennetts, #148087)
- Test that the old version_info_format functions still work, even though they are deprecated. (John Arbash Meinel, ShenMaq, #177872)
- Transform failures no longer cause ImmortalLimbo errors (Aaron Bentley, #137681)
- uncommit works even when the commit messages of revisions to be removed use characters not supported in the terminal encoding. (Aaron Bentley)
- When dumb http servers return whole files instead of the requested ranges, read the remaining bytes by chunks to avoid overflowing network buffers. (Vincent Ladeuil, #175886)
DOCUMENTATION:
- Minor tweaks made to the bug tracker integration documentation. (Ian Clatworthy)
- Reference material has now be moved out of the User Guide and added to the User Reference. The User Reference has gained 4 sections as a result: Authenication Settings, Configuration Settings, Conflicts and Hooks. All help topics are now dumped into text format in the doc/en/user-reference directory for those who like browsing that information in their editor. (Ian Clatworthy)
- Using Bazaar with Launchpad tutorial added. (Ian Clatworthy)
INTERNALS:
- find_* methods available for BzrDirs, Branches and WorkingTrees. (Aaron Bentley)
- Help topics can now be loaded from files. (Ian Clatworthy, Alexander Belchenko)
- get_parent_map now always provides tuples as its output. (Aaron Bentley)
- Parent Providers should now implement get_parent_map returning a dictionary instead of get_parents returning a list. Graph.get_parents is now deprecated. (John Arbash Meinel, Robert Collins)
- Patience Diff now supports arbitrary python objects, as long as they support hash(). (John Arbash Meinel)
- Reduce selftest overhead to establish test names by memoization. (Vincent Ladeuil)
API BREAKS:
TESTING:
- Modules can now customise their tests by defining a load_tests attribute. pydoc bzrlib.tests.TestUtil.TestLoader.loadTestsFromModule for the documentation on this attribute. (Robert Collins)
- New helper function bzrlib.tests.condition_id_re which helps filter tests based on a regular expression search on the tests id. (Robert Collins)
- New helper function bzrlib.tests.condition_isinstance which helps filter tests based on class. (Robert Collins)
- New helper function bzrlib.tests.exclude_suite_by_condition which generalises the exclude_suite_by_re function. (Robert Collins)
- New helper function bzrlib.tests.filter_suite_by_condition which generalises the filter_suite_by_re function. (Robert Collins)
- New helper method bzrlib.tests.exclude_tests_by_re which gives a new TestSuite that does not contain tests from the input that matched a regular expression. (Robert Collins)
- New helper method bzrlib.tests.randomize_suite which returns a randomized copy of the input suite. (Robert Collins)
- New helper method bzrlib.tests.split_suite_by_re which splits a test suite into two according to a regular expression. (Robert Collins)
- Parametrize all http tests for the transport implementations, the http protocol versions (1.0 and 1.1) and the authentication schemes. (Vincent Ladeuil)
- The exclude_pattern and random_order parameters to the function bzrlib.tests.filter_suite_by_re have been deprecated. (Robert Collins)
- The method bzrlib.tests.sort_suite_by_re has been deprecated. It is replaced by the new helper methods added in this release. (Robert Collins)
DOCUMENTATION:
- More improvements and fixes to the User Guide. (Ian Clatworthy)
- Add information on cherrypicking/rebasing to the User Guide. (Ian Clatworthy)
- Improve bug tracker integration documentation. (Ian Clatworthy)
- Minor edits to Bazaar in five minutes from David Roberts and to the rebasing section of the User Guide from Aaron Bentley. (Ian Clatworthy)
CHANGES:
- If a traceback occurs, users are now asked to report the bug through Launchpad (https://bugs.launchpad.net/bzr/), rather than by mail to the mailing list. (Martin Pool)
BUGFIXES:
- Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)
- Give more feedback during long http downloads by making readv deliver data as it arrives for urllib, and issue more requests for pycurl. High latency networks are better handled by urllib, the pycurl implementation give more feedback but also incur more latency. (Vincent Ladeuil, #173010)
- Implement _make_parents_provider on RemoteRepository, allowing generating bundles against branches on a smart server. (Andrew Bennetts, #147836)
DOCUMENTATION:
- Improved user guide. (Ian Clatworthy)
- The single-page quick reference guide is now available as a PDF. (Ian Clatworthy)
INTERNALS:
- readv urllib http implementation is now a real iterator above the underlying socket and deliver data as soon as it arrives. 'get' still wraps its output in a StringIO. (Vincent Ladeuil)
IMPROVEMENTS:
- Added a --coverage option to selftest. (Andrew Bennetts)
- Annotate merge (merge-type=weave) now supports cherrypicking. (Aaron Bentley)
- bzr commit now doesn't print the revision number twice. (Matt Nordhoff, #172612)
- New configuration option bugtracker_<tracker_abbrevation>_url to define locations of bug trackers that are not directly supported by bzr or a plugin. The URL will be treated as a template and {id} placeholders will be replaced by specific bug IDs. (Lukáš Lalinský)
- Support logging single merge revisions with short and line log formatters. (Kent Gibson)
- User Guide enhanced with suggested readability improvements from Matt Revell and corrections from John Arbash Meinel. (Ian Clatworthy)
- Quick Start Guide renamed to Quick Start Card, moved down in the catalog, provided in pdf and png format and updated to refer to send instead of bundle. (Ian Clatworthy, #165080)
- switch can now be used on heavyweight checkouts as well as lightweight ones. After switching a heavyweight checkout, the local branch is a mirror/cache of the new bound branch and uncommitted changes in the working tree are merged. As a safety check, if there are local commits in a checkout which have not been committed to the previously bound branch, then switch fails unless the --force option is given. This option is now also required if the branch a lightweight checkout is pointing to has been moved. (Ian Clatworthy)
INTERNALS:
- New -Dhttp debug option reports http connections, requests and responses. (Vincent Ladeuil)
- New -Dmerge debug option, which emits merge plans for merge-type=weave.
BUGFIXES:
- Better error message when running bzr cat on a non-existant branch. (Lukáš Lalinský, #133782)
- Catch OSError 17 (file exists) in final phase of tree transform and show filename to user. (Alexander Belchenko, #111758)
- Catch ShortReadvErrors while using pycurl. Also make readv more robust by allowing multiple GET requests to be issued if too many ranges are required. (Vincent Ladeuil, #172701)
- Check for missing basis texts when fetching from packs to packs. (John Arbash Meinel, #165290)
- Fall back to showing e-mail in log --short/--line if the committer/author has only e-mail. (Lukáš Lalinský, #157026)
API BREAKS:
- Deprecate not passing a location argument to commit reporters' started methods. (Matt Nordhoff)
NOTES WHEN UPGRADING:
The default repository format is now pack-0.92. This default is used when creating new repositories with init and init-repo, and when branching over bzr+ssh or bzr+hpss. (See https://bugs.launchpad.net/bugs/164626)
This format can be read and written by Bazaar 0.92 and later, and data can be transferred to and from older formats.
To upgrade, please reconcile your repository (bzr reconcile), and then upgrade (bzr upgrade).
pack-0.92 offers substantially better scaling and performance than the previous knits format. Some operations are slower where the code already had bad scaling characteristics under knits, the pack format makes such operations more visible as part of being more scalable overall. We will correct such operations over the coming releases and encourage the filing of bugs on any operation which you observe to be slower in a packs repository. One particular case that we do not intend to fix is pulling data from a pack repository into a knit repository over a high latency link; downgrading such data requires reinsertion of the file texts, and this is a classic space/time tradeoff. The current implementation is conservative on memory usage because we need to support converting data from any tree without problems. (Robert Collins, Martin Pool, #164476)
CHANGES:
- Disable detection of plink.exe as possible ssh vendor. Plink vendor still available if user selects it explicitly with BZR_SSH environment variable. (Alexander Belchenko, workaround for bug #107593)
- The pack format is now accessible as "pack-0.92", or "pack-0.92-subtree" to enable the subtree functions (for example, for bzr-svn). See http://doc.bazaar-vcs.org/latest/developer/packrepo.html (Martin Pool)
FEATURES:
- New authentication.conf file holding the password or other credentials for remote servers. This can be used for ssh, sftp, smtp and other supported transports. (Vincent Ladeuil)
- New rich-root and rich-root-pack formats, recording the same data about tree roots that's recorded for all other directories. (Aaron Bentley, #164639)
- pack-0.92 repositories can now be reconciled. (Robert Collins, #154173)
- switch command added for changing the branch a lightweight checkout is associated with and updating the tree to reflect the latest content accordingly. This command was previously part of the BzrTools plug-in. (Ian Clatworthy, Aaron Bentley, David Allouche)
- reconfigure command can now convert branches, trees, or checkouts to lightweight checkouts. (Aaron Bentley)
PERFORMANCE:
- Commit updates the state of the working tree via a delta rather than supplying entirely new basis trees. For commit of a single specified file this reduces the wall clock time for commit by roughly a 30%. (Robert Collins, Martin Pool)
- Commit with many automatically found deleted paths no longer performs linear scanning for the children of those paths during inventory iteration. This should fix commit performance blowing out when many such paths occur during commit. (Robert Collins, #156491)
- Fetch with pack repositories will no longer read the entire history graph. (Robert Collins, #88319)
- Revert takes out an appropriate lock when reverting to a basis tree, and does not read the basis inventory twice. (Robert Collins)
- Diff does not require an inventory to be generated on dirstate trees. (Aaron Bentley, #149254)
- New annotate merge (--merge-type=weave) implementation is fast on versionedfiles withough cached annotations, e.g. pack-0.92. (Aaron Bentley)
IMPROVEMENTS:
- bzr merge now warns when it encounters a criss-cross merge. (Aaron Bentley)
- bzr send now doesn't require the target e-mail address to be specified on the command line if an interactive e-mail client is used. (Lukáš Lalinský)
- bzr tags now prints the revision number for each tag, instead of the revision id, unless --show-ids is passed. In addition, tags can be sorted chronologically instead of lexicographically with --sort=time. (Adeodato Simó, #120231)
- Windows standalone version of bzr is able to load system-wide plugins from "plugins" subdirectory in installation directory. In addition standalone installer write to the registry (HKLMSOFTWAREBazaar) useful info about paths and bzr version. (Alexander Belchenko, #129298)
DOCUMENTATION:
BUG FIXES:
- A progress bar has been added for knitpack -> knitpack fetching. (Robert Collins, #157789, #159147)
- Branching from a branch via smart server now preserves the repository format. (Andrew Bennetts, #164626)
- commit is now able to invoke an external editor in a non-ascii directory. (Daniel Watkins, #84043)
- Catch connection errors for ftp. (Vincent Ladeuil, #164567)
- check no longer reports spurious unreferenced text versions. (Robert Collins, John A Meinel, #162931, #165071)
- Conflicts are now resolved recursively by revert. (Aaron Bentley, #102739)
- Detect invalid transport reuse attempts by catching invalid URLs. (Vincent Ladeuil, #161819)
- Deleting a file without removing it shows a correct diff, not a traceback. (Aaron Bentley)
- Do no use timeout in HttpServer anymore. (Vincent Ladeuil, #158972).
- Don't catch the exceptions related to the http pipeline status before retrying an http request or some programming errors may be masked. (Vincent Ladeuil, #160012)
- Fix bzr rm to not delete modified and ignored files. (Lukáš Lalinský, #172598)
- Fix exception when revisionspec contains merge revisons but log formatter doesn't support merge revisions. (Kent Gibson, #148908)
- Fix exception when ScopeReplacer is assigned to before any members have been retrieved. (Aaron Bentley)
- Fix multiple connections during checkout --lightweight. (Vincent Ladeuil, #159150)
- Fix possible error in insert_data_stream when copying between pack repositories over bzr+ssh or bzr+http. KnitVersionedFile.get_data_stream now makes sure that requested compression parents are sent before any delta hunks that depend on them. (Martin Pool, #164637)
- Fix typo in limiting offsets coalescing for http, leading to whole files being downloaded instead of parts. (Vincent Ladeuil, #165061)
- FTP server errors don't error in the error handling code. (Robert Collins, #161240)
- Give a clearer message when a pull fails because the source needs to be reconciled. (Martin Pool, #164443)
- It is clearer when a plugin cannot be loaded because of its name, and a suggestion for an acceptable name is given. (Daniel Watkins, #103023)
- Leave port as None in transport objects if user doesn't specify a port in urls. (vincent Ladeuil, #150860)
- Make sure Repository.fetch(self) is properly a no-op for all Repository implementations. (John Arbash Meinel, #158333)
- Mark .bzr directories as "hidden" on Windows. (Alexander Belchenko, #71147)
- merge --uncommitted can now operate on a single file. (Aaron Bentley, Lukáš Lalinský, #136890)
- Obsolete packs are now cleaned up by pack and autopack operations. (Robert Collins, #153789)
- Operations pulling data from a smart server where the underlying repositories are not both annotated/both unannotated will now work. (Robert Collins, #165304).
- Reconcile now shows progress bars. (Robert Collins, #159351)
- RemoteBranch was not initializing self._revision_id_to_revno_map properly. (John Arbash Meinel, #162486)
- Removing an already-removed file reports the file does not exist. (Daniel Watkins, #152811)
- Rename on Windows is able to change filename case. (Alexander Belchenko, #77740)
- Return error instead of a traceback for bzr log -r0. (Kent Gibson, #133751)
- Return error instead of a traceback when bzr is unable to create symlink on some platforms (e.g. on Windows). (Alexander Belchenko, workaround for #81689)
- Revert doesn't crash when restoring a single file from a deleted directory. (Aaron Bentley)
- Stderr output via logging mechanism now goes through encoded wrapper and no more uses utf-8, but terminal encoding instead. So all unicode strings now should be readable in non-utf-8 terminal. (Alexander Belchenko, #54173)
- The error message when move --after should be used makes how to do so clearer. (Daniel Watkins, #85237)
- Unicode-safe output from bzr info. The output will be encoded using the terminal encoding and unrepresentable characters will be replaced by '?'. (Lukáš Lalinský, #151844)
- Working trees are no longer created when pushing into a local no-trees repo. (Daniel Watkins, #50582)
- Upgrade util/configobj to version 4.4.0. (Vincent Ladeuil, #151208).
- Wrap medusa ftp test server as an FTPServer feature. (Vincent Ladeuil, #157752)
API BREAKS:
- osutils.backup_file is deprecated. Actually it's not used in bzrlib during very long time. (Alexander Belchenko)
- The return value of VersionedFile.iter_lines_added_or_present_in_versions has been changed. Previously it was an iterator of lines, now it is an iterator of (line, version_id) tuples. This change has been made to aid reconcile and fetch operations. (Robert Collins)
- bzrlib.repository.get_versioned_file_checker is now private. (Robert Collins)
- The Repository format registry default has been removed; it was previously obsoleted by the bzrdir format default, which implies a default repository format. (Martin Pool)
INTERNALS:
- Added ContainerSerialiser and ContainerPushParser to bzrlib.pack. These classes provide more convenient APIs for generating and parsing containers from streams rather than from files. (Andrew Bennetts)
- New module lru_cache providing a cache for use by tasks that need semi-random access to large amounts of data. (John A Meinel)
- InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead.
TESTING:
CHANGES:
- New uninstaller on Win32. (Alexander Belchenko)
NOTES WHEN UPGRADING:
CHANGES:
- bzr now returns exit code 4 if an internal error occurred, and 3 if a normal error occurred. (Martin Pool)
- pull, merge and push will no longer silently correct some repository index errors that occured as a result of the Weave disk format. Instead the reconcile command needs to be run to correct those problems if they exist (and it has been able to fix most such problems since bzr 0.8). Some new problems have been identified during this release and you should run bzr check once on every repository to see if you need to reconcile. If you cannot pull or merge from a remote repository due to mismatched parent errors - a symptom of index errors - you should simply take a full copy of that remote repository to a clean directory outside any local repositories, then run reconcile on it, and finally pull from it locally. (And naturally email the repositories owner to ask them to upgrade and run reconcile). (Robert Collins)
FEATURES:
- New knitpack-experimental repository format. This is interoperable with the dirstate-tags format but uses a smarter storage design that greatly speeds up many operations, both local and remote. This new format can be used as an option to the init, init-repository and upgrade commands. See http://doc.bazaar-vcs.org/0.92/developers/knitpack.html for further details. (Robert Collins)
- For users of bzr-svn (and those testing the prototype subtree support) that wish to try packs, a new knitpack-subtree-experimental format has also been added. This is interoperable with the dirstate-subtrees format. (Robert Collins)
- New reconfigure command. (Aaron Bentley)
- New revert --forget-merges command, which removes the record of a pending merge without affecting the working tree contents. (Martin Pool)
- New bzr_remote_path configuration variable allows finer control of remote bzr locations than BZR_REMOTE_PATH environment variable. (Aaron Bentley)
- New launchpad-login command to tell Bazaar your Launchpad user ID. This can then be used by other functions of the Launchpad plugin. (James Henstridge)
PERFORMANCE:
- Commit in quiet mode is now slightly faster as the information to output is no longer calculated. (Ian Clatworthy)
- Commit no longer checks for new text keys during insertion when the revision id was deterministically unique. (Robert Collins)
- Committing a change which is not a merge and does not change the number of files in the tree is faster by utilising the data about whether files are changed to determine if the tree is unchanged rather than recalculating it at the end of the commit process. (Robert Collins)
- Inventory serialisation no longer double-sha's the content. (Robert Collins)
- Knit text reconstruction now avoids making copies of the lines list for interim texts when building a single text. The new apply_delta method on KnitContent aids this by allowing modification of the revision id such objects represent. (Robert Collins)
- Pack indices are now partially parsed for specific key lookup using a bisection approach. (Robert Collins)
- Partial commits are now approximately 40% faster by walking over the unselected current tree more efficiently. (Robert Collins)
- XML inventory serialisation takes 20% less time while being stricter about the contents. (Robert Collins)
- Graph heads() queries have been fixed to no longer access all history unnecessarily. (Robert Collins)
IMPROVEMENTS:
- bzr+https:// smart server across https now supported. (John Ferlito, Martin Pool, #128456)
- Mutt is now a supported mail client; set mail_client=mutt in your bazaar.conf and send will use mutt. (Keir Mierle)
- New option -c/--change for merge command for cherrypicking changes from one revision. (Alexander Belchenko, #141368)
- Show encodings, locale and list of plugins in the traceback message. (Martin Pool, #63894)
- Experimental directory formats can now be marked with experimental = True during registration. (Ian Clatworthy)
DOCUMENTATION:
- New Bazaar in Five Minutes guide. (Matthew Revell)
- The hooks reference documentation is now converted to html as expected. (Ian Clatworthy)
BUG FIXES:
- Connection error reporting for the smart server has been fixed to display a user friendly message instead of a traceback. (Ian Clatworthy, #115601)
- Make sure to use O_BINARY when opening files to check their sha1sum. (Alexander Belchenko, John Arbash Meinel, #153493)
- Fix a problem with Win32 handling of the executable bit. (John Arbash Meinel, #149113)
- bzr+ssh:// and sftp:// URLs that do not specify ports explicitly no longer assume that means port 22. This allows people using OpenSSH to override the default port in their ~/.ssh/config if they wish. This fixes a bug introduced in bzr 0.91. (Andrew Bennetts, #146715)
- Commands reporting exceptions can now be profiled and still have their data correctly dumped to a file. For example, a bzr commit with no changes still reports the operation as pointless but doing so no longer throws away the profiling data if this command is run with --lsprof-file callgrind.out.ci say. (Ian Clatworthy)
- Fallback to ftp when paramiko is not installed and sftp can't be used for tests/commands so that the test suite is still usable without paramiko. (Vincent Ladeuil, #59150)
- Fix commit ordering in corner case. (Aaron Bentley, #94975)
- Fix long standing bug in partial commit when there are renames left in tree. (Robert Collins, #140419)
- Fix selftest semi-random noise during http related tests. (Vincent Ladeuil, #140614)
- Fix typo in ftp.py making the reconnection fail on temporary errors. (Vincent Ladeuil, #154259)
- Fix failing test by comparing real paths to cover the case where the TMPDIR contains a symbolic link. (Vincent Ladeuil, #141382).
- Fix log against smart server branches that don't support tags. (James Westby, #140615)
- Fix pycurl http implementation by defining error codes from pycurl instead of relying on an old curl definition. (Vincent Ladeuil, #147530)
- Fix 'unprintable error' message when displaying BzrCheckError and some other exceptions on Python 2.5. (Martin Pool, #144633)
- Fix Inventory.copy() and add test for it. (Jelmer Vernooij)
- Handles default value for ListOption in cmd_commit. (Vincent Ladeuil, #140432)
- HttpServer and FtpServer need to be closed properly or a listening socket will remain opened. (Vincent Ladeuil, #140055)
- Monitor the .bzr directory created in the top level test directory to detect leaking tests. (Vincent Ladeuil, #147986)
- The basename, not the full path, is now used when checking whether the profiling dump file begins with callgrind.out or not. This fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
- Trivial fix for invoking command reconfigure without arguments. (Rob Weir, #141629)
- WorkingTree.rename_one will now raise an error if normalisation of the new path causes bzr to be unable to access the file. (Robert Collins)
- Correctly detect a NoSuchFile when using a filezilla server. (Gary van der Merwe)
API BREAKS:
- bzrlib.index.GraphIndex now requires a size parameter to the constructor, for enabling bisection searches. (Robert Collins)
- CommitBuilder.record_entry_contents now requires the root entry of a tree be supplied to it, previously failing to do so would trigger a deprecation warning. (Robert Collins)
- KnitVersionedFile.add* will no longer cache added records even when enable_cache() has been called - the caching feature is now exclusively for reading existing data. (Robert Collins)
- ReadOnlyLockError is deprecated; LockFailed is usually more appropriate. (Martin Pool)
- Removed bzrlib.transport.TransportLogger - please see the new trace+ transport instead. (Robert Collins)
- Removed previously deprecated varargs interface to TestCase.run_bzr and deprecated methods TestCase.capture and TestCase.run_bzr_captured. (Martin Pool)
- Removed previous deprecated basis_knit parameter to the KnitVersionedFile constructor. (Robert Collins)
- Special purpose method TestCase.run_bzr_decode is moved to the test_non_ascii class that needs it. (Martin Pool)
- The class bzrlib.repofmt.knitrepo.KnitRepository3 has been folded into KnitRepository by parameters to the constructor. (Robert Collins)
- The VersionedFile interface now allows content checks to be bypassed by supplying check_content=False. This saves nearly 30% of the minimum cost to store a version of a file. (Robert Collins)
- Tree's with bad state such as files with no length or sha will no longer be silently accepted by the repository XML serialiser. To serialise inventories without such data, pass working=True to write_inventory. (Robert Collins)
- VersionedFile.fix_parents has been removed as a harmful API. VersionedFile.join will no longer accept different parents on either side of a join - it will either ignore them, or error, depending on the implementation. See notes when upgrading for more information. (Robert Collins)
INTERNALS:
- bzrlib.transport.Transport.put_file now returns the number of bytes put by the method call, to allow avoiding stat-after-write or housekeeping in callers. (Robert Collins)
- bzrlib.xml_serializer.Serializer is now responsible for checking that mandatory attributes are present on serialisation and deserialisation. This fixes some holes in API usage and allows better separation between physical storage and object serialisation. (Robert Collins)
- New class bzrlib.errors.InternalBzrError which is just a convenient shorthand for deriving from BzrError and setting internal_error = True. (Robert Collins)
- New method bzrlib.mutabletree.update_to_one_parent_via_delta for moving the state of a parent tree to a new version via a delta rather than a complete replacement tree. (Robert Collins)
- New method bzrlib.osutils.minimum_path_selection useful for removing duplication from user input, when a user mentions both a path and an item contained within that path. (Robert Collins)
- New method bzrlib.repository.Repository.is_write_locked useful for determining if a repository is write locked. (Robert Collins)
- New method on bzrlib.tree.Tree path_content_summary provides a tuple containing the key information about a path for commit processing to complete. (Robert Collins)
- New method on xml serialisers, write_inventory_to_lines, which matches the API used by knits for adding content. (Robert Collins)
- New module bzrlib.bisect_multi with generic multiple-bisection-at-once logic, currently only available for byte-based lookup (bisect_multi_bytes). (Robert Collins)
- New helper bzrlib.tuned_gzip.bytes_to_gzip which takes a byte string and returns a gzipped version of the same. This is used to avoid a bunch of api friction during adding of knit hunks. (Robert Collins)
- New parameter on bzrlib.transport.Transport.readv adjust_for_latency which changes readv from returning strictly the requested data to inserted return larger ranges and in forward read order to reduce the effect of network latency. (Robert Collins)
- New parameter yield_parents on Inventory.iter_entries_by_dir which causes the parents of a selected id to be returned recursively, so all the paths from the root down to each element of selected_file_ids are returned. (Robert Collins)
- Knit joining has been enhanced to support plain to annotated conversion and annotated to plain conversion. (Ian Clatworthy)
- The CommitBuilder method record_entry_contents now returns summary information about the effect of the commit on the repository. This tuple contains an inventory delta item if the entry changed from the basis, and a boolean indicating whether a new file graph node was recorded. (Robert Collins)
- The python path used in the Makefile can now be overridden. (Andrew Bennetts, Ian Clatworthy)
TESTING:
- New transport implementation trace+ which is useful for testing, logging activity taken to its _activity attribute. (Robert Collins)
- When running bzr commands within the test suite, internal exceptions are not caught and reported in the usual way, but rather allowed to propagate up and be visible to the test suite. A new API run_bzr_catch_user_errors makes this behavior available to other users. (Martin Pool)
- New method TestCase.call_catch_warnings for testing methods that raises a Python warning. (Martin Pool)
BUG FIXES:
- Print a warning instead of aborting the python setup.py install process if building of a C extension is not possible. (Lukáš Lalinský, Alexander Belchenko)
- Fix commit ordering in corner case (Aaron Bentley, #94975)
- Fix ''bzr info bzr://host/'' and other operations on ''bzr://' URLs with an implicit port. We were incorrectly raising PathNotChild due to inconsistent treatment of the ''_port'' attribute on the Transport object. (Andrew Bennetts, #133965)
- Make RemoteRepository.sprout cope gracefully with servers that don't support the Repository.tarball request. (Andrew Bennetts)
- Replaced incorrect tarball for previous release; a debug statement was left in bzrlib/remote.py.
CHANGES:
- The default branch and repository format has changed to dirstate-tags, so tag commands are active by default. This format is compatible with Bazaar 0.15 and later. This incidentally fixes bug #126141. (Martin Pool)
- --quiet or -q is no longer a global option. If present, it must now appear after the command name. Scripts doing things like bzr -q missing need to be rewritten as bzr missing -q. (Ian Clatworthy)
FEATURES:
New option --author in bzr commit to specify the author of the change, if it's different from the committer. bzr log and bzr annotate display the author instead of the committer. (Lukáš Lalinský)
In addition to global options and command specific options, a set of standard options are now supported. Standard options are legal for all commands. The initial set of standard options are:
- --help or -h - display help message
- --verbose or -v - display additional information
- --quiet or -q - only output warnings and errors.
Unlike global options, standard options can be used in aliases and may have command-specific help. (Ian Clatworthy)
Verbosity level processing has now been unified. If --verbose or -v is specified on the command line multiple times, the verbosity level is made positive the first time then increased. If --quiet or -q is specified on the command line multiple times, the verbosity level is made negative the first time then decreased. To get the default verbosity level of zero, either specify none of the above , --no-verbose or --no-quiet. Note that most commands currently ignore the magnitude of the verbosity level but do respect quiet vs normal vs verbose when generating output. (Ian Clatworthy)
Branch.hooks now supports pre_commit hook. The hook's signature is documented in BranchHooks constructor. (Nam T. Nguyen, #102747)
New Repository.stream_knit_data_for_revisions request added to the network protocol for greatly reduced roundtrips when retrieving a set of revisions. (Andrew Bennetts)
BUG FIXES:
- bzr plugins now lists the version number for each plugin in square brackets after the path. (Robert Collins, #125421)
- Pushing, pulling and branching branches with subtree references was not copying the subtree weave, preventing the file graph from being accessed and causing errors in commits in clones. (Robert Collins)
- Suppress warning "integer argument expected, got float" from Paramiko, which sometimes caused false test failures. (Martin Pool)
- Fix bug in bundle 4 that could cause attempts to write data to wrong versionedfile. (Aaron Bentley)
- Diffs generated using "diff -p" no longer break the patch parser. (Aaron Bentley)
- get_transport treats an empty possible_transports list the same as a non- empty one. (Aaron Bentley)
- patch verification for merge directives is reactivated, and works with CRLF and CR files. (Aaron Bentley)
- Accept ..as a path in revision specifiers. This fixes for example "-r branch:..other-branch" on Windows. (Lukáš Lalinský)
- BZR_PLUGIN_PATH may now contain trailing slashes. (Blake Winton, #129299)
- man page no longer lists hidden options (#131667, Aaron Bentley)
- uncommit --help now explains the -r option adequately. (Daniel Watkins, #106726)
- Error messages are now better formatted with parameters (such as filenames) quoted when necessary. This avoids confusion when directory names ending in a '.' at the end of messages were confused with a full stop that may or not have been there. (Daniel Watkins, #129791)
- Fix status FILE -r X..Y. (Lukáš Lalinský)
- If a particular command is an alias, help will show the alias instead of claiming there is no help for said alias. (Daniel Watkins, #133548)
- TreeTransform-based operations, like pull, merge, revert, and branch, now roll back if they encounter an error. (Aaron Bentley, #67699)
- bzr commit now exits cleanly if a character unsupported by the current encoding is used in the commit message. (Daniel Watkins, #116143)
- bzr send uses default values for ranges when only half of an elipsis is specified ("-r..5" or "-r5.."). (#61685, Aaron Bentley)
- Avoid trouble when Windows ssh calls itself 'plink' but no plink binary is present. (Martin Albisetti, #107155)
- bzr remove should remove clean subtrees. Now it will remove (without needing --force) subtrees that contain no files with text changes or modified files. With --force it removes the subtree regardless of text changes or unknown files. Directories with renames in or out (but not changed otherwise) will now be removed without needing --force. Unknown ignored files will be deleted without needing --force. (Marius Kruger, #111665)
- When two plugins conflict, the source of both the losing and now the winning definition is shown. (Konstantin Mikhaylov, #5454)
- When committing to a branch, the location being committed to is displayed. (Daniel Watkins, #52479)
- bzr --version takes care about encoding of stdout, especially when output is redirected. (Alexander Belchenko, #131100)
- Prompt for an ftp password if none is provided. (Vincent Ladeuil, #137044)
- Reuse bound branch associated transport to avoid multiple connections. (Vincent Ladeuil, #128076, #131396)
- Overwrite conflicting tags by push and pull if the --overwrite option is specified. (Lukáš Lalinský, #93947)
- In checkouts, tags are copied into the master branch when created, changed or deleted, and are copied into the checkout when it is updated. (Martin Pool, #93856, #93860)
- Print a warning instead of aborting the python setup.py install process if building of a C extension is not possible. (Lukáš Lalinský, Alexander Belchenko)
IMPROVEMENTS:
- Add the option "--show-diff" to the commit command in order to display the diff during the commit log creation. (Goffredo Baroncelli)
- pull and merge are much faster at installing bundle format 4. (Aaron Bentley)
- pull -v no longer includes deltas, making it much faster. (Aaron Bentley)
- send now sends the directive as an attachment by default. (Aaron Bentley, Lukáš Lalinský, Alexander Belchenko)
- Documentation updates (Martin Albisetti)
- Help on debug flags is now included in help global-options. (Daniel Watkins, #124853)
- Parameters passed on the command line are checked to ensure they are supported by the encoding in use. (Daniel Watkins)
- The compression used within the bzr repository has changed from zlib level 9 to the zlib default level. This improves commit performance with only a small increase in space used (and in some cases a reduction in space). (Robert Collins)
- Initial commit no longer SHAs files twice and now reuses the path rather than looking it up again, making it faster. (Ian Clatworthy)
- New option -c/--change for diff and status to show changes in one revision. (Lukáš Lalinský)
- If versioned files match a given ignore pattern, a warning is now given. (Daniel Watkins, #48623)
- bzr status now has -S as a short name for --short and -V as a short name for --versioned. These have been added to assist users migrating from Subversion: bzr status -SV is now like svn status -q. (Daniel Watkins, #115990)
- Added C implementation of PatienceSequenceMatcher, which is about 10x faster than the Python version. This speeds up commands that need file diffing, such as bzr commit or bzr diff. (Lukáš Lalinský)
- HACKING has been extended with a large section on core developer tasks. (Ian Clatworthy)
- Add branches and standalone-trees as online help topics and include them as Concepts within the User Reference. (Paul Moore, Ian Clatworthy)
- check can detect versionedfile parent references that are inconsistent with revision and inventory info, and reconcile can fix them. These faulty references were generated by 0.8-era releases, so repositories which were manipulated by old bzrs should be checked, and possibly reconciled ASAP. (Aaron Bentley, Andrew Bennetts)
API BREAKS:
- Branch.append_revision is removed altogether; please use Branch.set_last_revision_info instead. (Martin Pool)
- CommitBuilder now advertises itself as requiring the root entry to be supplied. This only affects foreign repository implementations which reuse CommitBuilder directly and have changed record_entry_contents to require that the root not be supplied. This should be precisely zero plugins affected. (Robert Collins)
- The add_lines methods on VersionedFile implementations has changed its return value to include the sha1 and length of the inserted text. This allows the avoidance of double-sha1 calculations during commit. (Robert Collins)
- Transport.should_cache has been removed. It was not called in the previous release. (Martin Pool)
TESTING:
- Tests may now raise TestNotApplicable to indicate they shouldn't be run in a particular scenario. (Martin Pool)
- New function multiply_tests_from_modules to give a simpler interface to test parameterization. (Martin Pool, Robert Collins)
- Transport.should_cache has been removed. It was not called in the previous release. (Martin Pool)
- NULL_REVISION is returned to indicate the null revision, not None. (Aaron Bentley)
- Use UTF-8 encoded StringIO for log tests to avoid failures on non-ASCII committer names. (Lukáš Lalinský)
INTERNALS:
- bzrlib.plugin.all_plugins has been deprecated in favour of bzrlib.plugin.plugins() which returns PlugIn objects that provide useful functionality for determining the path of a plugin, its tests, and its version information. (Robert Collins)
- Add the option user_encoding to the function 'show_diff_trees()' in order to move the user encoding at the UI level. (Goffredo Baroncelli)
- Add the function make_commit_message_template_encoded() and the function edit_commit_message_encoded() which handle encoded strings. This is done in order to mix the commit messages (which is a unicode string), and the diff which is a raw string. (Goffredo Baroncelli)
- CommitBuilder now defaults to using add_lines_with_ghosts, reducing overhead on non-weave repositories which don't require all parents to be present. (Robert Collins)
- Deprecated method find_previous_heads on bzrlib.inventory.InventoryEntry. This has been superseded by the use of parent_candidates and a separate heads check via the repository API. (Robert Collins)
- New trace function mutter_callsite will print out a subset of the stack to the log, which can be useful for gathering debug details. (Robert Collins)
- bzrlib.pack.ContainerWriter now tracks how many records have been added via a public attribute records_written. (Robert Collins)
- New method bzrlib.transport.Transport.get_recommended_page_size. This provides a hint to users of transports as to the reasonable minimum data to read. In principle this can take latency and bandwidth into account on a per-connection basis, but for now it just has hard coded values based on the url. (e.g. http:// has a large page size, file:// has a small one.) (Robert Collins)
- New method on bzrlib.transport.Transport open_write_stream allows incremental addition of data to a file without requiring that all the data be buffered in memory. (Robert Collins)
- New methods on bzrlib.knit.KnitVersionedFile: get_data_stream(versions), insert_data_stream(stream) and get_format_signature(). These provide some infrastructure for efficiently streaming the knit data for a set of versions over the smart protocol.
- Knits with no annotation cache still produce correct annotations. (Aaron Bentley)
- Three new methods have been added to bzrlib.trace: set_verbosity_level, get_verbosity_level and is_verbose. set_verbosity_level expects a numeric value: negative for quiet, zero for normal, positive for verbose. The size of the number can be used to determine just how quiet or verbose the application should be. The existing be_quiet and is_quiet routines have been integrated into this new scheme. (Ian Clatworthy)
- Options can now be delcared with a custom_callback parameter. If set, this routine is called after the option is processed. This feature is now used by the standard options verbose and quiet so that setting one implicitly resets the other. (Ian Clatworthy)
- Rather than declaring a new option from scratch in order to provide custom help, a centrally registered option can be decorated using the new bzrlib.Option.custom_help routine. In particular, this routine is useful when declaring better help for the verbose and quiet standard options as the base definition of these is now more complex than before thanks to their use of a custom callback. (Ian Clatworthy)
- Tree._iter_changes(specific_file=[]) now iterates through no files, instead of iterating through all files. None is used to iterate through all files. (Aaron Bentley)
- WorkingTree.revert() now accepts None to revert all files. The use of [] to revert all files is deprecated. (Aaron Bentley)
IMPROVEMENTS:
- Documentation is now organized into multiple directories with a level added for different languages or locales. Added the Mini Tutorial and Quick Start Summary (en) documents from the Wiki, improving the content and readability of the former. Formatted NEWS as Release Notes complete with a Table of Conents, one heading per release. Moved the Developer Guide into the main document catalog and provided a link from the developer document catalog back to the main one. (Ian Clatworthy, Sabin Iacob, Alexander Belchenko)
API CHANGES:
- The static convenience method BzrDir.create_repository is deprecated. Callers should instead create a BzrDir instance and call create_repository on that. (Martin Pool)
BUGFIXES:
- bzr init should connect to the remote location one time only. We have been connecting several