Rev 1871: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1871
revision-id: jelmer at samba.org-20080908221559-tq3yyvhcf5uaya61
parent: jelmer at samba.org-20080908214147-g7svee4axmyfxgox
parent: jelmer at samba.org-20080908214051-el0k75rw1uzv20ha
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-09 00:15:59 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  tags.py                        tags.py-20080822211316-scblu3akdvu0b64c-1
    ------------------------------------------------------------
    revno: 1669.1.41
    revision-id: jelmer at samba.org-20080908214051-el0k75rw1uzv20ha
    parent: jelmer at samba.org-20080907205923-r531loa8e0nqdmjc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-09-08 23:40:51 +0200
    message:
      Properly convert errors raised when starting a commit.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      tags.py                        tags.py-20080822211316-scblu3akdvu0b64c-1
=== modified file 'NEWS'
--- a/NEWS	2008-09-08 04:03:30 +0000
+++ b/NEWS	2008-09-08 22:15:59 +0000
@@ -60,6 +60,8 @@
 
    * Avoid NoneType error when no revisions to push in "bzr dpush". (#267484)
 
+   * Properly convert errors raised when starting a commit. (#267899)
+
 bzr-svn 0.4.12	2008-09-01
 
   BUG FIXES

=== modified file 'commit.py'
--- a/commit.py	2008-09-08 21:41:47 +0000
+++ b/commit.py	2008-09-08 22:15:59 +0000
@@ -30,7 +30,7 @@
 from bzrlib.plugins.svn import core, mapping, properties
 from bzrlib.plugins.svn.core import SubversionException
 from bzrlib.plugins.svn.delta import send_stream
-from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, convert_svn_error
 from bzrlib.plugins.svn.svk import (
     generate_svk_feature, serialize_svk_features, 
     parse_svk_features, SVN_PROP_SVK_MERGE)
@@ -524,7 +524,7 @@
             conn = self.repository.transport.get_connection()
             assert self.supports_custom_revprops or self._svn_revprops.keys() == [properties.PROP_REVISION_LOG], \
                     "revprops: %r" % self._svn_revprops.keys()
-            self.editor = conn.get_commit_editor(
+            self.editor = convert_svn_error(conn.get_commit_editor)(
                     self._svn_revprops, done, None, False)
             try:
                 root = self.editor.open_root(self.base_revnum)
@@ -677,7 +677,7 @@
 
     conn = repository.transport.get_connection(parent)
     try:
-        ci = conn.get_commit_editor(revprops)
+        ci = convert_svn_error(conn.get_commit_editor)(revprops)
         try:
             root = ci.open_root()
             if deletefirst:
@@ -978,7 +978,7 @@
 def create_branch_prefix(repository, revprops, bp_parts, existing_bp_parts):
     conn = repository.transport.get_connection()
     try:
-        ci = conn.get_commit_editor(revprops)
+        ci = convert_svn_error(conn.get_commit_editor)(revprops)
         try:
             root = ci.open_root()
             name = None

=== modified file 'ra.c'
--- a/ra.c	2008-09-05 22:31:29 +0000
+++ b/ra.c	2008-09-08 22:15:59 +0000
@@ -737,10 +737,17 @@
 
 	ret->root = NULL;
 	ret->pool = Pool(NULL);
-	if (ret->pool == NULL)
+	if (ret->pool == NULL) {
+        PyObject_Del(ret);
 		return NULL;
+    }
 
 	ret->url = svn_path_canonicalize(url, ret->pool);
+    if (ret->url == NULL) {
+		apr_pool_destroy(ret->pool);
+        PyObject_Del(ret->pool);
+        return NULL;
+    }
 	if (!check_error(svn_ra_create_callbacks(&callbacks2, ret->pool))) {
 		apr_pool_destroy(ret->pool);
 		PyObject_Del(ret);
@@ -766,7 +773,7 @@
 		return NULL;
 	}
 	Py_BEGIN_ALLOW_THREADS
-	err = svn_ra_open2(&ret->ra, svn_path_canonicalize(url, ret->pool),
+	err = svn_ra_open2(&ret->ra, ret->url,
 			   callbacks2, ret, config_hash, ret->pool);
 	Py_END_ALLOW_THREADS
 	if (!check_error(err)) {

=== modified file 'tags.py'
--- a/tags.py	2008-09-08 17:21:44 +0000
+++ b/tags.py	2008-09-08 22:15:59 +0000
@@ -18,7 +18,7 @@
 from bzrlib.tag import BasicTags
 from bzrlib.trace import mutter
 
-from bzrlib.plugins.svn import commit, core, mapping, properties
+from bzrlib.plugins.svn import commit, core, errors as svn_errors, mapping, properties
 
 class SubversionTags(BasicTags):
     """Subversion tags object."""
@@ -58,7 +58,7 @@
         conn = self.repository.transport.get_connection(parent)
         deletefirst = (conn.check_path(urlutils.basename(path), self.repository.get_latest_revnum()) != core.NODE_NONE)
         try:
-            ci = conn.get_commit_editor(self._revprops("Add tag %s" % tag_name.encode("utf-8"),
+            ci = svn_errors.convert_svn_error(conn.get_commit_editor)(self._revprops("Add tag %s" % tag_name.encode("utf-8"),
                                         {tag_name.encode("utf-8"): tag_target}))
             try:
                 root = ci.open_root()
@@ -116,7 +116,7 @@
         try:
             if conn.check_path(urlutils.basename(path), self.repository.get_latest_revnum()) != core.NODE_DIR:
                 raise NoSuchTag(tag_name)
-            ci = conn.get_commit_editor(self._revprops("Remove tag %s" % tag_name.encode("utf-8"),
+            ci = svn_errors.convert_svn_error(conn.get_commit_editor)(self._revprops("Remove tag %s" % tag_name.encode("utf-8"),
                                         {tag_name: ""}))
             try:
                 root = ci.open_root()