← Back to branch summary

~lifeless/bzr-svn/loggerhead

« back to all changes in this revision

Viewing changes to workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2008-11-12 10:57:24 UTC
  • Revision ID: jelmer@samba.org-20081112105724-keh30in1q3qzt1v3
Remove some more unused imports, fix formatting of imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
16
16
"""Checkouts and working trees (working copies)."""
17
17
 
18
18
import bzrlib, bzrlib.add
19
 
from bzrlib import osutils, urlutils
20
 
from bzrlib.bzrdir import BzrDirFormat, BzrDir
21
 
from bzrlib.errors import (InvalidRevisionId, NotBranchError, NoSuchFile,
22
 
                           NoRepositoryPresent, 
23
 
                           NoWorkingTree, UnsupportedFormatError)
24
 
from bzrlib.inventory import Inventory, InventoryFile, InventoryLink
 
19
from bzrlib import (
 
20
        osutils,
 
21
        urlutils,
 
22
        )
 
23
from bzrlib.bzrdir import (
 
24
        BzrDirFormat,
 
25
        BzrDir,
 
26
        )
 
27
from bzrlib.errors import (
 
28
        InvalidRevisionId,
 
29
        NotBranchError,
 
30
        NoSuchFile,
 
31
        NoRepositoryPresent,
 
32
        NoWorkingTree,
 
33
        UnsupportedFormatError,
 
34
        )
 
35
from bzrlib.inventory import (
 
36
        Inventory,
 
37
        InventoryFile,
 
38
        InventoryLink,
 
39
        )
25
40
from bzrlib.lockable_files import LockableFiles
26
41
from bzrlib.lockdir import LockDir
27
42
from bzrlib.revision import NULL_REVISION
29
44
from bzrlib.transport import get_transport
30
45
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
31
46
 
 
47
import os
 
48
import urllib
 
49
 
32
50
import subvertpy
33
 
from subvertpy import properties, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY
 
51
from subvertpy import properties
34
52
from subvertpy.wc import *
 
53
 
 
54
from bzrlib.plugins.svn import (
 
55
        errors as bzrsvn_errors,
 
56
        svk,
 
57
        )
35
58
from bzrlib.plugins.svn.branch import SvnBranch
36
59
from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
37
 
from bzrlib.plugins.svn.errors import NotSvnBranchPath
38
60
from bzrlib.plugins.svn.format import get_rich_root_format
39
61
from bzrlib.plugins.svn.mapping import escape_svn_path
40
62
from bzrlib.plugins.svn.remote import SvnRemoteAccess
41
63
from bzrlib.plugins.svn.repository import SvnRepository
42
 
from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
43
 
from bzrlib.plugins.svn.transport import (SvnRaTransport, svn_config) 
 
64
from bzrlib.plugins.svn.transport import SvnRaTransport, svn_config
44
65
from bzrlib.plugins.svn.tree import SvnBasisTree
45
66
 
46
 
import os
47
 
import urllib
48
 
 
49
67
def update_wc(adm, basedir, conn, revnum):
50
68
    # FIXME: honor SVN_CONFIG_SECTION_HELPERS:SVN_CONFIG_OPTION_DIFF3_CMD
51
69
    # FIXME: honor SVN_CONFIG_SECTION_MISCELLANY:SVN_CONFIG_OPTION_USE_COMMIT_TIMES
397
415
            merges = parent_ids[1:]
398
416
        adm = self._get_wc(write_lock=True)
399
417
        try:
400
 
            svk_merges = parse_svk_features(self._get_svk_merges(self._get_base_branch_props()))
 
418
            svk_merges = svk.parse_svk_features(self._get_svk_merges(self._get_base_branch_props()))
401
419
 
402
420
            # Set svk:merge
403
421
            for merge in merges:
406
424
                except InvalidRevisionId:
407
425
                    pass
408
426
 
409
 
            adm.prop_set(SVN_PROP_SVK_MERGE, 
410
 
                         serialize_svk_features(svk_merges), self.basedir)
 
427
            adm.prop_set(svk.SVN_PROP_SVK_MERGE, 
 
428
                         svk.serialize_svk_features(svk_merges), self.basedir)
411
429
        finally:
412
430
            adm.close()
413
431
 
468
486
                    if ids is not None:
469
487
                        self._change_fileid_mapping(ids.next(), f, wc)
470
488
                except subvertpy.SubversionException, (_, num):
471
 
                    if num == ERR_ENTRY_EXISTS:
 
489
                    if num == subvertpy.ERR_ENTRY_EXISTS:
472
490
                        continue
473
 
                    elif num == ERR_WC_PATH_NOT_FOUND:
 
491
                    elif num == subvertpy.ERR_WC_PATH_NOT_FOUND:
474
492
                        raise NoSuchFile(path=f)
475
493
                    raise
476
494
            finally:
563
581
                self._get_changed_branch_props())
564
582
 
565
583
    def _get_svk_merges(self, base_branch_props):
566
 
        return base_branch_props.get(SVN_PROP_SVK_MERGE, "")
 
584
        return base_branch_props.get(svk.SVN_PROP_SVK_MERGE, "")
567
585
 
568
586
    def apply_inventory_delta(self, delta):
569
587
        assert delta == []
755
773
    def open_workingtree(self, _unsupported=False, recommend_upgrade=False):
756
774
        try:
757
775
            return SvnWorkingTree(self, self.local_path, self.open_branch())
758
 
        except NotSvnBranchPath, e:
 
776
        except bzrsvn_errors.NotSvnBranchPath, e:
759
777
            raise NoWorkingTree(self.local_path)
760
778
 
761
779
    def sprout(self, url, revision_id=None, force_new_repo=False, 
809
827
        try:
810
828
            branch = SvnBranch(repos, self.get_remote_bzrdir().branch_path)
811
829
        except subvertpy.SubversionException, (_, num):
812
 
            if num == ERR_WC_NOT_DIRECTORY:
 
830
            if num == subvertpy.ERR_WC_NOT_DIRECTORY:
813
831
                raise NotBranchError(path=self.base)
814
832
            raise
815
833