/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to workingtree.py

Fix syntax error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
21
21
from cStringIO import (
22
22
    StringIO,
23
23
    )
24
 
import errno
 
24
from dulwich.index import (
 
25
    Index,
 
26
    )
25
27
from dulwich.objects import (
26
28
    Blob,
27
29
    )
28
 
from dulwich.protocol import (
29
 
    ZERO_SHA,
30
 
    )
31
30
import os
32
31
import stat
33
32
 
34
33
from bzrlib import (
35
34
    errors,
36
 
    ignores,
 
35
    inventory,
37
36
    lockable_files,
38
37
    lockdir,
39
38
    osutils,
40
39
    transport,
41
 
    tree,
 
40
    urlutils,
42
41
    workingtree,
43
42
    )
44
43
from bzrlib.decorators import (
45
44
    needs_read_lock,
46
 
    )
47
 
 
48
 
 
49
 
from bzrlib.plugins.git.inventory import (
50
 
    GitIndexInventory,
51
 
    )
52
 
from bzrlib.plugins.git.tree import (
53
 
    changes_from_git_changes,
54
 
    tree_delta_from_git_changes,
55
 
    )
56
 
from bzrlib.plugins.git.mapping import (
57
 
    GitFileIdMap,
58
 
    )
59
 
 
60
 
IGNORE_FILENAME = ".gitignore"
 
45
    needs_write_lock,
 
46
    )
 
47
 
 
48
 
 
49
def inventory_from_index(basis_inventory, mapping, index):
 
50
    inv = inventory.Inventory(root_id=None)
 
51
    def add_parents(path):
 
52
        dirname, _ = osutils.split(path)
 
53
        file_id = inv.path2id(dirname)
 
54
        if file_id is None:
 
55
            if dirname == "":
 
56
                parent_fid = None
 
57
            else:
 
58
                parent_fid = add_parents(dirname)
 
59
            ie = inv.add_path(dirname, 'directory', mapping.generate_file_id(dirname), parent_fid)
 
60
            if ie.file_id in basis_inventory:
 
61
                ie.revision = basis_inventory[ie.file_id].revision
 
62
            file_id = ie.file_id
 
63
        return file_id
 
64
    for path, value in index.iteritems():
 
65
        assert isinstance(path, str)
 
66
        assert isinstance(value, tuple) and len(value) == 10
 
67
        (ctime, mtime, ino, dev, mode, uid, gid, size, sha, flags) = value
 
68
        old_file_id = basis_inventory.path2id(path)
 
69
        if old_file_id is None:
 
70
            file_id = mapping.generate_file_id(path)
 
71
        else:
 
72
            file_id = old_file_id
 
73
        if stat.S_ISLNK(mode):
 
74
            kind = 'symlink'
 
75
        else:
 
76
            assert stat.S_ISREG(mode)
 
77
            kind = 'file'
 
78
        ie = inv.add_path(path, kind, file_id, add_parents(path))
 
79
        if old_file_id is not None:
 
80
            ie.revision = basis_inventory[old_file_id].revision
 
81
 
 
82
    return inv
61
83
 
62
84
 
63
85
class GitWorkingTree(workingtree.WorkingTree):
64
86
    """A Git working tree."""
65
87
 
66
 
    def __init__(self, bzrdir, repo, branch, index):
 
88
    def __init__(self, bzrdir, repo, branch):
67
89
        self.basedir = bzrdir.root_transport.local_abspath('.')
68
90
        self.bzrdir = bzrdir
69
91
        self.repository = repo
71
93
        self._branch = branch
72
94
        self._transport = bzrdir.transport
73
95
 
74
 
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
 
96
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
75
97
 
76
98
        try:
77
99
            os.makedirs(self.controldir)
81
103
 
