← Back to branch summary

~gagern/bzr-svn/bug242321

« back to all changes in this revision

Viewing changes to workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-05 17:54:39 UTC
  • Revision ID: jelmer@samba.org-20080605175439-4qlkiutmdxkgh1o7
Move definition of error codes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
36
36
from bzrlib.plugins.svn.branch import SvnBranch
37
37
from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
38
38
from bzrlib.plugins.svn.convert import SvnConverter
39
 
from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
 
39
from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoSvnRepositoryPresent, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY
40
40
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS, 
41
41
                     SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
42
42
                     generate_revision_metadata)
457
457
                commit_info = svn.client.commit3(specific_files, True, False, 
458
458
                                                 self.client_ctx)
459
459
            except SubversionException, (_, num):
460
 
                if num == svn.core.SVN_ERR_FS_TXN_OUT_OF_DATE:
 
460
                if num == ERR_FS_TXN_OUT_OF_DATE:
461
461
                    raise OutOfDateTree(self)
462
462
                raise
463
463
        except:
541
541
                    if ids is not None:
542
542
                        self._change_fileid_mapping(ids.next(), f, wc)
543
543
                except SubversionException, (_, num):
544
 
                    if num == svn.core.SVN_ERR_ENTRY_EXISTS:
 
544
                    if num == ERR_ENTRY_EXISTS:
545
545
                        continue
546
 
                    elif num == svn.core.SVN_ERR_WC_PATH_NOT_FOUND:
 
546
                    elif num == ERR_WC_PATH_NOT_FOUND:
547
547
                        raise NoSuchFile(path=f)
548
548
                    raise
549
549
            finally:
790
790
            branch = SvnBranch(self.remote_transport.base, repos, 
791
791
                               self.remote_bzrdir.branch_path)
792
792
        except SubversionException, (_, num):
793
 
            if num == svn.core.SVN_ERR_WC_NOT_DIRECTORY:
 
793
            if num == ERR_WC_NOT_DIRECTORY:
794
794
                raise NotBranchError(path=self.base)
795
795
            raise
796
796