Merge error code improvements from 0.4.

[jelmer/subvertpy.git] / commit.py

diff --git a/commit.py b/commit.py
index 916be849836b977495c0981794f23178934a39f6..66e618f2b07d70219499c8630b6598b2322be8a4 100644 (file)
--- a/commit.py
+++ b/commit.py
@@ -21,8 +21,7 @@ import core
 from bzrlib import debug, osutils, urlutils
 from bzrlib.branch import Branch
 from bzrlib.errors import (BzrError, InvalidRevisionId, DivergedBranches, 
-                           UnrelatedBranches, AppendRevisionsOnlyViolation,
-                           )
+                           UnrelatedBranches, AppendRevisionsOnlyViolation)
 from bzrlib.inventory import Inventory
 from bzrlib.repository import RootCommitBuilder, InterRepository
 from bzrlib.revision import NULL_REVISION
@@ -32,8 +31,7 @@ from bzrlib.plugins.svn import properties
 
 from cStringIO import StringIO
 
-from bzrlib.plugins.svn import constants
-from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, ERR_REPOS_DISABLED_FEATURE
 from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features, 
                  parse_svk_features, SVN_PROP_SVK_MERGE)
 from bzrlib.plugins.svn.logwalker import lazy_dict
@@ -85,7 +83,7 @@ def set_svn_revprops(transport, revnum, revprops):
     for (name, value) in revprops.items():
         try:
             transport.change_rev_prop(revnum, name, value)
-        except SubversionException, (_, constants.ERR_REPOS_DISABLED_FEATURE):
+        except SubversionException, (_, ERR_REPOS_DISABLED_FEATURE):
             raise RevpropChangeFailed(name)
 
 
@@ -691,7 +689,7 @@ def push_revision_tree(target, config, source_repo, base_revid, revision_id,
     try:
         builder.commit(rev.message)
     except SubversionException, (_, num):
-        if num == constants.ERR_FS_TXN_OUT_OF_DATE:
+        if num == ERR_FS_TXN_OUT_OF_DATE:
             raise DivergedBranches(source, target)
         raise
     except ChangesRootLHSHistory: