Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 110 and 111
Revision 110 as of 2007-05-18 16:21:13
Size: 10655
Comment: convert to rst
Revision 111 as of 2007-05-18 18:34:46
Size: 10085
Comment:
Deletions are marked like this. Additions are marked like this.
Line 30: Line 30:
 * [http://people.samba.org/bzr/jelmer/samba/3.0 Samba 3] - Original at svn://svn.samba.org/samba/branches/SAMBA_3_0
 * [http://people.samba.org/bzr/jelmer/samba/4.0 Samba 4] - Original at svn://svn.samba.org/samba/branches/SAMBA_4_0
 * [http://people.samba.org/bzr/jelmer/samba/docs Samba docs] - Original at svn://svn.samba.org/samba-docs/trunk
 * [http://people.samba.org/bzr/jelmer/svn/trunk Subversion trunk] - Original at http://svn.collab.net/repos/svn/trunk
 * [http://people.samba.org/bzr/jelmer/svn/
1.3.x Subversion 1.3.x] - Original at http://svn.collab.net/repos/svn/branches/1.3.x
 * [http://people.samba.org/bzr/jelmer/svn/1.4.x Subversion 1.4.x] - Original at http://svn.collab.net/repos/svn/branches/1.4.x
 * [http://people.samba.org/bzr/jelmer/svn/lorikeet-trunk Lorikeet trunk] - Original at svn://svn.samba.org/lorikeet/trunk
 * [http://people.samba.org/bzr/jelmer/samba/build-farm-trunk/ Build Farm trunk] - Original at svn://svn.samba.org/build-farm/trunk
 * [http://people.samba.org/bzr/jelmer/pkg-samba/samba4/ Samba4 Debian package] - Original at svn+ssh://svn.debian.org/svn/pkg-samba/branches/samba4
 * [http://people.samba.org/bzr/jelmer/pkg-samba/sid/ Samba3 Sid Debian package] - Original at svn+ssh://svn.debian.org/svn/pkg-samba/branches/sid
 * [http://people.samba.org/bzr/jelmer/wireshark/trunk Wireshark] - Original at http://anonsvn.wireshark.org/wireshark/trunk
 * [http://people.samba.org/bzr/jelmer/samba-pdbsql/trunk Samba pdbsql] - Original at https://svn.sourceforge.net/svnroot/pdbsql/trunk/samba-pdbsql
 * [http://people.samba.org/bzr/jelmer/mirror/cups/trunk CUPS Trunk] - Original at http://svn.easysw.com/public/cups/trunk
 * [http://people.samba.org/bzr/jelmer/mirror/cups/branches/kerberos CUPS Kerberos] - Original at http://svn.easysw.com/public/cups/branches/kerberos
 * `Samba 3 <http://people.samba.org/bzr/jelmer/samba/3.0>`_ - Original at svn://svn.samba.org/samba/branches/SAMBA_3_0
 * `Samba 4 <http://people.samba.org/bzr/jelmer/samba/4.0>`_ - Original at svn://svn.samba.org/samba/branches/SAMBA_4_0
 * `Samba docs <http://people.samba.org/bzr/jelmer/samba/docs>`_ - Original at svn://svn.samba.org/samba-docs/trunk
 * `
Subversion trunk <http://people.samba.org/bzr/jelmer/svn/trunk>`_ - Original at http://svn.collab.net/repos/svn/trunk
 * `Subversion 1.3.x <http://people.samba.org/bzr/jelmer/svn/1.3.x>`_ - Original at http://svn.collab.net/repos/svn/branches/1.3.x
 * `Subversion 1.4.x <http://people.samba.org/bzr/jelmer/svn/1.4.x>`_ - Original at http://svn.collab.net/repos/svn/branches/1.4.x
 * `Lorikeet trunk <http://people.samba.org/bzr/jelmer/svn/lorikeet-trunk>`_ Original at svn://svn.samba.org/lorikeet/trunk
 * `Build Farm trunk <http://people.samba.org/bzr/jelmer/samba/build-farm-trunk/>`_ - Original at svn://svn.samba.org/build-farm/trunk
 * `Samba4 Debian package <http://people.samba.org/bzr/jelmer/pkg-samba/samba4/>`_ - Original at svn+ssh://svn.debian.org/svn/pkg-samba/branches/samba4
 * `Samba3 Sid Debian package <http://people.samba.org/bzr/jelmer/pkg-samba/sid/>`_ - Original at svn+ssh://svn.debian.org/svn/pkg-samba/branches/sid
 * `Wireshark <http://people.samba.org/bzr/jelmer/wireshark/trunk>`_ - Original at http://anonsvn.wireshark.org/wireshark/trunk
 * `Samba pdbsql <http://people.samba.org/bzr/jelmer/samba-pdbsql/trunk>`_ - Original at https://svn.sourceforge.net/svnroot/pdbsql/trunk/samba-pdbsql
 * `CUPS Trunk <http://people.samba.org/bzr/jelmer/mirror/cups/trunk>`_ - Original at http://svn.easysw.com/public/cups/trunk
 * `CUPS Kerberos <http://people.samba.org/bzr/jelmer/mirror/cups/branches/kerberos>`_ - Original at http://svn.easysw.com/public/cups/branches/kerberos
Line 54: Line 54:
* Connecting to remote Subversion repositories over all protocols supported by Subversion itself (at present:         svn://, svn+ssh://, http:// (webdav), file://) as well as dump files. Checkouts, lightweight checkouts and branching works. * Connecting to remote Subversion repositories over all protocols supported by Subversion itself (at present: svn://, svn+ssh://, http:// (webdav), file://) as well as dump files. Checkouts, lightweight checkouts and branching works.
Line 58: Line 58:
* Subversion working copies. Can be modified, queried ({{{bzr status}}} on a svn- native working copy created with {{{svn co}}} works) and committed from. * Subversion working copies. Can be modified, queried (``bzr status`` on a svn- native working copy created with ``svn co`` works) and committed from.
Line 62: Line 62:
* Push Bazaar revisions to Subversion. These revisions will show up in Subversion as a commit with the pushed revision as one of the parents. * Push Bazaar revisions to Subversion.
Line 68: Line 68:
* Recognizes file metadata (executable bits, symlinks).

* 'svn-import' command with functionality similar to ["svn2bzr"].
* Recognizes file metadata (executable bits, symbolic links).

* 'svn-import' command with functionality similar to svn2bzr_.
Line 76: Line 76:
* Handles complex operations in Subversion: committing to two branches at once, upgrading directories to branches,
  .
copies from early revisions, ...
* Handles complex operations in Subversion: committing to two branches at once, upgrading directories to branches, copies from early revisions, ...
Line 88: Line 87:
* Renames. Initial work has been done to support this, but the number of corner cases is wide, so support for this
  . has not been enabled by default yet.

* "True" push. This requires storing the Bazaar inventory and revision in Subversion revision properties.
  . Ideally, revision id aliases would have to be used so the revision id that is being 'overriden' can still exist. Once this is implemented, it would also be possible and make sense to store GPG signatures for commits in Subversion branches. This might require also storing 'bzr:inventory' and 'bzr:revision' properties in order to make sure the sha1's for a revision keep matching. http://people.samba.org/bzr/jelmer/bzr-svn/customrevids
* Renames. Initial work has been done to support this, but the number of corner cases is wide, so support for this has not been enabled by default yet.
Line 145: Line 140:
* [http://samba.org/~jelmer/bzr/bzr-svn-0.3.3.tar.gz 0.3.3] (works with Bazaar 0.16 and higher)
* [http://samba.org/~jelmer/bzr/bzr-svn-0.3.2.tar.gz 0.3.2] (works with Bazaar 0.15 and higher)
* [http://samba.org/~jelmer/bzr/bzr-svn-0.3.1.tar.gz 0.3.1] (works with Bazaar 0.14 and higher)
* [http://samba.org/~jelmer/bzr/bzr-svn-0.3.tar.gz 0.3] (works with Bazaar 0.14 and higher)
* [http://samba.org/~jelmer/bzr/bzr-svn-0.2.tar.gz 0.2] (works with Bazaar 0.13 and higher)
* [http://samba.org/~jelmer/bzr/bzr-svn-0.1.tar.gz 0.1] (works with Bazaar 0.8 and higher)
* 0.3.3_ (works with Bazaar 0.16 and higher)
* 0.3.2_ (works with Bazaar 0.15 and higher)
* 0.3.1_ (works with Bazaar 0.14 and higher)
* 0.3_ (works with Bazaar 0.14 and higher)
* 0.2_ (works with Bazaar 0.13 and higher)
* 0.1_ (works with Bazaar 0.8 and higher)

.. _0.3.3: http://samba.org/~jelmer/bzr/bzr-svn-0.3.3.tar.gz
.. _0.3.2: http://samba.org/~jelmer/bzr/bzr-svn-0.3.2.tar.gz
.. _0.3.1: http://samba.org/~jelmer/bzr/bzr-svn-0.3.1.tar.gz
.. _0.3: http://samba.org/~jelmer/bzr/bzr-svn-0.3.tar.gz
.. _0.2: http://samba.org/~jelmer/bzr/bzr-svn-0.2.tar.gz
.. _0.1: http://samba.org/~jelmer/bzr/bzr-svn-0.1.tar.gz
Line 162: Line 164:
```
$ tar xvfj subversion-1.4.3.tar.bz2
$ cd subversion-1.4.3
$ ./autogen.sh --release
$ ./configure
$ make
$ make check-swig-py
$ sudo make install install-swig-py
```


If you are using Python 2.4, you will need to have the pysqlite module installed. Python 2.5 and higher have  sqlite support built in.
  $ tar xvfj subversion-1.4.3.tar.bz2
  $ cd subversion-1.4.3
  $ ./autogen.sh --release
  $ ./configure
  $ make
  $ make check-swig-py
  $ sudo make install install-swig-py

If you are using Python 2.4, you will need to have the pysqlite module installed. Python 2.5 and higher have sqlite support built in.
Line 176: Line 176:
An older patch for Subversion 1.3.2 is available [http://people.samba.org/bzr/jelmer/subversion-1.3.2-pythonfixes.diff here] An `older patch for Subversion 1.3.2<http://people.samba.org/bzr/jelmer/subversion-1.3.2-pythonfixes.diff>` is available 
Line 206: Line 206:
bzr-svn was written by JelmerVernooij with the help from various other people. See the AUTHORS file in the tarball for a list. bzr-svn was written by JelmerVernooij_ with the help from various other people. See the AUTHORS file in the tarball for a list.

Introduction

This plugin allows bzr direct access to Subversion repositories. This allows bzr branch, bzr push, bzr pull, and bzr co to work directly against Subversion repositories.

The plugin can at the moment be used to commit to, pull from, merge from, push to and view logs of Subversion branches from Bazaar.

Example branches

All created by simply running bzr branch ORIGINAL-URL.

More automatically imported branches can be found at http://people.samba.org/bzr/jelmer/mirror .

If you are having problems checking out a particular branch, please file a bug report and include the branch URL (if the branch is public) and the backtrace.

Features

The following features are currently present:

  • Connecting to remote Subversion repositories over all protocols supported by Subversion itself (at present: svn://, svn+ssh://, http:// (webdav), file://) as well as dump files. Checkouts, lightweight checkouts and branching works.
  • Track Bazaar merges in Subversion. Merged revisions show up as ghosts.
  • Subversion working copies. Can be modified, queried (bzr status on a svn- native working copy created with svn co works) and committed from.
  • Committing to Subversion from Bazaar.
  • Push Bazaar revisions to Subversion.
  • Follow branch copies. Revision history is not truncated when a branch was copied in Subversion.
  • Efficiently uses network bandwidth.
  • Recognizes file metadata (executable bits, symbolic links).
  • 'svn-import' command with functionality similar to svn2bzr.
  • Ability to track merges done with SVK (http://svk.elixus.org/) and write merges from SVK/Svn branches in a format understandable by SVK.
  • Generates consistent file ids and revision ids. Two branches made using this plugin of the same Subversion branch will result in exactly the same Bazaar branch.
  • Handles complex operations in Subversion: committing to two branches at once, upgrading directories to branches, copies from early revisions, ...

Future Enhancements

In the future, I also hope to support:

Features

  • Renames. Initial work has been done to support this, but the number of corner cases is wide, so support for this has not been enabled by default yet.
  • Proper Windows support. Most of the code depends on '/' being the path separator at the moment.
  • 'svn:externals'. Externals should be mapped to Bazaar 'by-reference' nested branches and the other way around. Work on progress in http://people.samba.org/bzr/jelmer/bzr-svn/nestedtrees
  • tags

Performance

Network-wise (both bandwidth and roundtrips), the plugin is in good shape. However, it is currently quite CPU-intensive for no good reason and I hope to make a couple of improvements in that area. * More efficient use of CPU

  • Override implementation of get_revision_delta(). Will speed up 'bzr log -v'
  • use svn_ra_replay() on systems that have Subversion 1.4. Saves a couple of roundtrips when fetching history. Initial work in branch at http://people.samba.org/bzr/jelmer/bzr-svn/replay
  • implement svn_ra_get_dir_revs() in Subversion to fetch the properties set on a specific directory all at once.
  • Something in Subversion or the Python-Subversion bindings appears to be leaking a lot of memory.

Properties

Some Subversion properties can currently not be represented in Bazaar and are therefore ignored for the time being:

  • 'svn:ignore' is not imported. There should be a `Repository.get_ignores(revid)' call in Bazaar rather than a magic '.bzrignore' file. Spec at https://launchpad.net/products/bzr/+spec/new-ignore-rules

    System Message: WARNING/2 (<string>, line 115); backlink

    Inline interpreted text or phrase reference start-string without end-string.

  • 'svn:mime-type'

  • 'svn:eol-style'. Requires eol support in Bazaar.

  • 'svn:keywords'. Requires keywords support in Bazaar. Spec at https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion

Other features currently held back by Bazaars feature set:

Features held back by Subversion:

Releases

  • 0.3.3 (works with Bazaar 0.16 and higher)
  • 0.3.2 (works with Bazaar 0.15 and higher)
  • 0.3.1 (works with Bazaar 0.14 and higher)
  • 0.3 (works with Bazaar 0.14 and higher)
  • 0.2 (works with Bazaar 0.13 and higher)
  • 0.1 (works with Bazaar 0.8 and higher)

Debian/Ubuntu packages for 0.3.2 are available from http://samba.org/~jelmer/debian/. Ubuntu feisty already contains the latest release.

Requirements

The plugin requires a couple of fixes to the Python bindings for Subversion that are only available in Subversion 1.5 (trunk). Debian/Ubuntu packages with these fixes backported are available in Ubuntu Edgy & Feisty and Debian Sid & Etch. You need the [http://packages.ubuntu.com/edgy/python/python-subversion python-subversion] and [http://packages.ubuntu.com/edgy/libs/libsvn0 libsvn0] packages.

A patch against Subversion 1.4.3 is also available at http://samba.org/~metze/subversion-1.4.0-metze-python-bindings.patch. To build Subversions' Python bindings, run:

$ tar xvfj subversion-1.4.3.tar.bz2 $ cd subversion-1.4.3 $ ./autogen.sh --release $ ./configure $ make $ make check-swig-py $ sudo make install install-swig-py

If you are using Python 2.4, you will need to have the pysqlite module installed. Python 2.5 and higher have sqlite support built in.

After ensuring these dependencies are met, you should be able to check out branches from Subversion using regular bzr commands.

An older patch for Subversion 1.3.2<http://people.samba.org/bzr/jelmer/subversion-1.3.2-pythonfixes.diff> is available

Installation instructions for Fedora/Redhat are on https://planning.acm.org/hq/documentation/version-control/installing-bzr-svn

Installation instructions for Gentoo are on http://blogger.malept.com/2007/03/awn-bzr-branch-bazaar-overlay.html

Bugs

Please file bug reports in launchpad. The product URL for bzr-svn is https://launchpad.net/bzr-svn/.

Development

Branches

Unit testing

Simply run 'bzr selftest svn'

Credits

bzr-svn was written by JelmerVernooij with the help from various other people. See the AUTHORS file in the tarball for a list.