Rev 491: Merge 0.3.4 release. in file:///data/jelmer/bzr-svn/0.4/
Jelmer Vernooij
jelmer at samba.org
Thu Jul 12 09:28:24 BST 2007
At file:///data/jelmer/bzr-svn/0.4/
------------------------------------------------------------
revno: 491
revision-id: jelmer at samba.org-20070624181404-olgk0xm9gvhl97rf
parent: jelmer at samba.org-20070624175251-v165quq77m6ey7ej
parent: jelmer at samba.org-20070615185425-t2urwi30eagritbl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-06-24 20:14:04 +0200
message:
Merge 0.3.4 release.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
README README-20051120210643-bd274a2fef9aed6a
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
------------------------------------------------------------
revno: 402.1.49.1.4
revision-id: jelmer at samba.org-20070615185425-t2urwi30eagritbl
parent: jelmer at samba.org-20070615152210-not914ipqp5mhv00
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Fri 2007-06-15 20:54:25 +0200
message:
start working on 0.3.5
------------------------------------------------------------
revno: 402.1.49.1.3
tags: bzr-svn-0.3.4
revision-id: jelmer at samba.org-20070615152210-not914ipqp5mhv00
parent: jelmer at samba.org-20070615143225-lpk366s7dx45vkja
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Fri 2007-06-15 17:22:10 +0200
message:
Don't overwrite BzrError.
------------------------------------------------------------
revno: 402.1.49.1.2
revision-id: jelmer at samba.org-20070615143225-lpk366s7dx45vkja
parent: jelmer at samba.org-20070611130023-qvbcpr6fblbmyj18
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Fri 2007-06-15 16:32:25 +0200
message:
Release 0.3.4
------------------------------------------------------------
revno: 402.1.49.1.1
revision-id: jelmer at samba.org-20070611130023-qvbcpr6fblbmyj18
parent: jelmer at samba.org-20070516182612-ax0t4hcgd8jp0eww
parent: jelmer at samba.org-20070524115757-3emdus7fwa9vvaxz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-06-11 15:00:23 +0200
message:
Merge some local changes.
------------------------------------------------------------
revno: 402.1.52
revision-id: jelmer at samba.org-20070524115757-3emdus7fwa9vvaxz
parent: jelmer at samba.org-20070520213144-u3ot57hw58kaj258
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Thu 2007-05-24 13:57:57 +0200
message:
Add note about name of directory.
=== modified file 'NEWS'
--- a/NEWS 2007-06-24 14:08:49 +0000
+++ b/NEWS 2007-06-24 18:14:04 +0000
@@ -38,18 +38,20 @@
* Implement SvnRemoteAccess.create_branch().
-bzr-svn 0.3.4 UNRELEASED
+bzr-svn 0.3.4 2007-06-15
BUG FIXES
* Check for a working pysqlite, rather than checking that the
first one found works. (#115026)
+ * Fix compatibility with Bazaar 0.17.
+
bzr-svn 0.3.3 2007-04-29
IMPROVEMENTS
- * Fix compatibility with 0.16 (#110164)
+ * Fix compatibility with Bazaar 0.16 (#110164)
* Don't do extra checkout before push if possible. (#91885)
=== modified file 'README'
--- a/README 2007-05-27 14:52:52 +0000
+++ b/README 2007-06-24 18:14:04 +0000
@@ -148,4 +148,5 @@
============
Simply place this directory in ~/.bazaar/plugins and you should be able
-to check out branches from Subversion using bzr.
+to check out branches from Subversion using bzr. Make sure the directory
+name is 'svn'.
=== modified file '__init__.py'
--- a/__init__.py 2007-06-17 19:46:41 +0000
+++ b/__init__.py 2007-06-24 18:14:04 +0000
@@ -25,7 +25,7 @@
from bzrlib.trace import warning
__version__ = '0.4.0'
-COMPATIBLE_BZR_VERSIONS = [(0, 15), (0, 16), (0, 17)]
+COMPATIBLE_BZR_VERSIONS = [(0, 15), (0, 16), (0, 17), (0, 18)]
def check_bzrlib_version(desired):
"""Check that bzrlib is compatible.
=== modified file 'checkout.py'
--- a/checkout.py 2007-06-24 14:08:49 +0000
+++ b/checkout.py 2007-06-24 18:14:04 +0000
@@ -113,15 +113,15 @@
pass
def get_ignore_list(self):
- ignores = [svn.wc.get_adm_dir()] + \
- svn.wc.get_default_ignores(svn_config)
+ ignores = set([svn.wc.get_adm_dir()])
+ ignores.update(svn.wc.get_default_ignores(svn_config))
def dir_add(wc, prefix):
ignorestr = svn.wc.prop_get(svn.core.SVN_PROP_IGNORE,
self.abspath(prefix).rstrip("/"), wc)
if ignorestr is not None:
for pat in ignorestr.splitlines():
- ignores.append("./"+os.path.join(prefix, pat))
+ ignores.add("./"+os.path.join(prefix, pat))
entries = svn.wc.entries_read(wc, False)
for entry in entries:
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2007-05-17 16:52:31 +0000
+++ b/tests/test_workingtree.py 2007-06-24 18:14:04 +0000
@@ -117,13 +117,13 @@
def test_get_ignore_list_empty(self):
self.make_client('a', 'dc')
tree = self.open_checkout("dc")
- self.assertEqual([".svn"] + svn.wc.get_default_ignores(svn_config), tree.get_ignore_list())
+ self.assertEqual(set([".svn"] + svn.wc.get_default_ignores(svn_config)), tree.get_ignore_list())
def test_get_ignore_list_onelevel(self):
self.make_client('a', 'dc')
self.client_set_prop("dc", "svn:ignore", "*.d\n*.c\n")
tree = self.open_checkout("dc")
- self.assertEqual([".svn"] + svn.wc.get_default_ignores(svn_config) + ["./*.d", "./*.c"], tree.get_ignore_list())
+ self.assertEqual(set([".svn"] + svn.wc.get_default_ignores(svn_config) + ["./*.d", "./*.c"]), tree.get_ignore_list())
def test_get_ignore_list_morelevel(self):
self.make_client('a', 'dc')
@@ -132,7 +132,7 @@
self.client_add("dc/x")
self.client_set_prop("dc/x", "svn:ignore", "*.e\n")
tree = self.open_checkout("dc")
- self.assertEqual([".svn"] + svn.wc.get_default_ignores(svn_config) + ["./*.d", "./*.c", "./x/*.e"], tree.get_ignore_list())
+ self.assertEqual(set([".svn"] + svn.wc.get_default_ignores(svn_config) + ["./*.d", "./*.c", "./x/*.e"]), tree.get_ignore_list())
def test_add_reopen(self):
self.make_client('a', 'dc')
More information about the bazaar-commits
mailing list