~bzr-pqm/bzr/bzr.dev

bzr development version

  IMPROVEMENTS:

    * Sftp paths can now be relative, or local, according to the lftp

      convention. Paths now take the form:

      sftp://user:pass@host:port/~/relative/path

      or

      sftp://user:pass@host:port/absolute/path

    * The FTP transport now tries to reconnect after a temporary

      failure. ftp put is made atomic. (Matthieu Moy)

    * The FTP transport now maintains a pool of connections, and

      reuses them to avoid multiple connections to the same host (like

      sftp did). (Daniel Silverstone)

    * The bzr_man.py file has been removed. To create the man page now,

      use ./generate_docs.py man. The new program can also create other files.

      Run "python generate_docs.py --help" for usage information. (Hans

      Ulrich Niedermann & James Blackwell).

    * Man Page now gives full help (James Blackwell). Help also updated to 

      reflect user config now being stored in .bazaar (Hans Ulrich

      Niedermann)

    * It's now possible to set aliases in bazaar.conf (Erik Bågfors)

    * Pull now accepts a --revision argument (Erik Bågfors)

    * 'bzr re-sign' now allows multiple revisions to be supplied on the command

      line. You can now use the following command to sign all of your old commits.

        find .bzr/revision-store// -name my@email-* \

          | sed 's/.*\/\/..\///' \

          | xargs bzr re-sign

    * Upgrade can now upgrade over the network. (Robert Collins)

    * Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike

      behaviour.  By default they will cache history in the checkout, but

      with --lightweight almost all data is kept in the master branch.

      (Robert Collins)

    * 'revert' unversions newly-versioned files, instead of deleting them.

    * 'merge' is more robust.  Conflict messages have changed.

    * 'merge' and 'revert' no longer clobber existing files that end in '~' or

      '.moved'.

    * Default log format can be set in configuration and plugins can register

      their own formatters. (Erik Bågfors)

    * New 'reconcile' command will check branch consistency and repair indexes

      that can become out of sync in pre 0.8 formats. (Robert Collins,

      Daniel Silverstone)

    * New 'bzr init --format' and 'bzr upgrade --format' option to control 

      what storage format is created or produced.  (Robert Collins, 

      Martin Pool)

    * Add parent location to 'bzr info', if there is one.  (Olaf Conradi)

    * New developer commands 'weave-list' and 'weave-join'.  (Martin Pool)

    * New 'init-repository' command, plus support for repositories in 'init'

      and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)

    * Improve output of 'info' command. Show all relevant locations related to

      working tree, branch and repository. Use kibibytes for binary quantities.

      Fix off-by-one error in missing revisions of working tree.  Make 'info'

      work on branches, repositories and remote locations.  (Olaf Conradi)

    * 'pull' and 'push' now normalise the revision history, so that any two

      branches with the same tip revision will have the same output from 'log'.

      (Robert Collins)

  CHANGES:

    * Commit is now verbose by default, and shows changed filenames and the 

      new revision number.  (Robert Collins, Martin Pool)

    * Unify 'mv', 'move', 'rename'.  (#5379, Matthew Fuller)

    * 'bzr -h' shows help.  (#35940, Martin Pool, Ian Bicking)

  INTERNALS:

    * The internal storage of history, and logical branch identity have now

      been split into Branch, and Repository. The common locking and file 

      management routines are now in bzrlib.lockablefiles. 

      (Aaron Bentley, Robert Collins, Martin Pool)

    * Transports can now raise DependencyNotPresent if they need a library

      which is not installed, and then another implementation will be 

      tried.  (Martin Pool)

    * Remove obsolete (and no-op) `decode` parameter to `Transport.get`.  

      (Martin Pool)

    * Using Tree Transform for merge, revert, tree-building

    * WorkingTree.create, Branch.create, WorkingTree.create_standalone,

      Branch.initialize are now deprecated. Please see BzrDir.create_* for

      replacement API's. (Robert Collins)

    * New BzrDir class represents the .bzr control directory and manages

      formatting issues. (Robert Collins)

    * New repository.InterRepository class encapsulates Repository to 

      Repository actions and allows for clean selection of optimised code

      paths. (Robert Collins)

    * bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,

      please use 'branch.fetch' or 'repository.fetch' depending on your

      needs. (Robert Collins)

    * deprecated methods now have a 'is_deprecated' flag on them that can

      be checked, if you need to determine whether a given callable is 

      deprecated at runtime. (Robert Collins)

    * Progress bars are now nested - see

      bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)

    * New API call get_format_description() for each type of format.

      (Olaf Conradi)

  TESTING:

    * SFTP tests now shortcut the SSH negotiation, reducing test overhead

      for testing SFTP protocol support. (Robey Pointer)

    * Branch formats are now tested once per implementation (see bzrlib.

      tests.branch_implementations. This is analagous to the transport

      interface tests, and has been followed up with working tree,

      repository and BzrDir tests. (Robert Collins)

    * New test base class TestCaseWithTransport provides a transport aware

      test environment, useful for testing any transport-interface using

      code. The test suite option --transport controls the transport used

      by this class (when its not being used as part of implementation

      contract testing). (Robert Collins)

    * Close logging handler on disabling the test log. This will remove the

      handler from the internal list inside python's logging module,

      preventing shutdown from closing it twice.  (Olaf Conradi)

bzr 0.7rc1 2006-01-09

  CHANGES:

    * .bzrignore is excluded from exports, on the grounds that it's a bzr 

      internal-use file and may not be wanted.  (Jamie Wilkinson)

    * The "bzr directories" command were removed in favor of the new

      --kind option to the "bzr inventory" command.  To list all 

      versioned directories, now use "bzr inventory --kind directory".  

      (Johan Rydberg)

    * Under Windows configuration directory is now %APPDATA%\bazaar\2.0

      by default. (John Arbash Meinel)

    * The parent of Bzr configuration directory can be set by BZR_HOME

      environment variable. Now the path for it is searched in BZR_HOME, then

      in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually

      points to C:\Documents and Settings\User Name\Application Data), HOME.

      (John Arbash Meinel)

    * Plugins with the same name in different directories in the bzr plugin

      path are no longer loaded: only the first successfully loaded one is

      used. (Robert Collins)

    * Use systems' external ssh command to open connections if possible.  

      This gives better integration with user settings such as ProxyCommand.

      (James Henstridge)

    * Permissions on files underneath .bzr/ are inherited from the .bzr 

      directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'

      will mean that future file will be created with group write permissions.

    * configure.in and config.guess are no longer in the builtin default 

      ignore list.

    * '.sw[nop]' pattern ignored, to ignore vim swap files for nameless

      files.  (John Arbash Meinel, Martin Pool)

  IMPROVEMENTS:

    * "bzr INIT dir" now initializes the specified directory, and creates 

      it if it does not exist.  (John Arbash Meinel)

    * New remerge command (Aaron Bentley)

    * Better zsh completion script.  (Steve Borho)

    * 'bzr diff' now returns 1 when there are changes in the working 

      tree. (Robert Collins)

    * 'bzr push' now exists and can push changes to a remote location. 

      This uses the transport infrastructure, and can store the remote

      location in the ~/.bazaar/branches.conf configuration file.

      (Robert Collins)

    * Test directories are only kept if the test fails and the user requests

      that they be kept.

    * Tweaks to short log printing

    * Added branch nicks, new nick command, printing them in log output. 

      (Aaron Bentley)

    * If $BZR_PDB is set, pop into the debugger when an uncaught exception 

      occurs.  (Martin Pool)

    * Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is

      the same as Subversion.  (Martin Pool)

    * New ftp transport support (on ftplib), for ftp:// and aftp:// 

      URLs.  (Daniel Silverstone)

    * Commit editor temporary files now start with 'bzr_log.', to allow 

      text editors to match the file name and set up appropriate modes or 

      settings.  (Magnus Therning)

    * Improved performance when integrating changes from a remote weave.  

      (Goffredo Baroncelli)

    * Sftp will attempt to cache the connection, so it is more likely that

      a connection will be reused, rather than requiring multiple password

      requests.

    * bzr revno now takes an optional argument indicating the branch whose

      revno should be printed.  (Michael Ellerman)

    * bzr cat defaults to printing the last version of the file.  

      (#3632, Matthieu Moy)

    * New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof 

      profiler.  (Denys Duchier)

    * Faster commits by reading only the headers of affected weave files. 

      (Denys Duchier)

    * 'bzr add' now takes a --dry-run parameter which shows you what would be

      added, but doesn't actually add anything. (Michael Ellerman)

    * 'bzr add' now lists how many files were ignored per glob.  add --verbose

      lists the specific files.  (Aaron Bentley)

    * 'bzr missing' now supports displaying changes in diverged trees and can

      be limited to show what either end of the comparison is missing.

      (Aaron Bently, with a little prompting from Daniel Silverstone)

  BUG FIXES:

    * SFTP can walk up to the root path without index errors. (Robert Collins)

    * Fix bugs in running bzr with 'python -O'.  (Martin Pool)

    * Error when run with -OO

    * Fix bug in reporting http errors that don't have an http error code.

      (Martin Pool)

    * Handle more cases of pipe errors in display commands

    * Change status to 3 for all errors

    * Files that are added and unlinked before committing are completely

      ignored by diff and status

    * Stores with some compressed texts and some uncompressed texts are now

      able to be used. (John A Meinel)

    * Fix for bzr pull failing sometimes under windows

    * Fix for sftp transport under windows when using interactive auth

    * Show files which are both renamed and modified as such in 'bzr 

      status' output.  (#4503, Daniel Silverstone)

    * Make annotate cope better with revisions committed without a valid 

      email address.  (Marien Zwart)

    * Fix representation of tab characters in commit messages.  (Harald 

      Meland)

    * List of plugin directories in BZR_PLUGIN_PATH environment variable is

      now parsed properly under Windows. (Alexander Belchenko)

    * Show number of revisions pushed/pulled/merged. (Robey Pointer)

    * Keep a cached copy of the basis inventory to speed up operations 

      that need to refer to it.  (Johan Rydberg, Martin Pool)

    * Fix bugs in bzr status display of non-ascii characters.  (Martin 

      Pool)

    * Remove Makefile.in from default ignore list.  (#6413, Tollef Fog 

      Heen, Martin Pool)

    * Fix failure in 'bzr added'.  (Nathan McCallum, Martin Pool)

  TESTING:

    * Fix selftest asking for passwords when there are no SFTP keys.  

      (Robey Pointer, Jelmer Vernooij) 

    * Fix selftest run with 'python -O'.  (Martin Pool)

    * Fix HTTP tests under Windows. (John Arbash Meinel)

    * Make tests work even if HOME is not set (Aaron Bentley)

    * Updated build_tree to use fixed line-endings for tests which read 

      the file cotents and compare. Make some tests use this to pass under

      Windows. (John Arbash Meinel)

    * Skip stat and symlink tests under Windows. (Alexander Belchenko)

    * Delay in selftest/testhashcash is now issued under win32 and Cygwin.

      (John Arbash Meinel)

    * Use terminal width to align verbose test output.  (Martin Pool)

    * Blackbox tests are maintained within the bzrlib.tests.blackbox directory.

      If adding a new test script please add that to

      bzrlib.tests.blackbox.__init__. (Robert Collins)

    * Much better error message if one of the test suites can't be 

      imported.  (Martin Pool)

    * Make check now runs the test suite twice - once with the default locale,

      and once with all locales forced to C, to expose bugs. This is not 

      trivially done within python, so for now its only triggered by running

      Make check. Integrators and packagers who wish to check for full 

      platform support should run 'make check' to test the source.

      (Robert Collins)

    * Tests can now run TestSkipped if they can't execute for any reason.

      (Martin Pool) (NB: TestSkipped should only be raised for correctable

      reasons - see the wiki spec ImprovingBzrTestSuite).

    * Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir

      paths for the transport tests. Introduce blackbox remote sftp tests that

      test the same permutations. (Robert Collins, Robey Pointer)

    * Transport implementation tests are now independent of the local file

      system, which allows tests for esoteric transports, and for features

      not available in the local file system. They also repeat for variations

      on the URL scheme that can introduce issues in the transport code,

      see bzrlib.transport.TransportTestProviderAdapter() for this.

      (Robert Collins).

    * TestCase.build_tree uses the transport interface to build trees, pass

      in a transport parameter to give it an existing connection.

      (Robert Collins).

  INTERNALS:

    * WorkingTree.pull has been split across Branch and WorkingTree,

      to allow Branch only pulls. (Robert Collins)

    * commands.display_command now returns the result of the decorated 

      function. (Robert Collins)

    * LocationConfig now has a set_user_option(key, value) call to save

      a setting in its matching location section (a new one is created

      if needed). (Robert Collins)

    * Branch has two new methods, get_push_location and set_push_location

      to respectively, get and set the push location. (Robert Collins)

    * commands.register_command now takes an optional flag to signal that

      the registrant is planning to decorate an existing command. When 

      given multiple plugins registering a command is not an error, and

      the original command class (whether built in or a plugin based one) is

      returned to the caller. There is a new error 'MustUseDecorated' for

      signalling when a wrapping command should switch to the original

      version. (Robert Collins)

    * Some option parsing errors will raise 'BzrOptionError', allowing 

      granular detection for decorating commands. (Robert Collins).

    * Branch.read_working_inventory has moved to

      WorkingTree.read_working_inventory. This necessitated changes to

      Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree

      as well. To make it clear that a WorkingTree cannot always be obtained

      Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot

      be obtained. (Robert Collins)

    * All pending merges operations from Branch are now on WorkingTree.

      (Robert Collins)

    * The follow operations from Branch have moved to WorkingTree:

      add()

      commit()

      move()

      rename_one()

      unknowns()

      (Robert Collins)

    * bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)

    * New "rio" serialization format, similar to rfc-822. (Martin Pool)

    * Rename selftests to `bzrlib.tests.test_foo`.  (John A Meinel, Martin 

      Pool)

    * bzrlib.plugin.all_plugins has been changed from an attribute to a 

      query method. (Robert Collins)

    * New options to read only the table-of-contents of a weave.  

      (Denys Duchier)

    * Raise NoSuchFile when someone tries to add a non-existant file.

      (Michael Ellerman)

    * Simplify handling of DivergedBranches in cmd_pull().

      (Michael Ellerman)

    * Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which

      is exposed as Branch().control_files. Also this has been altered with the

      controlfile pre/suffix replaced by simple method names like 'get' and

      'put'. (Aaron Bentley, Robert Collins).

    * Deprecated functions and methods can now be marked as such using the 

      bzrlib.symbol_versioning module. Marked method have their docstring

      updated and will issue a DeprecationWarning using the warnings module

      when they are used. (Robert Collins)

    * bzrlib.osutils.safe_unicode now exists to provide parameter coercion

      for functions that need unicode strings. (Robert Collins)

bzr 0.6 2005-10-28

  IMPROVEMENTS:

    * pull now takes --verbose to show you what revisions are added or removed

      (John A Meinel)

    * merge now takes a --show-base option to include the base text in

      conflicts.

      (Aaron Bentley)

    * The config files are now read using ConfigObj, so '=' should be used as

      a separator, not ':'.

      (Aaron Bentley)

    * New 'bzr commit --strict' option refuses to commit if there are 

      any unknown files in the tree.  To commit, make sure all files are 

      either ignored, added, or deleted.  (Michael Ellerman)

    * The config directory is now ~/.bazaar, and there is a single file 

      ~/.bazaar/bazaar.conf storing email, editor and other preferences.

      (Robert Collins)

    * 'bzr add' no longer takes a --verbose option, and a --quiet option

      has been added that suppresses all output.

    * Improved zsh completion support in contrib/zsh, from Clint

      Adams.

    * Builtin 'bzr annotate' command, by Martin Pool with improvements from 

      Goffredo Baroncelli.

    * 'bzr check' now accepts -v for verbose reporting, and checks for

      ghosts in the branch. (Robert Collins)

    * New command 're-sign' which will regenerate the gpg signature for 

      a revision. (Robert Collins)

    * If you set check_signatures=require for a path in 

      ~/.bazaar/branches.conf then bzr will invoke your

      gpg_signing_command (defaults to gpg) and record a digital signature

      of your commit. (Robert Collins)

    * New sftp transport, based on Paramiko.  (Robey Pointer)

    * 'bzr pull' now accepts '--clobber' which will discard local changes

      and make this branch identical to the source branch. (Robert Collins)

    * Just give a quieter warning if a plugin can't be loaded, and 

      put the details in .bzr.log.  (Martin Pool)

    * 'bzr branch' will now set the branch-name to the last component of the

      output directory, if one was supplied.

    * If the option 'post_commit' is set to one (or more) python function

      names (must be in the bzrlib namespace), then they will be invoked

      after the commit has completed, with the branch and revision_id as

      parameters. (Robert Collins)

    * Merge now has a retcode of 1 when conflicts occur. (Robert Collins)

    * --merge-type weave is now supported for file contents.  Tree-shape

      changes are still three-way based.  (Martin Pool, Aaron Bentley)

    * 'bzr check' allows the first revision on revision-history to have

      parents - something that is expected for cheap checkouts, and occurs

      when conversions from baz do not have all history.  (Robert Collins).

   * 'bzr merge' can now graft unrelated trees together, if your specify

     0 as a base. (Aaron Bentley)

   * 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work

     (Aaron Bentley)

    * Add '.sconsign*' to default ignore list.  (Alexander Belchenko)

   * 'bzr merge --reprocess' minimizes conflicts

  TESTING:

    * The 'bzr selftest --pattern' option for has been removed, now 

      test specifiers on the command line can be simple strings, or 

      regexps, or both. (Robert Collins)

    * Passing -v to selftest will now show the time each test took to 

      complete, which will aid in analysing performance regressions and

      related questions. (Robert Collins)

    * 'bzr selftest' runs all tests, even if one fails, unless '--one'

      is given. (Martin Pool)

    * There is a new method for TestCaseInTempDir, assertFileEqual, which

      will check that a given content is equal to the content of the named

      file. (Robert Collins)

    * Fix test suite's habit of leaving many temporary log files in $TMPDIR.

      (Martin Pool)

  INTERNALS:

    * New 'testament' command and concept for making gpg-signatures 

      of revisions that are not tied to a particular internal

      representation.  (Martin Pool).

    * Per-revision properties ('revprops') as key-value associated 

      strings on each revision created when the revision is committed.

      Intended mainly for the use of external tools.  (Martin Pool).

    * Config options have moved from bzrlib.osutils to bzrlib.config.

      (Robert Collins)

    * Improved command line option definitions allowing explanations

      for individual options, among other things.  Contributed by 

      Magnus Therning.

    * Config options have moved from bzrlib.osutils to bzrlib.config.

      Configuration is now done via the config.Config interface:

      Depending on whether you have a Branch, a Location or no information

      available, construct a *Config, and use its signature_checking,

      username and user_email methods. (Robert Collins)

    * Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and

      they are made available for other plugins to use. You should not 

      import other plugins during the __init__ of your plugin though, as 

      no ordering is guaranteed, and the plugins directory is not on the

      python path. (Robert Collins)

    * Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no

      no longer takes an inventory, rather it takes an option branch

      parameter, and if None is given will open the branch at basedir 

      implicitly. (Robert Collins)

    * Cleaner exception structure and error reporting.  Suggested by 

      Scott James Remnant.  (Martin Pool)

    * Branch.remove has been moved to WorkingTree, which has also gained

      lock_read, lock_write and unlock methods for convenience. (Robert

      Collins)

    * Two decorators, needs_read_lock and needs_write_lock have been added

      to the branch module. Use these to cause a function to run in a

      read or write lock respectively. (Robert Collins)

    * Branch.open_containing now returns a tuple (Branch, relative-path),

      which allows direct access to the common case of 'get me this file

      from its branch'. (Robert Collins)

    * Transports can register using register_lazy_transport, and they 

      will be loaded when first used.  (Martin Pool)

    * 'pull' has been factored out of the command as WorkingTree.pull().

      A new option to WorkingTree.pull has been added, clobber, which will

      ignore diverged history and pull anyway.

      (Robert Collins)

    * config.Config has a 'get_user_option' call that accepts an option name.

      This will be looked up in branches.conf and bazaar.conf as normal.

      It is intended that this be used by plugins to support options - 

      options of built in programs should have specific methods on the config.

      (Robert Collins)

    * merge.merge_inner now has tempdir as an optional parameter. (Robert

      Collins)

    * Tree.kind is not recorded at the top level of the hierarchy, as it was

      missing on EmptyTree, leading to a bug with merge on EmptyTrees.

      (Robert Collins)

    * WorkingTree.__del__ has been removed, it was non deterministic and not 

      doing what it was intended to. See WorkingTree.__init__ for a comment

      about future directions. (Robert Collins/Martin Pool)

    * bzrlib.transport.http has been modified so that only 404 urllib errors

      are returned as NoSuchFile. Other exceptions will propogate as normal.

      This allows debuging of actual errors. (Robert Collins)

    * bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths

      to apis like 'put', 'get' and 'has'. This is to provide consistent

      behaviour - it operates on url's only. (Robert Collins)

    * Transports can register using register_lazy_transport, and they 

      will be loaded when first used.  (Martin Pool)

    * 'merge_flex' no longer calls conflict_handler.finalize(), instead that

      is called by merge_inner. This is so that the conflict count can be 

      retrieved (and potentially manipulated) before returning to the caller

      of merge_inner. Likewise 'merge' now returns the conflict count to the

      caller. (Robert Collins)

    * 'revision.revision_graph can handle having only partial history for

      a revision - that is no revisions in the graph with no parents.

      (Robert Collins).

    * New builtins.branch_files uses the standard file_list rules to produce

      a branch and a list of paths, relative to that branch (Aaron Bentley)

    * New TestCase.addCleanup facility.

    * New bzrlib.version_info tuple (similar to sys.version_info), which can

      be used by programs importing bzrlib.

  BUG FIXES: