FEATURES:
IMPROVEMENTS:
- Implemented a custom walkdirs_utf8 implementation for win32. This uses a pyrex extension to get direct access to the FindFirstFileW style apis, rather than using listdir + lstat. Shows a very strong improvement in commands like status and diff which have to iterate the working tree. Anywhere from 2x-6x faster depending on the size of the tree (bigger trees, bigger benefit.) (John Arbash Meinel)
BUG FIXES:
- Fix a test case that was failing if encoding wasn't UTF-8. (John Arbash Meinel, #247585)
- Fix "no buffer space available" error when branching with the new smart server protocol to or from Windows. (Andrew Bennetts, #246180)
DOCUMENTATION:
TESTING:
API CHANGES:
INTERNALS:
- RuleSearchers return () instead of [] now when there are no matches. (Ian Clatworthy)
FEATURES:
- New pre_change_branch_tip hook that is called before the branch tip is moved, while the branch is write-locked. See the User Reference for signature details. (Andrew Bennetts)
- Rule-based preferences can now be defined for selected files in selected branches, allowing commands and plugins to provide custom behaviour for files matching defined patterns. See Rule-based preferences (part of Configuring Bazaar) in the User Guide and bzr help rules for more information. (Ian Clatworthy)
- Sites may suggest a branch to stack new branches on. (Aaron Bentley)
- Stacked branches are now supported. See bzr help branch and bzr help push. (Robert Collins)
IMPROVEMENTS:
- bzr export --format=tgz --root=NAME - to export a gzipped tarball to stdout; also tar and tbz2. (Martin Pool)
- bzr (re)merge --weave will now use a standard Weave algorithm, rather than the annotation-based merge it was using. It does so by building up a Weave of the important texts, without needing to build the full ancestry. (John Arbash Meinel, #238895)
- bzr send documents and better supports emacsclient (proper escaping of mail headers and handling of the MUA Mew). (Christophe Troestler)
- Remembered locations can be specified by aliases, e.g. :parent, :public, :submit. (Aaron Bentley)
- The smart protocol now has improved support for setting branches' revision info directly. This makes operations like push faster. The new request method name is Branch.set_last_revision_ex. (Andrew Bennetts)
- New registry for log properties handles and the method in LongLogFormatter to display the custom properties returned by the registered handlers. (Guillermo Gonzalez, #162469)
BUG FIXES:
- Bazaar is now able to be a client to the web server of IIS 6 and 7. The broken implementations of RFC822 in Python and RFC2046 in IIS combined with boundary-line checking in Bazaar previously made this impossible. (NB, IIS 5 does not suffer from this problem). (Adrian Wilkins, #247585)
- bzr log --long with a ghost in your mainline now handles that ghost properly. (John Arbash Meinel, #243536)
- check handles the split-up .bzr layout correctly, so no longer requires a branch to be present. (Daniel Watkins, #64783)
- bzr serve --directory=/ now correctly allows the whole filesystem to be accessed on Windows, not just the root of the drive that Python is running from. (Adrian Wilkins, #240910)
- Clearer message about how to set the PYTHONPATH if bzrlib can't be loaded. (Martin Pool, #205230)
- Errors about missing libraries are now shown without a traceback, and with a suggestion to install the library. The full traceback is still in .bzr.log and can be shown with -Derror. (Martin Pool, #240161)
- Fixed problem in branching from smart server. (#249256, Michael Hudson, Martin Pool)
- Fetch from a stacked branch copies all required data. (Aaron Bentley, #248506)
- Handle urls such as ftp://user@host.com@www.host.com where the user name contains an @. (Neil Martinsen-Burrell, #228058)
- needs_read_lock and needs_write_lock now suppress an error during unlock if there was an error in the original function. This helps most when there is a failure with a smart server action, since often the connection closes and we cannot unlock. (Andrew Bennetts, John Arbash Meinel, #125784)
- Obsolete hidden command bzr fetch removed. (Martin Pool, #172870)
- Raise the correct exception when doing -rbefore:0 or -c0. (John Arbash Meinel, #239933)
- You can now compare file revisions in Windows diff programs from Cygwin Bazaar. (Matt McClure, #209281)
- revision_history now tolerates mainline ghosts for Branch format 6. (Aaron Bentley, #235055)
- Set locale from environment for third party libs. (Martin von Gagern, #128496)
- Handle a file turning in to a directory in TreeTransform. (James Westby, #248448)
DOCUMENTATION:
- Added Using stacked branches to the User Guide. (Ian Clatworthy)
- Updated developer documentation. (Martin Pool)
TESTING:
- -Dmemory will cause /proc/PID/status to be catted before bzr exits, allowing low-key analysis of peak memory use. (Robert Collins)
- TestCaseWithTransport.make_branch_and_tree tries harder to return a tree with a branch attribute of the right format. This was preventing some RemoteBranch tests from actually running with RemoteBranch instances. (Andrew Bennetts)
API CHANGES:
- Removed Repository.text_store, control_store, etc. Instead, there are new attributes texts, inventories, revisions, signatures, each of which is a VersionedFiles. See the Repository docstring for more details. (Robert Collins)
- Branch.pull now accepts an _override_hook_target optional parameter. If you have a subclass of Branch that overrides pull then you should add this parameter. (Andrew Bennetts)
- bzrlib.check.check() has been deprecated in favour of the more aptly-named bzrlib.check.check_branch(). (Daniel Watkins)
- Tree.print_file and Repository.print_file are deprecated. These methods are bad APIs because they write directly to sys.stdout. bzrlib does not use them internally, and there are no direct tests for them. (Alexander Belchenko)
INTERNALS:
- cat command no longer uses Tree.print_file() internally. (Alexander Belchenko)
- New class method BzrDir.open_containing_tree_branch_or_repository which eases the discovery of the tree, the branch and the repository containing a given location. (Daniel Watkins)
- New versionedfile.KeyMapper interface to abstract out the access to underlying .knit/.kndx etc files in repositories with partitioned storage. (Robert Collins)
- Obsolete developer-use command weave-join has been removed. (Robert Collins)
- RemoteToOtherFetcher and get_data_stream_for_search removed, to support new VersionedFiles layering. (Robert Collins)
This release contains further progress towards our 1.6 goals of shallow repositories, and contains a fix for some user-affecting bugs in the repository layer. Building working trees during checkout and branch is now faster.
BUG FIXES:
- Avoid KnitCorrupt error extracting inventories from some repositories. (The data is not corrupt; an internal check is detecting a problem reading from the repository.) (Martin Pool, Andrew Bennetts, Robert Collins, #234748)
- bzr status was breaking if you merged the same revision twice. (John Arbash Meinel, #235407)
- Fix infinite loop consuming 100% CPU when a connection is lost while reading a response body via the smart protocol v1 or v2. (Andrew Bennetts)
- Inserting a bundle which changes the contents of a file with no trailing end of line, causing a knit snapshot in a 'knits' repository will no longer cause KnitCorrupt. (Robert Collins)
- RemoteBranch.pull needs to return the self._real_branch's pull result. It was instead just returning None, which breaks bzr pull. (John Arbash Meinel, #238149)
- Sanitize branch nick before using it as an attachment filename in bzr send. (Lukáš Lalinský, #210218)
- Squash inv_entry.symlink_target to a plain string when generating DirState details. This prevents from getting a UnicodeError when you have symlinks and non-ascii filenames. (John Arbash Meinel, #135320)
IMPROVEMENTS:
- Added the 'alias' command to set/unset and display aliases. (Tim Penhey)
- added, modified, and unknowns behaviour made consistent (all three now quote paths where required). Added --null option to added and modified (for null-separated unknowns, use ls --unknown --null) (Adrian Wilkins)
- Faster branching (1.09x) and lightweight checkouts (1.06x) on large trees. (Ian Clatworthy, Aaron Bentley)
DOCUMENTATION:
- Added Bazaar Zen section to the User Guide. (Ian Clatworthy)
TESTING:
- Fix the test HTTPServer to be isolated from chdir calls made while it is running, allowing it to be used in blackbox tests. (Robert Collins)
API CHANGES:
- WorkingTree.set_parent_(ids/trees) will now filter out revisions which are in the ancestry of other revisions. So if you merge the same tree twice, or merge an ancestor of an existing merge, it will only record the newest. (If you merge a descendent, it will replace its ancestor). (John Arbash Meinel, #235407)
- RepositoryPolicy.__init__ now requires stack_on and stack_on_pwd, through the derived classes do not. (Aaron Bentley)
INTERNALS:
- bzrlib.bzrdir.BzrDir.sprout now accepts stacked to control creating stacked branches. (Robert Collins)
- Knit record serialisation is now stricter on what it will accept, to guard against potential internal bugs, or broken input. (Robert Collins)
Commands that work on the revision history such as push, pull, missing, uncommit and log are now substantially faster. This release adds a translation of some of the user documentation into Spanish. (Contributions of other translations would be very welcome.) Bazaar 1.6beta1 adds a new network protocol which is used by default and which allows for more efficient transfers and future extensions.
NOTES WHEN UPGRADING:
- There is a new version of the network protocol used for bzr://, bzr+ssh:// and bzr+http:// connections. This will allow more efficient requests and responses, and more graceful fallback when a server is too old to recognise a request from a more recent client. Bazaar 1.6 will interoperate with 0.16 and later versions, but servers should be upgraded when possible. Bazaar 1.6 no longer interoperates with 0.15 and earlier via these protocols. Use alternatives like SFTP or upgrade those servers. (Andrew Bennetts, #83935)
CHANGES:
- Deprecation warnings will not be suppressed when running bzr selftest so that developers can see if their code is using deprecated functions. (John Arbash Meinel)
FEATURES:
- Adding -Derror will now display a traceback when a plugin fails to load. (James Westby)
IMPROVEMENTS:
- bzr branch/push/pull -r XXX now have a helper function for finding the revno of the new revision (Graph.find_distance_to_null). This should make something like bzr branch -r -100 in a shared, no-trees repository much snappier. (John Arbash Meinel)
- bzr log --short -r X..Y no longer needs to access the full revision history. This makes it noticeably faster when logging the last few revisions. (John Arbash Meinel)
- bzr ls now accepts -V as an alias for --versioned. (Jerad Cramp, #165086)
- bzr missing uses the new Graph.find_unique_ancestors and Graph.find_differences to determine missing revisions without having to search the whole ancestry. (John Arbash Meinel, #174625)
- bzr uncommit now uses partial history access, rather than always extracting the full revision history for a branch. This makes it resolve the appropriate revisions much faster (in testing it drops uncommit from 1.5s => 0.4s). It also means bzr log --short is one step closer to not using full revision history. (John Arbash Meinel, #172649)
BUGFIXES:
- bzr merge --lca should handle when two revisions have no common ancestor other than NULL_REVISION. (John Arbash Meinel, #235715)
- bzr status was breaking if you merged the same revision twice. (John Arbash Meinel, #235407)
- bzr push with both --overwrite and -r NNN options no longer fails. (Andrew Bennetts, #234229)
- Correctly track the base URL of a smart medium when using bzr+http:// URLs, which was causing spurious "No repository present" errors with branches in shared repositories accessed over bzr+http. (Andrew Bennetts, #230550)
- Define _remote_is_at_least_1_2 on SmartClientMedium so that all implementations have the attribute. Fixes 'PyCurlTransport' object has no attribute '_remote_is_at_least_1_2' attribute errors. (Andrew Bennetts, #220806)
- Failure to delete an obsolete pack file should just give a warning message, not a fatal error. It may for example fail if the file is still in use by another process. (Martin Pool)
- Fix MemoryError during large fetches over HTTP by limiting the amount of data we try to read per recv call. The problem was observed with Windows and a proxy, but might affect other environments as well. (Eric Holmberg, #215426)
- Handle old merge directives correctly in Merger.from_mergeable. Stricter get_parent_map requirements exposed a latent bug here. (Aaron Bentley)
- Issue a warning and ignore passwords declared in authentication.conf when used for an ssh scheme (sftp or bzr+ssh). (Vincent Ladeuil, #203186)
- Make both http implementations raise appropriate exceptions on 403 Forbidden when POSTing smart requests. (Vincent Ladeuil, #230223)
- Properly title header names in http requests instead of capitalizing them. (Vincent Ladeuil, #229076)
- The "Unable to obtain lock" error message now also suggests using bzr break-lock to fix it. (Martin Albisetti, #139202)
- Treat an encoding of '' as ascii; this can happen when bzr is run under vim on Mac OS X. (Neil Martinsen-Burrell)
- VersionedFile.make_mpdiffs() was raising an exception that wasn't in scope. (Daniel Fischer #235687)
DOCUMENTATION:
- Added directory structure and started translation of docs in spanish. (Martin Albisetti, Lucio Albenga)
- Incorporate feedback from Jelmer Vernooij and Neil Martinsen-Burrell on the plugin and integration chapters of the User Guide. (Ian Clatworthy)
- More Bazaar developer documentation about packaging and release process, and about use of Python reprs. (Martin Pool, Martin Albisetti)
- Updated Tortise strategy document. (Mark Hammond)
TESTING:
- bzrlib.tests.adapt_tests was broken and unused - it has been fixed. (Robert Collins)
- Fix the test HTTPServer to be isolated from chdir calls made while it is running, allowing it to be used in blackbox tests. (Robert Collins)
- New helper function for splitting test suites split_suite_by_condition. (Robert Collins)
INTERNALS:
- Branch.missing_revisions has been deprecated. Similar functionality can be obtained using bzrlib.missing.find_unmerged. The api was fairly broken, and the function was unused, so we are getting rid of it. (John Arbash Meinel)
API CHANGES:
- Branch.abspath is deprecated; use the Tree or Transport instead. (Martin Pool)
- Branch.update_revisions now takes an optional Graph object. This can be used by update_revisions when it is checking ancestry, and allows callers to prefer request to go to a local branch. (John Arbash Meinel)
- Branch, Repository, Tree and BzrDir should expose a Transport as an attribute if they have one, rather than having it indirectly accessible as .control_files._transport. This doesn't add a requirement to support a Transport in cases where it was not needed before; it just simplifies the way it is reached. (Martin Pool)
- bzr missing --mine-only will return status code 0 if you have no new revisions, but the remote does. Similarly for --theirs-only. The new code only checks one side, so it doesn't know if the other side has changes. This seems more accurate with the request anyway. It also changes the output to print '[This|Other] branch is up to date.' rather than displaying nothing. (John Arbash Meinel)
- LockableFiles.put_utf8, put_bytes and controlfilename are now deprecated in favor of using Transport operations. (Martin Pool)
- Many methods on VersionedFile, Repository and in bzrlib.revision deprecated before bzrlib 1.5 have been removed. (Robert Collins)
- RevisionSpec.wants_revision_history can be set to False for a given RevisionSpec. This will disable the existing behavior of passing in the full revision history to self._match_on. Useful for specs that don't actually need access to the full history. (John Arbash Meinel)
- The constructors of SmartClientMedium and its subclasses now require a base parameter. SmartClientMedium implementations now also need to provide a remote_path_from_transport method. (Andrew Bennetts)
- The default permissions for creating new files and directories should now be obtained from BzrDir._get_file_mode() and _get_dir_mode(), rather than from LockableFiles. The _set_file_mode and _set_dir_mode variables on LockableFiles which were advertised as a way for plugins to control this are no longer consulted. (Martin Pool)
- VersionedFile.join is deprecated. This method required local instances of both versioned file objects and was thus hostile to being used for streaming from a smart server. The new get_record_stream and insert_record_stream are meant to efficiently replace this method. (Robert Collins)
- WorkingTree.set_parent_(ids/trees) will now filter out revisions which are in the ancestry of other revisions. So if you merge the same tree twice, or merge an ancestor of an existing merge, it will only record the newest. (If you merge a descendent, it will replace its ancestor). (John Arbash Meinel, #235407)
- WorkingTreeFormat2.stub_initialize_remote is now private. (Martin Pool)
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, #202928)
- 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 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)
- 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)
- xs4all's ftp server returns a temporary error when trying to list an empty directory, rather than returning an empty list. Adding a workaround so that we don't get spurious failures. (John Arbash Meinel, #215522)
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)
- selftest now accepts --starting-with <id> to load only the tests whose id starts with the one specified. This greatly speeds up running the test suite on a limited set of tests and can be used to run the tests for a single module, a single class or even a single test. (Vincent Ladeuil)
- 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 CHANGES:
- 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 and .get are 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)
- VersionedFileStore no longer uses the transaction parameter given to most methods; amongst other things this means that the get_weave_or_empty method no longer guarantees errors on a missing weave in a readonly transaction, and no longer caches versioned file instances which reduces memory pressure (but requires more careful management by callers to preserve performance). (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:
- Added missing blackbox tests for modified (Adrian Wilkins)
- 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 th