(no changes from 1.1rc1)
CHANGES:
- 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. get_parents is now considered deprecated. (John Arbash Meinel)
- 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 times because we forget to pass around the Transport object. This modifies BzrDir.create_branch_convenience, so that we can give it the Transport we already have. (John Arbash Meinel, Vincent Ladeuil, #111702)
- Get rid of sftp connection cache (get rid of the FTP one too). (Vincent Ladeuil, #43731)
- bzr branch {local|remote} remote don't try to create a working tree anymore. (Vincent Ladeuil, #112173)
- All identified multiple connections for a single bzr command have been fixed. See bzrlib/tests/commands directory. (Vincent Ladeuil)
- bzr rm now does not insist on --force to delete files that have been renamed but not otherwise modified. (Marius Kruger, #111664)
- bzr selftest --bench no longer emits deprecation warnings (Lukáš Lalinský)
- bzr status now honours FILE parameters for conflict lists (Aaron Bentley, #127606)
- bzr checkout now honours -r when reconstituting a working tree. It also honours -r 0. (Aaron Bentley, #127708)
- bzr add * no more fails on Windows if working tree contains non-ascii file names. (Kuno Meyer, #127361)
- allow easy_install bzr runs without fatal errors. (Alexander Belchenko, #125521)
- Graph._filter_candidate_lca does not raise KeyError if a candidate is eliminated just before it would normally be examined. (Aaron Bentley)
- SMTP connection failures produce a nice message, not a traceback. (Aaron Bentley)
IMPROVEMENTS:
- Don't show "dots" progress indicators when run non-interactively, such as from cron. (Martin Pool)
- info now formats locations more nicely and lists "submit" and "public" branches (Aaron Bentley)
- New pack command that will trigger database compression within the repository (Robert Collins)
- Implement _KnitIndex._load_data in a pyrex extension. The pyrex version is approximately 2-3x faster at parsing a .kndx file. Which yields a measurable improvement for commands which have to read from the repository, such as a 1s => 0.75s improvement in bzr diff when there are changes to be shown. (John Arbash Meinel)
- Merge is now faster. Depending on the scenario, it can be more than 2x faster. (Aaron Bentley)
- Give a clearer warning, and allow python setup.py install to succeed even if pyrex is not available. (John Arbash Meinel)
- DirState._read_dirblocks now has an optional Pyrex implementation. This improves the speed of any command that has to read the entire DirState. (diff, status, etc, improve by about 10%). bisect_dirblocks has also been improved, which helps all _get_entry type calls (whenever we are searching for a particular entry in the in-memory DirState). (John Arbash Meinel)
- bzr pull and bzr push no longer do a complete walk of the branch revision history for ui display unless -v is supplied. (Robert Collins)
- bzr log -rA..B output shifted to the left margin if the log only contains merge revisions. (Kent Gibson)
- The plugins command is now public with improved help. (Ian Clatworthy)
- New bundle and merge directive formats are faster to generate, and
- Annotate merge now works when there are local changes. (Aaron Bentley)
- Commit now only shows the progress in terms of directories instead of entries. (Ian Clatworthy)
- Fix KnitRepository.get_revision_graph to not request the graph 2 times. This makes get_revision_graph 2x faster. (John Arbash Meinel)
- Fix VersionedFile.get_graph() to avoid using set.difference_update(other), which has bad scaling when other is large. This improves VF.get_graph([version_id]) for a 12.5k graph from 2.9s down to 200ms. (John Arbash Meinel)
- The --lsprof-file option now generates output for KCacheGrind if the file starts with callgrind.out. This matches the default file filtering done by KCacheGrind's Open Dialog. (Ian Clatworthy)
- Fix bzr update to avoid an unnecessary branch.get_master_branch call, which avoids 1 extra connection to the remote server. (Partial fix for #128076, John Arbash Meinel)
- Log errors from the smart server in the trace file, to make debugging test failures (and live failures!) easier. (Andrew Bennetts)
- The HTML version of the man page has been superceded by a more comprehensive manual called the Bazaar User Reference. This manual is completed generated from the online help topics. As part of this change, limited reStructuredText is now explicitly supported in help topics and command help with 'unnatural' markup being removed prior to display by the online help or inclusion in the man page. (Ian Clatworthy)
- HTML documentation now use files extension *.html (Alexander Belchenko)
- The cache of ignore definitions is now cleared in WorkingTree.unlock() so that changes to .bzrignore aren't missed. (#129694, Daniel Watkins)
- bzr selftest --strict fails if there are any missing features or expected test failures. (Daniel Watkins, #111914)
- Link to registration survey added to README. (Ian Clatworthy)
- Windows standalone installer show link to registration survey when installation finished. (Alexander Belchenko)
LIBRARY API BREAKS:
- Deprecated dictionary bzrlib.option.SHORT_OPTIONS removed. Options are now required to provide a help string and it must comply with the style guide by being one or more sentences with an initial capital and final period. (Martin Pool)
- KnitIndex.get_parents now returns tuples. (Robert Collins)
- Ancient unused Repository.text_store attribute has been removed. (Robert Collins)
- The bzrlib.pack interface has changed to use tuples of bytestrings rather than just bytestrings, making it easier to represent multiple element names. As this interface was not used by any internal facilities since it was introduced in 0.18 no API compatibility is being preserved. The serialised form of these packs is identical with 0.18 when a single element tuple is in use. (Robert Collins)
INTERNALS:
- merge now uses iter_changes to calculate changes, which makes room for future performance increases. It is also more consistent with other operations that perform comparisons, and reduces reliance on Tree.inventory. (Aaron Bentley)
- Refactoring of transport classes connected to a remote server. ConnectedTransport is a new class that serves as a basis for all transports needing to connect to a remote server. transport.split_url have been deprecated, use the static method on the object instead. URL tests have been refactored too. (Vincent Ladeuil)
- Better connection sharing for ConnectedTransport objects. transport.get_transport() now accepts a 'possible_transports' parameter. If a newly requested transport can share a connection with one of the list, it will. (Vincent Ladeuil)
- Most functions now accept bzrlib.revision.NULL_REVISION to indicate the null revision, and consider using None for this purpose deprecated. (Aaron Bentley)
- New index module with abstract index functionality. This will be used during the planned changes in the repository layer. Currently the index layer provides a graph aware immutable index, a builder for the same index type to allow creating them, and finally a composer for such indices to allow the use of many indices in a single query. The index performance is not optimised, however the API is stable to allow development on top of the index. (Robert Collins)
- bzrlib.dirstate.cmp_by_dirs can be used to compare two paths by their directory sections. This is equivalent to comparing path.split('/'), only without having to split the paths. This has a Pyrex implementation available. (John Arbash Meinel)
- New transport decorator 'unlistable+' which disables the list_dir functionality for testing.
- Deprecated change_entry in transform.py. (Ian Clatworthy)
- RevisionTree.get_weave is now deprecated. Tree.plan_merge is now used for performing annotate-merge. (Aaron Bentley)
- New EmailMessage class to create email messages. (Adeodato Simó)
- Unused functions on the private interface KnitIndex have been removed. (Robert Collins)
- New knit.KnitGraphIndex which provides a KnitIndex layered on top of a index.GraphIndex. (Robert Collins)
- New knit.KnitVersionedFile.iter_parents method that allows querying the parents of many knit nodes at once, reducing round trips to the underlying index. (Robert Collins)
- Graph now has an is_ancestor method, various bits use it. (Aaron Bentley)
- The -Dhpss flag now includes timing information. As well as logging when a new connection is opened. (John Arbash Meinel)
- bzrlib.pack.ContainerWriter now returns an offset, length tuple to callers when inserting data, allowing generation of readv style access during pack creation, without needing a separate pass across the output pack to gather such details. (Robert Collins)
- bzrlib.pack.make_readv_reader allows readv based access to pack files that are stored on a transport. (Robert Collins)
- New Repository.has_same_location method that reports if two repository objects refer to the same repository (although with some risk of false negatives). (Andrew Bennetts)
- InterTree.compare now passes require_versioned on correctly. (Marius Kruger)
- New methods on Repository - start_write_group, commit_write_group, abort_write_group and is_in_write_group - which provide a clean hook point for transactional Repositories - ones where all the data for a fetch or commit needs to be made atomically available in one step. This allows the write lock to remain while making a series of data insertions. (e.g. data conversion). (Robert Collins)
- In bzrlib.knit the internal interface has been altered to use 3-tuples (index, pos, length) rather than two-tuples (pos, length) to describe where data in a knit is, allowing knits to be split into many files. (Robert Collins)
- bzrlib.knit._KnitData split into cache management and physical access with two access classes - _PackAccess and _KnitAccess defined. The former provides access into a .pack file, and the latter provides the current production repository form of .knit files. (Robert Collins)
TESTING:
- Remove selftest --clean-output, --numbered-dirs and --keep-output options, which are obsolete now that tests are done within directories in $TMPDIR. (Martin Pool)
- The SSH_AUTH_SOCK environment variable is now reset to avoid interaction with any running ssh agents. (Jelmer Vernooij, #125955)
- run_bzr_subprocess handles parameters the same way as run_bzr: either a string or a list of strings should be passed as the first parameter. Varargs-style parameters are deprecated. (Aaron Bentley)
BUGFIXES:
- Fix 'bzr add' crash under Win32 (Kuno Meyer)
BUGFIXES:
- Do not suppress pipe errors, etc. in non-display commands (Alexander Belchenko, #87178)
- Display a useful error message when the user requests to annotate a file that is not present in the specified revision. (James Westby, #122656)
- Commands that use status flags now have a reference to 'help status-flags'. (Daniel Watkins, #113436)
- Work around python-2.4.1 inhability to correctly parse the authentication header. (Vincent Ladeuil, #121889)
- Use exact encoding for merge directives. (Adeodato Simó, #120591)
- Fix tempfile permissions error in smart server tar bundling under Windows. (Martin _, #119330)
- Fix detection of directory entries in the inventory. (James Westby)
- Fix handling of http code 400: Bad Request When issuing too many ranges. (Vincent Ladeuil, #115209)
- Issue a CONNECT request when connecting to an https server via a proxy to enable SSL tunneling. (Vincent Ladeuil, #120678)
- Fix bzr log -r to support selecting merge revisions, both individually and as part of revision ranges. (Kent Gibson, #4663)
- Don't leave cruft behind when failing to acquire a lockdir. (Martin Pool, #109169)
- Don't use the '-f' strace option during tests. (Vincent Ladeuil, #102019).
- Warn when setting push_location to a value that will be masked by locations.conf. (Aaron Bentley, #122286)
- Fix commit ordering in corner case (Aaron Bentley, #94975)
- Make annotate behave in a non-ASCII world (Adeodato Simó).
IMPROVEMENTS:
The --lsprof-file option now dumps a text rendering of the profiling information if the filename ends in ".txt". It will also convert the profiling information to a format suitable for KCacheGrind if the output filename ends in ".callgrind". Fixes to the lsprofcalltree conversion process by Jean Paul Calderone and Itamar were also merged. See http://ddaa.net/blog/python/lsprof-calltree. (Ian Clatworthy)
info now defaults to non-verbose mode, displaying only paths and abbreviated format info. info -v displays all the information formerly displayed by info. (Aaron Bentley, Adeodato Simó)
bzr missing now has better option names --this and --other. (Elliot Murphy)
The internal weave-list command has become versionedfile-list, and now lists knits as well as weaves. (Aaron Bentley)
Automatic merge base selection uses a faster algorithm that chooses better bases in criss-cross merge situations (Aaron Bentley)
Progress reporting in commit has been improved. The various logical stages are now reported on as follows, namely:
- Collecting changes [Entry x/y] - Stage n/m
- Saving data locally - Stage n/m
- Uploading data to master branch - Stage n/m
- Updating the working tree - Stage n/m
- Running post commit hooks - Stage n/m
If there is no master branch, the 3rd stage is omitted and the total number of stages is adjusted accordingly.
Each hook that is run after commit is listed with a name (as hooks can be slow it is useful feedback). (Ian Clatworthy, Robert Collins)
Various operations that are now faster due to avoiding unnecessary topological sorts. (Aaron Bentley)
Make merge directives robust against broken bundles. (Aaron Bentley)
The lsprof filename note is emitted via trace.note(), not standard output. (Aaron Bentley)
bzrlib now exports explicit API compatibility information to assist library users and plugins. See the bzrlib.api module for details. (Robert Collins)
Remove unnecessary lock probes when acquiring a lockdir. (Martin Pool)
bzr --version now shows the location of the bzr log file, which is especially useful on Windows. (Martin Pool)
-D now supports hooks to get debug tracing of hooks (though its currently minimal in nature). (Robert Collins)
Long log format reports deltas on merge revisions. (John Arbash Meinel, Kent Gibson)
Make initial push over ftp more resilient. (John Arbash Meinel)
Print a summary of changes for update just like pull does. (Daniel Watkins, #113990)
Add a -Dhpss option to trace smart protocol requests and responses. (Andrew Bennetts)
LIBRARY API BREAKS:
- Testing cleanups - bzrlib.repository.RepositoryTestProviderAdapter has been moved to bzrlib.tests.repository_implementations; bzrlib.repository.InterRepositoryTestProviderAdapter has been moved to bzrlib.tests.interrepository_implementations; bzrlib.transport.TransportTestProviderAdapter has moved to bzrlib.tests.test_transport_implementations. bzrlib.branch.BranchTestProviderAdapter has moved to bzrlib.tests.branch_implementations. bzrlib.bzrdir.BzrDirTestProviderAdapter has moved to bzrlib.tests.bzrdir_implementations. bzrlib.versionedfile.InterVersionedFileTestProviderAdapter has moved to bzrlib.tests.interversionedfile_implementations. bzrlib.store.revision.RevisionStoreTestProviderAdapter has moved to bzrlib.tests.revisionstore_implementations. bzrlib.workingtree.WorkingTreeTestProviderAdapter has moved to bzrlib.tests.workingtree_implementations. These changes are an API break in the testing infrastructure only. (Robert Collins)
- Relocate TestCaseWithRepository to be more central. (Robert Collins)
- bzrlib.add.smart_add_tree will no longer perform glob expansion on win32. Callers of the function should do this and use the new MutableTree.smart_add method instead. (Robert Collins)
- bzrlib.add.glob_expand_for_win32 is now bzrlib.win32utils.glob_expand. (Robert Collins)
- bzrlib.add.FastPath is now private and moved to bzrlib.mutabletree._FastPath. (Robert Collins, Martin Pool)
- LockDir.wait removed. (Martin Pool)
- The SmartServer hooks API has changed for the server_started and server_stopped hooks. The first parameter is now an iterable of backing URLs rather than a single URL. This is to reflect that many URLs may map to the external URL of the server. E.g. the server interally may have a chrooted URL but also the local file:// URL will be at the same location. (Robert Collins)
INTERNALS:
- New SMTPConnection class to unify email handling. (Adeodato Simó)
- Fix documentation of BzrError. (Adeodato Simó)
- Make BzrBadParameter an internal error. (Adeodato Simó)
- Remove use of 'assert False' to raise an exception unconditionally. (Martin Pool)
- Give a cleaner error when failing to decode knit index entry. (Martin Pool)
- TreeConfig would mistakenly search the top level when asked for options from a section. It now respects the section argument and only searches the specified section. (James Westby)
- Improve make api-docs output. (John Arbash Meinel)
- Use os.lstat rather than os.stat for osutils.make_readonly and osutils.make_writeable. This makes the difftools plugin more robust when dangling symlinks are found. (Elliot Murphy)
- New -Dlock option to log (to ~/.bzr.log) information on when lockdirs are taken or released. (Martin Pool)
- bzrlib Hooks are now nameable using Hooks.name_hook. This allows a nicer UI when hooks are running as the current hook can be displayed. (Robert Collins)
- Transport.get has had its interface made more clear for ease of use. Retrieval of a directory must now fail with either 'PathError' at open time, or raise 'ReadError' on a read. (Robert Collins)
- New method _maybe_expand_globs on the Command class for dealing with unexpanded glob lists - e.g. on the win32 platform. This was moved from bzrlib.add._prepare_file_list. (Robert Collins)
- bzrlib.add.smart_add and bzrlib.add.smart_add_tree are now deprecated in favour of MutableTree.smart_add. (Robert Collins, Martin Pool)
- New method external_url on Transport for obtaining the url to hand to external processes. (Robert Collins)
- Teach windows installers to build pyrex/C extensions. (Alexander Belchenko)
TESTING:
- Removed the --keep-output option from selftest and clean up test directories as they're used. This reduces the IO load from running the test suite and cuts the time by about half. (Andrew Bennetts, Martin Pool)
- Add scenarios as a public attribute on the TestAdapter classes to allow modification of the generated scenarios before adaption and easier testing. (Robert Collins)
- New testing support class TestScenarioApplier which multiplies out a single teste by a list of supplied scenarios. (RobertCollins)
- Setting repository_to_test_repository on a repository_implementations test will cause it to be called during repository creation, allowing the testing of repository classes which are not based around the Format concept. For example a repository adapter can be tested in this manner, by altering the repository scenarios to include a scenario that sets this attribute during the test parameterisation in bzrlib.tests.repository.repository_implementations. (Robert Collins)
- Clean up many of the APIs for blackbox testing of Bazaar. The standard interface is now self.run_bzr. The command to run can be passed as either a list of parameters, a string containing the command line, or (deprecated) varargs parameters. (Martin Pool)
- The base TestCase now isolates tests from -D parameters by clearing debug.debug_flags and restores it afterwards. (Robert Collins)
- Add a relpath parameter to get_transport methods in test framework to avoid useless cloning. (Vincent Ladeuil, #110448)
BUGFIXES:
- Fix crash of commit due to wrong lookup of filesystem encoding. (Colin Watson, #120647)
- Revert logging just to stderr in commit as broke unicode filenames. (Aaron Bentley, Ian Clatworthy, #120930)
NOTES WHEN UPGRADING:
The kind() and is_executable() APIs on the WorkingTree interface no longer implicitly (read) locks and unlocks the tree. This might impact some plug-ins and tools using this part of the API. If you find an issue that may be caused by this change, please let us know, particularly the plug-in/tool maintainer. If encountered, the API fix is to surround kind() and is_executable() calls with lock_read() and unlock() like so:
work_tree.lock_read() try: kind = work_tree.kind(...) finally: work_tree.unlock()
- INTERNALS:
- Rework of LogFormatter API to provide beginning/end of log hooks and to encapsulate the details of the revision to be logged in a LogRevision object. In long log formats, merge revision ids are only shown when --show-ids is specified, and are labelled "revision-id:", as per mainline revisions, instead of "merged:". (Kent Gibson)
- New BranchBuilder API which allows the construction of particular histories quickly. Useful for testing and potentially other applications too. (Robert Collins)
IMPROVEMENTS:
- There are two new help topics, working-trees and repositories that attempt to explain these concepts. (James Westby, John Arbash Meinel, Aaron Bentley)
- Added bzr log --limit to report a limited number of revisions. (Kent Gibson, #3659)
- Revert does not try to preserve file contents that were originally produced by reverting to a historical revision. (Aaron Bentley)
- bzr log --short now includes [merge] for revisions which have more than one parent. This is a small improvement to help understanding what changes have occurred (John Arbash Meinel, #83887)
- TreeTransform avoids many renames when contructing large trees, improving speed. 3.25x speedups have been observed for construction of kernel-sized-trees, and checkouts are 1.28x faster. (Aaron Bentley)
- Commit on large trees is now faster. In my environment, a commit of a small change to the Mozilla tree (55k files) has dropped from 66 seconds to 32 seconds. For a small tree of 600 files, commit of a small change is 33% faster. (Ian Clatworthy)
- New --create-prefix option to bzr init, like for push. (Daniel Watkins, #56322)
BUGFIXES:
- bzr push should only connect to the remote location one time. We have been connecting 3 times because we forget to pass around the Transport object. This adds BzrDir.clone_on_transport(), so that we can pass in the Transport that we already have. (John Arbash Meinel, #75721)
- DirState.set_state_from_inventory() needs to properly order based on split paths, not just string paths. (John Arbash Meinel, #115947)
- Let TestUIFactoy encode the password prompt with its own stdout. (Vincent Ladeuil, #110204)
- pycurl should take use the range header that takes the range hint into account. (Vincent Ladeuil, #112719)
- WorkingTree4.get_file_sha1 no longer raises an exception when invoked on a missing file. (Aaron Bentley, #118186)
- WorkingTree.remove works correctly with tree references, and when pwd is not the tree root. (Aaron Bentley)
- Merge no longer fails when a file is renamed in one tree and deleted in the other. (Aaron Bentley, #110279)
- revision-info now accepts dotted revnos, doesn't require a tree, and defaults to the last revision (Matthew Fuller, #90048)
- Tests no longer fail when BZR_REMOTE_PATH is set in the environment. (Daniel Watkins, #111958)
- bzr branch -r revid:foo can be used to branch any revision in your repository. (Previously Branch6 only supported revisions in your mainline). (John Arbash Meinel, #115343)
BUGFIXES:
- Handle when you have 2 directories with similar names, but one has a hyphen. ('abc' versus 'abc-2'). The WT4._iter_changes iterator was using direct comparison and 'abc/a' sorts after 'abc-2', but ('abc', 'a') sorts before ('abc-2',). (John Arbash Meinel, #111227)
- Handle when someone renames a file on disk without telling bzr. Previously we would report the first file as missing, but not show the new unknown file. (John Arbash Meinel, #111288)
- Avoid error when running hooks after pulling into or pushing from a branch bound to a smartserver branch. (Martin Pool, #111968)
IMPROVEMENTS:
- Move developer documentation to doc/developers/. This reduces clutter in the root of the source tree and allows HACKING to be split into multiple files. (Robert Collins, Alexander Belchenko)
- Clean up the WorkingTree4._iter_changes() internal loops as well as DirState.update_entry(). This optimizes the core logic for bzr diff and bzr status significantly improving the speed of both. (John Arbash Meinel)
BUGFIXES:
- Handle the case when you delete a file, and then rename another file on top of it. Also handle the case of bzr rm --keep foo. bzr status should show the removed file and an unknown file in its place. (John Arbash Meinel, #109993)
- Bundles properly read and write revision properties that have an empty value. And when the value is not ASCII. (John Arbash Meinel, #109613)
- Fix the bzr commit message to be in text mode. (Alexander Belchenko, #110901)
- Also handle when you rename a file and create a file where it used to be. (John Arbash Meinel, #110256)
- WorkingTree4._iter_changes should not descend into unversioned directories. (John Arbash Meinel, #110399)
NOTES WHEN UPGRADING:
- bzr remove and bzr rm will now remove the working file, if it could be recovered again. This has been done for consistency with svn and the unix rm command. The old remove behaviour has been retained in the new option bzr remove --keep, which will just stop versioning the file, but not delete it. bzr remove --force have been added which will always delete the files. bzr remove is also more verbose. (Marius Kruger, #82602)
IMPROVEMENTS:
- Merge directives can now be supplied as input to merge and pull, like bundles can. (Aaron Bentley)
- Sending the SIGQUIT signal to bzr, which can be done on Unix by pressing Control-Backslash, drops bzr into a debugger. Type 'c' to continue. This can be disabled by setting the environment variable BZR_SIGQUIT_PDB=0. (Martin Pool)
- selftest now supports --list-only to list tests instead of running them. (Ian Clatworthy)
- selftest now supports --exclude PATTERN (or -x PATTERN) to exclude tests with names that match that regular expression. (Ian Clatworthy, #102679)
- selftest now supports --randomize SEED to run tests in a random order. SEED is typically the value 'now' meaning 'use the current time'. (Ian Clatworthy, #102686)
- New option --fixes to commit, which stores bug fixing annotations as revision properties. Built-in support for Launchpad, Debian, Trac and Bugzilla bug trackers. (Jonathan Lange, James Henstridge, Robert Collins)
- New API, bzrlib.bugtracker.tracker_registry, for adding support for other bug trackers to fixes. (Jonathan Lange, James Henstridge, Robert Collins)
- selftest has new short options -f and -1. (Martin Pool)
- bzrlib.tsort.MergeSorter optimizations. Change the inner loop into using local variables instead of going through self._var. Improves the time to merge_sort a 10k revision graph by approximately 40% (~700->400ms). (John Arbash Meinel)
- make docs now creates a man page at man1/bzr.1 fixing bug 107388. (Robert Collins)
- bzr help now provides cross references to other help topics using the _see_also facility on command classes. Likewise the bzr_man documentation, and the bzr.1 man page also include this information. (Robert Collins)
- Tags are now included in logs, that use the long log formatter. (Erik Bågfors, Alexander Belchenko)
- bzr help provides a clearer message when a help topic cannot be found. (Robert Collins, #107656)
- bzr help now accepts optional prefixes for command help. The help for all commands can now be found at bzr help commands/COMMANDNAME as well as bzr help COMMANDNAME (which only works for commands where the name is not the same as a more general help topic). (Robert Collins)
- bzr help PLUGINNAME will now return the module docstring from the plugin PLUGINNAME. (Robert Collins, #50408)
- New help topic urlspec which lists the availables transports. (Goffredo Baroncelli)
- doc/server.txt updated to document the default bzr:// port and also update the blurb about the hpss' current status. (Robert Collins, #107125).
- bzr serve now listens on interface 0.0.0.0 by default, making it serve out to the local LAN (and anyone in the world that can reach the machine running bzr serve. (Robert Collins, #98918)
- A new smart server protocol version has been added. It prefixes requests and responses with an explicit version identifier so that future protocol revisions can be dealt with gracefully. (Andrew Bennetts, Robert Collins)
- The bzr protocol version 2 indicates success or failure in every response without depending on particular commands encoding that consistently, allowing future client refactorings to be much more robust about error handling. (Robert Collins, Martin Pool, Andrew Bennetts)
- The smart protocol over HTTP client has been changed to always post to the same .bzr/smart URL under the original location when it can. This allows HTTP servers to only have to pass URLs ending in .bzr/smart to the smart server handler, and not arbitrary .bzr/*/smart URLs. (Andrew Bennetts)
- digest authentication is now supported for proxies and HTTP by the urllib based http implementation. Tested against Apache 2.0.55 and Squid 2.6.5. Basic and digest authentication are handled coherently for HTTP and proxy: if the user is provided in the url (bzr command line for HTTP, proxy environment variables for proxies), the password is prompted for (only once). If the password is provided, it is taken into account. Once the first authentication is successful, all further authentication roundtrips are avoided by preventively setting the right authentication header(s). (Vincent Ladeuil).
INTERNALS:
- bzrlib API compatability with 0.8 has been dropped, cleaning up some code paths. (Robert Collins)
- Change the format of chroot urls so that they can be safely manipulated by generic url utilities without causing the resulting urls to have escaped the chroot. A side effect of this is that creating a chroot requires an explicit action using a ChrootServer. (Robert Collins, Andrew Bennetts)
- Deprecate Branch.get_root_id() because branches don't have root ids, rather than fixing bug #96847. (Aaron Bentley)
- WorkingTree.apply_inventory_delta provides a better alternative to WorkingTree._write_inventory. (Aaron Bentley)
- Convenience method TestCase.expectFailure ensures that known failures do not silently pass. (Aaron Bentley)
- Transport.local_abspath now raises NotLocalUrl rather than TransportNotPossible. (Martin Pool, Ian Clatworthy)
- New SmartServer hooks facility. There are two initial hooks documented in bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow plugins to execute code upon server startup and shutdown. (Robert Collins).
- SmartServer in standalone mode will now close its listening socket when it stops, rather than waiting for garbage collection. This primarily fixes test suite hangs when a test tries to connect to a shutdown server. It may also help improve behaviour when dealing with a server running on a specific port (rather than dynamically assigned ports). (Robert Collins)
- Move most SmartServer code into a new package, bzrlib/smart. bzrlib/transport/remote.py contains just the Transport classes that used to be in bzrlib/transport/smart.py. (Andrew Bennetts)
- urllib http implementation avoid roundtrips associated with 401 (and 407) errors once the authentication succeeds. (Vincent Ladeuil).
- urlib http now supports querying the user for a proxy password if needed. Realm is shown in the prompt for both HTTP and proxy authentication when the user is required to type a password. (Vincent Ladeuil).
- Renamed SmartTransport (and subclasses like SmartTCPTransport) to RemoteTransport (and subclasses to RemoteTCPTransport, etc). This is more consistent with its new home in bzrlib/transport/remote.py, and because it's not really a "smart" transport, just one that does file operations via remote procedure calls. (Andrew Bennetts)
- The lock_write method of LockableFiles, Repository and Branch now accept a token keyword argument, so that separate instances of those objects can share a lock if it has the right token. (Andrew Bennetts, Robert Collins)
- New method get_branch_reference on BzrDir allows the detection of branch references - which the smart server component needs.
- The Repository API make_working_trees is now permitted to return False when set_make_working_trees is not implemented - previously an unimplemented set_make_working_trees implied the result True from make_working_trees. This has been changed to accomodate the smart server, where it does not make sense (at this point) to ever make working trees by default. (Robert Collins)
- Command objects can now declare related help topics by having _see_also set to a list of related topic. (Robert Collins)
- bzrlib.help now delegates to the Command class for Command specific help. (Robert Collins)
- New class TransportListRegistry, derived from the Registry class, which simplifies tracking the available Transports. (Goffredo Baroncelli)
- New function Branch.get_revision_id_to_revno_map which will return a dictionary mapping revision ids to dotted revnos. Since dotted revnos are defined in the context of the branch tip, it makes sense to generate them from a Branch object. (John Arbash Meinel)
- Fix the 'Unprintable error' message display to use the repr of the exception that prevented printing the error because the str value for it is often not useful in debugging (e.g. KeyError('foo') has a str() of 'foo' but a repr of 'KeyError('foo')' which is much more useful. (Robert Collins)
- urlutils.normalize_url now unescapes unreserved characters, such as "~". (Andrew Bennetts)
BUGFIXES:
- Don't fail bundle selftest if email has 'two' embedded. (Ian Clatworthy, #98510)
- Remove --verbose from bzr bundle. It didn't work anyway. (Robert Widhopf-Fenk, #98591)
- Remove --basis from the checkout/branch commands - it didn't work properly and is no longer beneficial. (Robert Collins, #53675, #43486)
- Don't produce encoding error when adding duplicate files. (Aaron Bentley)
- Fix bzr