← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-25 18:42:17 UTC
  • mfrom: (2039.1.2 progress-cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20060925184217-fd144de117df49c3
cleanup progress properly when interrupted during fetch (#54000)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
20
20
"""
21
21
 
22
22
 
23
 
from bzrlib import (
24
 
    osutils,
25
 
    tree,
26
 
    )
 
23
from bzrlib import tree
27
24
from bzrlib.decorators import needs_read_lock, needs_write_lock
28
25
from bzrlib.osutils import splitpath
29
26
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER
93
90
            ids = [None] * len(files)
94
91
        else:
95
92
            assert(len(ids) == len(files))
96
 
            ids = [osutils.safe_file_id(file_id) for file_id in ids]
97
93
 
98
94
        if kinds is None:
99
95
            kinds = [None] * len(files)
104
100
            if self.is_control_filename(f):
105
101
                raise errors.ForbiddenControlFileError(filename=f)
106
102
            fp = splitpath(f)
 
103
            if len(fp) == 0:
 
104
                raise BzrError("cannot add top-level %r" % f)
107
105
        # fill out file kinds for all files [not needed when we stop 
108
106
        # caring about the instantaneous file kind within a uncommmitted tree
109
107
        #