~bzr-pqm/bzr/bzr.dev

UNRELEASED CHANGES

  CHANGES:

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

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

  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)

  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)

    * 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)

  TESTING:

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

      (Robey Pointer, Jelmer Vernooij) 

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

  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)

    * Branch.commit() has moved to WorkingTree.commit(). (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:

    * Better handling of branches in directories with non-ascii names. 

      (Joel Rosdahl, Panagiotis Papadakos)

    * Upgrades of trees with no commits will not fail due to accessing

      [-1] in the revision-history. (Andres Salomon)

bzr 0.1.1 2005-10-12

  BUG FIXES:

    * Fix problem in pulling over http from machines that do not 

      allow directories to be listed.

    * Avoid harmless warning about invalid hash cache after 

      upgrading branch format.

  PERFORMANCE: 

    * Avoid some unnecessary http operations in branch and pull.

bzr 0.1 2005-10-11

  NOTES:

    * 'bzr branch' over http initially gives a very high estimate

      of completion time but it should fall as the first few 

      revisions are pulled in.  branch is still slow on 

      high-latency connections.

  BUG FIXES:

    * bzr-man.py has been updated to work again. Contributed by

      Rob Weir.

    * Locking is now done with fcntl.lockf which works with NFS

      file systems. Contributed by Harald Meland.

    * When a merge encounters a file that has been deleted on

      one side and modified on the other, the old contents are

      written out to foo.BASE and foo.SIDE, where SIDE is this

      or OTHER. Contributed by Aaron Bentley.

    * Export was choosing incorrect file paths for the content of

      the tarball, this has been fixed by Aaron Bentley.

    * Commit will no longer commit without a log message, an 

      error is returned instead. Contributed by Jelmer Vernooij.

    * If you commit a specific file in a sub directory, any of its

      parent directories that are added but not listed will be 

      automatically included. Suggested by Michael Ellerman.

    * bzr commit and upgrade did not correctly record new revisions

      for files with only a change to their executable status.

      bzr will correct this when it encounters it. Fixed by

      Robert Collins

    * HTTP tests now force off the use of http_proxy for the duration.

      Contributed by Gustavo Niemeyer.

    * Fix problems in merging weave-based branches that have 

      different partial views of history.

    * Symlink support: working with symlinks when not in the root of a 

      bzr tree was broken, patch from Scott James Remnant.

  IMPROVEMENTS:

    * 'branch' now accepts a --basis parameter which will take advantage

      of local history when making a new branch. This allows faster 

      branching of remote branches. Contributed by Aaron Bentley.

    * New tree format based on weave files, called version 5.

      Existing branches can be upgraded to this format using 

      'bzr upgrade'.

    * Symlinks are now versionable. Initial patch by 

      Erik Toubro Nielsen, updated to head by Robert Collins.

    * Executable bits are tracked on files. Patch from Gustavo

      Niemeyer.

    * 'bzr status' now shows unknown files inside a selected directory.

      Patch from Heikki Paajanen.

    * Merge conflicts are recorded in .bzr. Two new commands 'conflicts'

      and 'resolve' have needed added, which list and remove those 

      merge conflicts respectively. A conflicted tree cannot be committed

      in. Contributed by Aaron Bentley.

    * 'rm' is now an alias for 'remove'.

    * Stores now split out their content in a single byte prefixed hash,

      dropping the density of files per directory by 256. Contributed by

      Gustavo Niemeyer.

    * 'bzr diff -r branch:URL' will now perform a diff between two branches.

      Contributed by Robert Collins.

    * 'bzr log' with the default formatter will show merged revisions,

      indented to the right. Initial implementation contributed by Gustavo

      Niemeyer, made incremental by Robert Collins.

  INTERNALS:

    * Test case failures have the exception printed after the log 

      for your viewing pleasure.

    * InventoryEntry is now an abstract base class, use one of the

      concrete InventoryDirectory etc classes instead.

    * Branch raises an UnsupportedFormatError when it detects a 

      bzr branch it cannot understand. This allows for precise

      handling of such circumstances.

  TESTING:

    * Removed testsweet module so that tests can be run after 

      bzr installed by 'bzr selftest'.

    * 'bzr selftest' command-line arguments can now be partial ids

      of tests to run, e.g. 'bzr selftest test_weave'

bzr 0.0.9 2005-09-23

  BUG FIXES:

    * Fixed "branch -r" option.

    * Fix remote access to branches containing non-compressed history.

      (Robert Collins).

    * Better reliability of http server tests.  (John Arbash-Meinel)

    * Merge graph maximum distance calculation fix.  (Aaron Bentley)

    * Various minor bug in windows support have been fixed, largely in the

      test suite. Contributed by Alexander Belchenko.

  IMPROVEMENTS:

    * Status now accepts a -r argument to give status between chosen

      revisions. Contributed by Heikki Paajanen.

    * Revision arguments no longer use +/-/= to control ranges, instead

      there is a 'before' namespace, which limits the successive namespace.

      For example '$ bzr log -r date:yesterday..before:date:today' will

      select everything from yesterday and before today. Contributed by

      Robey Pointer

    * There is now a bzr.bat file created by distutils when building on 

      Windows. Contributed by Alexander Belchenko.

  INTERNALS:

    * Removed uuid() as it was unused.

    * Improved 'fetch' code for pulling revisions from one branch into

      another (used by pull, merged, etc.)

bzr 0.0.8 2005-09-20

  IMPROVEMENTS:

    * Adding a file whose parent directory is not versioned will

      implicitly add the parent, and so on up to the root. This means

      you should never need to explictly add a directory, they'll just

      get added when you add a file in the directory.  Contributed by

      Michael Ellerman.

    * Ignore .DS_Store (contains Mac metadata) by default.  Patch from

      Nir Soffer.

    * If you set BZR_EDITOR in the environment, it is checked in

      preference to EDITOR and the config file for the interactive commit

      editing program. Related to this is a bugfix where a missing program

      set in EDITOR would cause editing to fail, now the fallback program

      for the operating system is still tried.

    * Files that are not directories/symlinks/regular files will no longer

      cause bzr to fail, it will just ignore them by default. You cannot add

      them to the tree though - they are not versionable.

  INTERNALS:

    * Refactor xml packing/unpacking.

  BUG FIXES: 

    * Fixed 'bzr mv' by Ollie Rutherfurd.

    * Fixed strange error when trying to access a nonexistent http

      branch.

    * Make sure that the hashcache gets written out if it can't be

      read.

  PORTABILITY:

    * Various Windows fixes from Ollie Rutherfurd.

    * Quieten warnings about locking; patch from Matt Lavin.

bzr-0.0.7 2005-09-02

  NEW FEATURES:

    * ``bzr shell-complete`` command contributed by Clint Adams to

      help with intelligent shell completion.

    * New expert command ``bzr find-merge-base`` for debugging merges.

  ENHANCEMENTS:

    * Much better merge support.

    * merge3 conflicts are now reported with markers like '<<<<<<<'

      (seven characters) which is the same as CVS and pleases things

      like emacs smerge.

  BUG FIXES:

    * ``bzr upgrade`` no longer fails when trying to fix trees that

      mention revisions that are not present.

    * Fixed bugs in listing plugins from ``bzr plugins``.

    * Fix case of $EDITOR containing options for the editor.

    * Fix log -r refusing to show the last revision.

      (Patch from Goffredo Baroncelli.)

  CHANGES: