Rev 1033: Merge 0.4. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Sat Mar 29 14:16:05 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1033
revision-id: jelmer at samba.org-20080329141602-6rvpvp7gicjecwuv
parent: jelmer at samba.org-20080327014900-52oab5j09do86tms
parent: jelmer at samba.org-20080329140957-7crrq8akj3l2rzgb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sat 2008-03-29 15:16:02 +0100
message:
Merge 0.4.
modified:
.bzrignore bzrignore-20060516185138-862ea098064007af
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
README README-20051120210643-bd274a2fef9aed6a
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
------------------------------------------------------------
revno: 950.1.92
revision-id: jelmer at samba.org-20080329140957-7crrq8akj3l2rzgb
parent: jelmer at samba.org-20080329043142-e07unn5fiw9blvc7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-03-29 15:09:57 +0100
message:
Merge some changes from the wiki into README.
modified:
.bzrignore bzrignore-20060516185138-862ea098064007af
README README-20051120210643-bd274a2fef9aed6a
------------------------------------------------------------
revno: 950.1.91
revision-id: jelmer at samba.org-20080329043142-e07unn5fiw9blvc7
parent: jelmer at samba.org-20080329041039-k180o95jf4jwijs6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-03-29 05:31:42 +0100
message:
more README updates
modified:
README README-20051120210643-bd274a2fef9aed6a
------------------------------------------------------------
revno: 950.1.90
revision-id: jelmer at samba.org-20080329041039-k180o95jf4jwijs6
parent: jelmer at samba.org-20080327015955-1wqocjrvab2a93dn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-03-29 05:10:39 +0100
message:
Improve description of bzr-svn somewhat, update outdated descriptions.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
README README-20051120210643-bd274a2fef9aed6a
------------------------------------------------------------
revno: 950.1.89
revision-id: jelmer at samba.org-20080327015955-1wqocjrvab2a93dn
parent: jelmer at samba.org-20080327011359-sj61cudcg73hve71
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-03-27 02:59:55 +0100
message:
Remove LogWalker.touches_path.
modified:
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
=== modified file '.bzrignore'
--- a/.bzrignore 2008-03-27 01:49:00 +0000
+++ b/.bzrignore 2008-03-29 14:16:02 +0000
@@ -13,3 +13,4 @@
repos.c
FAQ.html
README.html
+AUTHORS.html
=== modified file 'Makefile'
--- a/Makefile 2008-03-27 01:49:00 +0000
+++ b/Makefile 2008-03-29 14:16:02 +0000
@@ -8,7 +8,7 @@
RST2HTML ?= rst2html
TESTS ?= svn
-all:: build
+all:: build README.html FAQ.html AUTHORS.html
build::
$(SETUP) build
@@ -49,7 +49,7 @@
pydoctor::
$(PYDOCTOR) --make-html -c bzr-svn.cfg
-FAQ.html README.html: %.html: %
+FAQ.html README.html AUTHORS.html: %.html: %
$(RST2HTML) $< > $@
tags::
=== modified file 'README'
--- a/README 2008-02-27 14:37:04 +0000
+++ b/README 2008-03-29 14:09:57 +0000
@@ -6,31 +6,16 @@
Introduction
------------
-This directory contains a simple plugin that adds
-Subversion (http://subversion.tigris.org/) branch support to
-Bazaar (http://www.bazaar-vcs.org/). This allows ``bzr branch``, ``bzr push``,
-``bzr pull``, and ``bzr co`` to work directly against Subversion repositories.
+bzr-svn is a plugin that allows Bazaar_ direct access to Subversion_
+repositories. It allows most bzr commands to work directly against Subversion
+repositories, as if you were using bzr with a native bzr repository.
+
+.. _Bazaar: http://bazaar-vcs.org/
+.. _Subversion: http://subversion.tigris.org/
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.
-Dependencies
-------------
-
-You will need at least version 0.92 of Bazaar or higher.
-
-You also need a fairly recent version of the official Python bindings to the
-Subversion libraries. At the moment, the svn plugin only works with
-Subversion 1.5 (trunk). The python-subversion (not python-svn!) package
-in Ubuntu Feisty and Gutsy and Debian Etch, Lenny and Sid also contain the
-required changes.
-
-If you are running an older version of Python (under 2.5), you will also
-need to have the pysqlite package installed.
-
-In order to be able to use the ``svn-upgrade`` command (for those
-who used earlier versions of bzr-svn), you will need the bzr-rebase
-plugin (http://bazaar-vcs.org/BzrSvn).
Features
--------
@@ -44,12 +29,14 @@
Checkouts, lightweight checkouts and branching works.
+- Integrates well with Bazaar.
+
- Track Bazaar merges in Subversion. Merged revisions show up
as ghosts.
- Subversion working copies. Can be modified, queried
- ('bzr status' on a vanilla working copied created with
- 'svn co' works) and committed from.
+ (``bzr status`` on a svn- native working copy created with
+ ``svn co`` works) and committed from.
- Committing to Subversion from Bazaar.
@@ -58,14 +45,17 @@
- Follow branch copies. Revision history is not
truncated when a branch was copied in Subversion.
-- Efficiently uses network bandwidth.
-
-- Recognizes file metadata (executable bits, symlinks).
-
-- 'svn-import' command with functionality similar to svn2bzr.
-
-- Ability to track merges done with SVK (http://svk.elixus.org/)
- and write merges.
+- Efficiently uses network bandwidth.
+
+- Recognizes file metadata (executable bits, symbolic links).
+
+- 'svn-import' command with functionality similar to svn2bzr_.
+
+.. _svn2bzr: http://bazaar-vcs.org/svn2bzr
+
+- Ability to track merges done with SVK_ and write merges from SVK/Subversion branches in a format understandable by SVK.
+
+.. _SVK: http://svk.elixus.org/
- Generates consistent file ids and revision ids. Two branches made using
this plugin of the same Subversion branch will result in *exactly* the same
@@ -74,6 +64,60 @@
- Handles complex operations in Subversion: committing to two branches at
once, upgrading directories to branches, copies from early revisions, ...
+- Tested on Linux, Windows and Mac OS X.
+
+Documentation
+-------------
+
+bzr-svn can be used through the regular Bazaar user interface, see the
+`Bazaar Documentation Overview`_ for documentation on that.
+
+.. _Bazaar Documentation Overview: Documentation
+
+Some bzr-svn specific issues are answered by the FAQ_.
+
+.. _FAQ: http://samba.org/~jelmer/bzr-svn/FAQ.html
+
+The way Bazaar metadata is stored in Subversion and the other way around is specified in the `mapping specification`_.
+
+.. _mapping specification: BzrForeignBranches/Subversion/mapping
+
+Support
+-------
+Ask bzr-svn related questions on the `Bazaar mailing list`_ or in the
+#bzr IRC channel on Freenode_.
+
+.. _Bazaar mailing list: http://lists.canonical.com/listinfo/bazaar/
+.. _Freenode: http://www.freenode.net/
+
+Missing Features
+----------------
+
+Subversion File 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
+
+- '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. `#81463 <https://bugs.launchpad.net/bzr-svn/+bug/81463>`_
+
+- 'svn:externals'. Externals should be mapped to Bazaar 'by-reference'
+ nested branches and the other way around. This can't be implemented
+ this until Bazaars nested branch support lands. AaronBentley's work
+ in progress is at http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/.
+ This has been delayed until after 0.9 because of required repository
+ format changes.
+
+
+
Future Enhancements
-------------------
@@ -83,14 +127,10 @@
but the number of corner cases is wide, so support for this
has not been enabled by default yet.
-- Better 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.
-
- 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.
+- use svn_ra_replay() when using servers that have Subversion 1.4. Saves a
+ couple of roundtrips when fetching history.
- Shallow branches. Most of the existing Subversion repositories
are quite large and it would therefore be nice to be able to limit
@@ -99,24 +139,7 @@
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.
-- 'svn:externals'. Externals should be mapped to Bazaar 'by-reference'
- nested branches and the other way around. This can't be implemented
- this until Bazaars nested branch support lands. AaronBentley's work
- in progress is at http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/.
- This has been delayed until after 0.9 because of required repository
- format changes.
-
-- 'svn:mime-type'
-
-- 'svn:eol-style'
-
-- '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:
- Tracking copies.
@@ -131,12 +154,48 @@
Spec at https://launchpad.net/products/bzr/+spec/bzr-cpick-data
+Requirements
+------------
+
+Bazaar
+~~~~~~
+
+You will need a recent version of Bazaar, usually the release of Bazaar
+released in the same month as the release of bzr-svn you are using. bzr-svn
+will warn if the Bazaar release used is too old or too new.
+
+SQLite
+~~~~~~
+
+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.
+
+Python-Subversion >= 1.5
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+You also need a fairly recent version of the official Python bindings to the
+Subversion libraries. At the moment, the svn plugin only works with
+Subversion 1.5 (trunk). The python-subversion (not python-svn!) package
+in Ubuntu since Feisty and Debian since Etch also contain the
+required changes.
+
+The plugin requires a couple of fixes to the Python bindings for Subversion that are only available in Subversion 1.5 and higher. Subversion 1.5 has not been released yet, but packages with the appropriate patches applied to older versions are available for some platforms.
+
+bzr-rebase
+~~~~~~~~~~
+
+In order to be able to use the ``svn-upgrade`` command (for those
+who used versions of bzr-svn older than 0.4.0), you will need the `bzr-rebase`_
+plugin.
+
+.. _bzr-rebase: http://bazaar-vcs.org/Rebase
+
Bugs
----
-
+
Please file bug reports in launchpad. The product URL for bzr-svn is
-https://launchpad.net/products/bzr-svn/. The wiki for this
-plugin is at http://bazaar-vcs.org/BzrSvn.
+https://launchpad.net/bzr-svn/.
+
+The wiki for this plugin is at http://bazaar-vcs.org/BzrSvn.
Installation
------------
@@ -145,5 +204,18 @@
to check out branches from Subversion using bzr. Make sure the directory
name is 'svn'.
+Development
+-----------
+
+Unit testing
+~~~~~~~~~~~~
+To run the bzr-svn testsuite, simply run 'bzr selftest svn'
+
+Credits
+-------
+bzr-svn was written by JelmerVernooij_ with the help from various other people. See the AUTHORS file for a full list of contributors.
+
+.. _JelmerVernooij: http://samba.org/~jelmer/
+
..
vim: ft=rest
=== modified file 'branchprops.py'
--- a/branchprops.py 2008-03-27 01:49:00 +0000
+++ b/branchprops.py 2008-03-29 14:16:02 +0000
@@ -58,7 +58,7 @@
"""
assert isinstance(revnum, int)
assert isinstance(path, str)
- if not self.log.touches_path(path, revnum):
+ if not path in self.log.get_revision_paths(revnum):
return {}
current = self.get_properties(path, revnum)
if current == {}:
@@ -80,7 +80,7 @@
assert isinstance(path, str)
# If the path this property is set on didn't change, then
# the property can't have changed.
- if not self.log.touches_path(path, revnum):
+ if not path in self.log.get_revision_paths(revnum):
return ""
current = self.get_properties(path, revnum).get(name, "")
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-03-27 01:49:00 +0000
+++ b/logwalker.py 2008-03-29 14:16:02 +0000
@@ -258,18 +258,6 @@
return row[0]
- def touches_path(self, path, revnum):
- """Check whether path was changed in specified revision.
-
- :param path: Path to check
- :param revnum: Revision to check
- """
- self.fetch_revisions(revnum)
- self.mutter("touches path %r:%r" % (path, revnum))
- if revnum == 0:
- return (path == "")
- return (self.db.execute("select 1 from changed_path where path='%s' and rev=%d" % (path, revnum)).fetchone() is not None)
-
def find_children(self, path, revnum):
"""Find all children of path in revnum.
=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py 2008-03-24 04:52:30 +0000
+++ b/tests/test_logwalker.py 2008-03-27 01:59:55 +0000
@@ -377,48 +377,6 @@
('trunk', {'trunk/afile': ('A', None, -1),
'trunk': (u'A', None, -1)}, 1)], items)
- def test_touches_path(self):
- repos_url = self.make_client("a", "dc")
- self.build_tree({'dc/trunk/afile': "data"})
- self.client_add("dc/trunk")
- self.client_commit("dc", "My Message")
-
- walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
-
- self.assertTrue(walker.touches_path("trunk", 1))
-
- def test_touches_path_null(self):
- repos_url = self.make_client("a", "dc")
- self.build_tree({'dc/trunk/afile': "data"})
- self.client_add("dc/trunk")
- self.client_commit("dc", "My Message")
-
- walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
-
- self.assertTrue(walker.touches_path("", 0))
-
- def test_touches_path_not(self):
- repos_url = self.make_client("a", "dc")
- self.build_tree({'dc/trunk/afile': "data"})
- self.client_add("dc/trunk")
- self.client_commit("dc", "My Message")
-
- walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
-
- self.assertFalse(walker.touches_path("", 1))
-
- def test_touches_path_child(self):
- repos_url = self.make_client("a", "dc")
- self.build_tree({'dc/trunk/afile': "data"})
- self.client_add("dc/trunk")
- self.client_commit("dc", "My Message")
- self.build_tree({'dc/trunk/afile': "data2"})
- self.client_commit("dc", "My Message")
-
- walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
-
- self.assertFalse(walker.touches_path("trunk", 2))
-
def test_get_previous_root(self):
repos_url = self.make_client("a", "dc")
More information about the bazaar-commits
mailing list