/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
47
47
from bzrlib.plugins.git.inventory import (
48
48
    GitIndexInventory,
49
49
    )
50
 
from bzrlib.plugins.git.tree import (
51
 
    changes_from_git_changes,
52
 
    tree_delta_from_git_changes,
53
 
    )
54
50
 
55
51
 
56
52
IGNORE_FILENAME = ".gitignore"
82
78
        self.views = self._make_views()
83
79
        self._detect_case_handling()
84
80
 
85
 
    def extras(self):
86
 
        """Yield all unversioned files in this WorkingTree.
87
 
        """
88
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
89
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
90
 
                continue
91
 
            for filename in filenames:
92
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
93
 
                if not relpath in self.index:
94
 
                    yield relpath
95
 
 
96
 
 
97
81
    def unlock(self):
98
82
        # non-implementation specific cleanup
99
83
        self._cleanup()
133
117
                    from posix import stat_result
134
118
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
135
119
                blob.set_raw_string(entry.symlink_target)
136
 
            else:
137
 
                raise AssertionError("unknown kind '%s'" % entry.kind)
138
120
            # Add object to the repository if it didn't exist yet
139
121
            if not blob.id in self.repository._git.object_store:
140
122
                self.repository._git.object_store.add_object(blob)
188
170
                return None
189
171
            raise
190
172
 
191
 
    def revision_tree(self, revid):
192
 
        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):
193
176
 
194
 
    @needs_read_lock
195
 
    def conflicts(self):
196
 
        # FIXME:
197
 
        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)
198
180
 
199
181
 
200
182
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
201
183
 
202
 
    @property
203
 
    def _matchingbzrdir(self):
204
 
        from bzrlib.plugins.git import LocalGitBzrDirFormat
205
 
        return LocalGitBzrDirFormat()
206
 
 
207
184
    def get_format_description(self):
208
185
        return "Git Working Tree"
209
 
 
210
 
 
211
 
class InterIndexGitTree(tree.InterTree):
212
 
    """InterTree that works between a Git revision tree and an index."""
213
 
 
214
 
    def __init__(self, source, target):
215
 
        super(InterIndexGitTree, self).__init__(source, target)
216
 
        self._index = target.index
217
 
 
218
 
    @classmethod
219
 
    def is_compatible(cls, source, target):
220
 
        from bzrlib.plugins.git.repository import GitRevisionTree
221
 
        return (isinstance(source, GitRevisionTree) and 
222
 
                isinstance(target, GitWorkingTree))
223
 
 
224
 
    def compare(self, want_unchanged=False, specific_files=None,
225
 
                extra_trees=None, require_versioned=False, include_root=False,
226
 
                want_unversioned=False):
227
 
        changes = self._index.changes_from_tree(
228
 
            self.source._repository._git.object_store, self.source.tree, 
229
 
            want_unchanged=want_unchanged)
230
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
231
 
            specific_file=specific_files, require_versioned=require_versioned)
232
 
        if want_unversioned:
233
 
            for e in self.target.extras():
234
 
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
235
 
        return ret
236
 
 
237
 
    def iter_changes(self, include_unchanged=False, specific_files=None,
238
 
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
239
 
        changes = self._index.changes_from_tree(
240
 
            self.source._repository._git.object_store, self.source.tree, 
241
 
            want_unchanged=include_unchanged)
242
 
        # FIXME: Handle want_unversioned
243
 
        return changes_from_git_changes(changes, self.target.mapping, 
244
 
            specific_file=specific_files)
245
 
 
246
 
tree.InterTree.register_optimiser(InterIndexGitTree)