82
104
        self._control_files = lockable_files.LockableFiles(
83
105
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
 
106
 
84
107
        self._format = GitWorkingTreeFormat()
85
 
        self.index = index
 
108
 
 
109
        self.index_path = os.path.join(self.repository._git.controldir(), 
 
110
                                       "index")
 
111
        self.index = Index(self.index_path)
86
112
        self.views = self._make_views()
87
113
        self._detect_case_handling()
88
114
 
89
 
    def extras(self):
90
 
        """Yield all unversioned files in this WorkingTree.
91
 
        """
92
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
93
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
94
 
                continue
95
 
            for filename in filenames:
96
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
97
 
                if not relpath in self.index:
98
 
                    yield relpath
99
 
 
100
 
 
101
115
    def unlock(self):
102
116
        # non-implementation specific cleanup
103
117
        self._cleanup()
124
138
                except (errors.NoSuchFile, IOError):
125
139
                    # TODO: Rather than come up with something here, use the old index
126
140
                    file = StringIO()
127
 
                    from posix import stat_result
128
 
                    stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
129
 
                blob.set_raw_string(file.read())
 
141
                    stat_val = (0, 0, 0, 0, stat.S_IFREG | 0644, 0, 0, 0, 0, 0)
 
142
                blob._text = file.read()
130
143
            elif entry.kind == "symlink":
131
144
                blob = Blob()
132
 
                try:
133
 
                    stat_val = os.lstat(self.abspath(path))
134
 
                except (errors.NoSuchFile, OSError):
135
 
                    # TODO: Rather than come up with something here, use the 
136
 
                    # old index
137
 
                    from posix import stat_result
138
 
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
139
 
                blob.set_raw_string(entry.symlink_target)
140
 
            else:
141
 
                raise AssertionError("unknown kind '%s'" % entry.kind)
 
145
                stat_val = os.stat(self.abspath(path))
 
146
                blob._text = entry.symlink_target
142
147
            # Add object to the repository if it didn't exist yet
143
148
            if not blob.id in self.repository._git.object_store:
144
149
                self.repository._git.object_store.add_object(blob)
145
150
            # Add an entry to the index or update the existing entry
146
 
            flags = 0 # FIXME
147
 
            self.index[path.encode("utf-8")] = (stat_val.st_ctime, stat_val.st_mtime, stat_val.st_dev, stat_val.st_ino, stat_val.st_mode, stat_val.st_uid, stat_val.st_gid, stat_val.st_size, blob.id, flags)
 
151
            (mode, ino, dev, links, uid, gid, size, atime, mtime, ctime) = stat_val
 
152
            flags = 0
 
153
            self.index[path.encode("utf-8")] = (ctime, mtime, ino, dev, mode, uid, gid, size, blob.id, flags)
148
154
 
149
155
    def flush(self):
150
156
        # TODO: Maybe this should only write on dirty ?
151
157
        if self._control_files._lock_mode != 'w':
152
158
            raise errors.NotWriteLocked(self)
153
 
        self._rewrite_index()
 
159
        self._rewrite_index()           
154
160
        self.index.write()
155
161
        self._inventory_is_modified = False
156
162
 
157
 
    def get_ignore_list(self):
158
 
        ignoreset = getattr(self, '_ignoreset', None)
159
 
        if ignoreset is not None:
160
 
            return ignoreset
161
 
 
162
 
        ignore_globs = set()
163
 
        ignore_globs.update(ignores.get_runtime_ignores())
164
 
        ignore_globs.update(ignores.get_user_ignores())
165
 
        if self.has_filename(IGNORE_FILENAME):
166
 
            f = self.get_file_byname(IGNORE_FILENAME)
167
 
            try:
168
 
                ignore_globs.update(ignores.parse_ignore_file(f))
169
 
            finally:
170
 
                f.close()
171
 
        self._ignoreset = ignore_globs
172
 
        return ignore_globs
173
 
 
174
 
    def set_last_revision(self, revid):
175
 
        self._change_last_revision(revid)
176
 
 
177
163
    def _reset_data(self):
178
164
        self._inventory_is_modified = False
179
 
        try:
180
 
            head = self.repository._git.head()
181
 
        except KeyError, name:
182
 
            raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
183
 
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
184
 
        store = self.repository._git.object_store
185
 
        if head == ZERO_SHA:
186
 
            fileid_map = GitFileIdMap({}, self.mapping)
187
 
            basis_inv = None
188
 
        else:
189
 
            fileid_map = self.mapping.get_fileid_map(store.__getitem__,
190
 
                store[head].tree)
191
 
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
 
165
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
 
166
        result = inventory_from_index(basis_inv, self.mapping, self.index)
192
167
        self._set_inventory(result, dirty=False)
193
168
 
194
169
    @needs_read_lock
195
170
    def get_file_sha1(self, file_id, path=None, stat_value=None):
196
171
        if not path:
197
172
            path = self._inventory.id2path(file_id)
198
 
        try:
199
 
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
200
 
        except OSError, (num, msg):
201
 
            if num in (errno.EISDIR, errno.ENOENT):
202
 
                return None
203
 
            raise
204
 
 
205
 
    def revision_tree(self, revid):
206
 
        return self.repository.revision_tree(revid)
207
 
 
208
 
    @needs_read_lock
209
 
    def conflicts(self):
210
 
        # FIXME:
211
 
        return []
 
173
        return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
212
174
 
213
175
 
214
176
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
215
177
 
216
 
    @property
217
 
    def _matchingbzrdir(self):
218
 
        from bzrlib.plugins.git import LocalGitControlDirFormat
219
 
        return LocalGitControlDirFormat()
220
 
 
221
178
    def get_format_description(self):
222
179
        return "Git Working Tree"
223
 
 
224
 
 
225
 
class InterIndexGitTree(tree.InterTree):
226
 
    """InterTree that works between a Git revision tree and an index."""
227
 
 
228
 
    def __init__(self, source, target):
229
 
        super(InterIndexGitTree, self).__init__(source, target)
230
 
        self._index = target.index
231
 
 
232
 
    @classmethod
233
 
    def is_compatible(cls, source, target):
234
 
        from bzrlib.plugins.git.repository import GitRevisionTree
235
 
        return (isinstance(source, GitRevisionTree) and 
236
 
                isinstance(target, GitWorkingTree))
237
 
 
238
 
    def compare(self, want_unchanged=False, specific_files=None,
239
 
                extra_trees=None, require_versioned=False, include_root=False,
240
 
                want_unversioned=False):
241
 
        changes = self._index.changes_from_tree(
242
 
            self.source._repository._git.object_store, self.source.tree, 
243
 
            want_unchanged=want_unchanged)
244
 
        source_fileid_map = self.source.mapping.get_fileid_map(
245
 
            self.source._repository._git.object_store.__getitem__,
246
 
            self.source.tree)
247
 
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
248
 
            file_id = self.target.path2id(
249
 
                self.target.mapping.BZR_FILE_IDS_FILE)
250
 
            if file_id is None:
251
 
                target_fileid_map = {}
252
 
            else:
253
 
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
254
 
        else:
255
 
            target_fileid_map = {}
256
 
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
257
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
258
 
            (source_fileid_map, target_fileid_map),
259
 
            specific_file=specific_files, require_versioned=require_versioned)
260
 
        if want_unversioned:
261
 
            for e in self.target.extras():
262
 
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
263
 
        return ret
264
 
 
265
 
    def iter_changes(self, include_unchanged=False, specific_files=None,
266
 
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
267
 
        changes = self._index.changes_from_tree(
268
 
            self.source._repository._git.object_store, self.source.tree, 
269
 
            want_unchanged=include_unchanged)
270
 
        # FIXME: Handle want_unversioned
271
 
        return changes_from_git_changes(changes, self.target.mapping, 
272
 
            specific_file=specific_files)
273
 
 
274
 
tree.InterTree.register_optimiser(InterIndexGitTree)