/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

  • Committer: Jelmer Vernooij
  • Date: 2009-09-10 13:13:15 UTC
  • mto: (0.200.602 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090910131315-6890xg58pl2jseml
Allow serving remote URLs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
36
36
    osutils,
37
37
    transport,
38
38
    tree,
 
39
    urlutils,
39
40
    workingtree,
40
41
    )
41
42
from bzrlib.decorators import (
46
47
from bzrlib.plugins.git.inventory import (
47
48
    GitIndexInventory,
48
49
    )
49
 
from bzrlib.plugins.git.tree import (
50
 
    changes_from_git_changes,
51
 
    tree_delta_from_git_changes,
52
 
    )
53
50
 
54
51
 
55
52
IGNORE_FILENAME = ".gitignore"
58
55
class GitWorkingTree(workingtree.WorkingTree):
59
56
    """A Git working tree."""
60
57
 
61
 
    def __init__(self, bzrdir, repo, branch, index):
 
58
    def __init__(self, bzrdir, repo, branch):
62
59
        self.basedir = bzrdir.root_transport.local_abspath('.')
63
60
        self.bzrdir = bzrdir
64
61
        self.repository = repo
66
63
        self._branch = branch
67
64
        self._transport = bzrdir.transport
68
65
 
69
 
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
 
66
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
70
67
 
71
68
        try:
72
69
            os.makedirs(self.controldir)
77
74
        self._control_files = lockable_files.LockableFiles(
78
75
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
79
76
        self._format = GitWorkingTreeFormat()
80
 
        self.index = index
 
77
        self.index = self.repository._git.open_index()
81
78
        self.views = self._make_views()
82
79
        self._detect_case_handling()
83
80
 
84
 
    def extras(self):
85
 
        """Yield all unversioned files in this WorkingTree.
86
 
        """
87
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
88
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
89
 
                continue
90
 
            for filename in filenames:
91
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
92
 
                if not relpath in self.index:
93
 
                    yield relpath
94
 
 
95
 
 
96
81
    def unlock(self):
97
82
        # non-implementation specific cleanup
98
83
        self._cleanup()
132
117
                    from posix import stat_result
133
118
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
134
119
                blob.set_raw_string(entry.symlink_target)
135
 
            else:
136
 
                raise AssertionError("unknown kind '%s'" % entry.kind)
137
120
            # Add object to the repository if it didn't exist yet
138
121
            if not blob.id in self.repository._git.object_store:
139
122
                self.repository._git.object_store.add_object(blob)
171
154
 
172
155
    def _reset_data(self):
173
156
        self._inventory_is_modified = False
174
 
        try:
175
 
            head = self.repository._git.head()
176
 
        except KeyError, name:
177
 
            raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
178
 
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
179
 
        store = self.repository._git.object_store
180
 
        fileid_map = self.mapping.get_fileid_map(store.__getitem__,
181
 
            store[head].tree)
182
 
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
 
157
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
 
158
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
 
159
            self.repository._git.object_store)
183
160
        self._set_inventory(result, dirty=False)
184
161
 
185
162
    @needs_read_lock
193
170
                return None
194
171
            raise
195
172
 
196
 
    def revision_tree(self, revid):
197
 
        return self.repository.revision_tree(revid)
 
173
    def iter_changes(self, from_tree, include_unchanged=False,
 
174
                     specific_files=None, pb=None, extra_trees=None,
 
175
                     require_versioned=True, want_unversioned=False):
198
176
 
199
 
    @needs_read_lock
200
 
    def conflicts(self):
201
 
        # FIXME:
202
 
        return []
 
177
        intertree = tree.InterTree.get(from_tree, self)
 
178
        return intertree.iter_changes(include_unchanged, specific_files, pb,
 
179
            extra_trees, require_versioned, want_unversioned=want_unversioned)
203
180
 
204
181
 
205
182
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
206
183
 
207
 
    @property
208
 
    def _matchingbzrdir(self):
209
 
        from bzrlib.plugins.git import LocalGitBzrDirFormat
210
 
        return LocalGitBzrDirFormat()
211
 
 
212
184
    def get_format_description(self):
213
185
        return "Git Working Tree"
214
 
 
215
 
 
216
 
class InterIndexGitTree(tree.InterTree):
217
 
    """InterTree that works between a Git revision tree and an index."""
218
 
 
219
 
    def __init__(self, source, target):
220
 
        super(InterIndexGitTree, self).__init__(source, target)
221
 
        self._index = target.index
222
 
 
223
 
    @classmethod
224
 
    def is_compatible(cls, source, target):
225
 
        from bzrlib.plugins.git.repository import GitRevisionTree
226
 
        return (isinstance(source, GitRevisionTree) and 
227
 
                isinstance(target, GitWorkingTree))
228
 
 
229
 
    def compare(self, want_unchanged=False, specific_files=None,
230
 
                extra_trees=None, require_versioned=False, include_root=False,
231
 
                want_unversioned=False):
232
 
        changes = self._index.changes_from_tree(
233
 
            self.source._repository._git.object_store, self.source.tree, 
234
 
            want_unchanged=want_unchanged)
235
 
        source_fileid_map = self.source.mapping.get_fileid_map(
236
 
            self.source._repository._git.object_store.__getitem__,
237
 
            self.source.tree)
238
 
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
239
 
            try:
240
 
                file_id = self.target.path2id(
241
 
                    self.target.mapping.BZR_FILE_IDS_FILE)
242
 
            except errors.NoSuchId:
243
 
                target_fileid_map = {}
244
 
            else:
245
 
                target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
246
 
        else:
247
 
            target_fileid_map = {}
248
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
249
 
            (source_fileid_map, target_fileid_map),
250
 
            specific_file=specific_files, require_versioned=require_versioned)
251
 
        if want_unversioned:
252
 
            for e in self.target.extras():
253
 
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
254
 
        return ret
255
 
 
256
 
    def iter_changes(self, include_unchanged=False, specific_files=None,
257
 
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
258
 
        changes = self._index.changes_from_tree(
259
 
            self.source._repository._git.object_store, self.source.tree, 
260
 
            want_unchanged=include_unchanged)
261
 
        # FIXME: Handle want_unversioned
262
 
        return changes_from_git_changes(changes, self.target.mapping, 
263
 
            specific_file=specific_files)
264
 
 
265
 
tree.InterTree.register_optimiser(InterIndexGitTree)