/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

mention the requirement to install Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
 
18
17
"""An adapter between a Git index and a Bazaar Working Tree"""
19
18
 
20
 
 
21
 
from cStringIO import (
22
 
    StringIO,
23
 
    )
24
 
import errno
25
 
from dulwich.objects import (
26
 
    Blob,
27
 
    )
28
19
import os
29
 
import stat
30
20
 
31
21
from bzrlib import (
32
 
    errors,
33
 
    ignores,
 
22
    inventory,
34
23
    lockable_files,
35
24
    lockdir,
36
 
    osutils,
37
25
    transport,
38
 
    tree,
 
26
    urlutils,
39
27
    workingtree,
40
28
    )
41
 
from bzrlib.decorators import (
42
 
    needs_read_lock,
43
 
    )
44
 
 
45
 
 
46
 
from bzrlib.plugins.git.inventory import (
47
 
    GitIndexInventory,
48
 
    )
49
 
from bzrlib.plugins.git.mapping import (
50
 
    GitFileIdMap,
51
 
    )
52
 
from bzrlib.plugins.git.tree import (
53
 
    changes_from_git_changes,
54
 
    tree_delta_from_git_changes,
55
 
    )
56
 
 
57
 
 
58
 
IGNORE_FILENAME = ".gitignore"
59
 
 
 
29
 
 
30
from dulwich.index import Index
60
31
 
61
32
class GitWorkingTree(workingtree.WorkingTree):
62
33
    """A Git working tree."""
63
34
 
64
 
    def __init__(self, bzrdir, repo, branch, index):
65
 
        self.basedir = bzrdir.root_transport.local_abspath('.')
 
35
    def __init__(self, bzrdir, repo, branch):
 
36
        self.basedir = bzrdir.transport.base
66
37
        self.bzrdir = bzrdir
67
38
        self.repository = repo
68
 
        self.mapping = self.repository.get_mapping()
69
39
        self._branch = branch
70
40
        self._transport = bzrdir.transport
71
41
 
72
 
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
 
42
        self.controldir = urlutils.join(self.repository._git.path, 'bzr')
73
43
 
74
44
        try:
75
45
            os.makedirs(self.controldir)
79
49
 
80
50
        self._control_files = lockable_files.LockableFiles(
81
51
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
 
52
 
82
53
        self._format = GitWorkingTreeFormat()
83
 
        self.index = index
84
 
        self.views = self._make_views()
85
 
        self._detect_case_handling()
86
 
 
87
 
    def extras(self):
88
 
        """Yield all unversioned files in this WorkingTree.
89
 
        """
90
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
91
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
92
 
                continue
93
 
            for filename in filenames:
94
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
95
 
                if not relpath in self.index:
96
 
                    yield relpath
97
 
 
 
54
 
 
55
        self.index = Index(os.path.join(self.repository._git.controldir(), 
 
56
            "index"))
 
57
 
 
58
    def lock_read(self):
 
59
        pass
98
60
 
99
61
    def unlock(self):
100
 
        # non-implementation specific cleanup
101
 
        self._cleanup()
102
 
 
103
 
        # reverse order of locking.
104
 
        try:
105
 
            return self._control_files.unlock()
106
 
        finally:
107
 
            self.branch.unlock()
 
62
        pass
108
63
 
109
64
    def is_control_filename(self, path):
110
65
        return os.path.basename(path) == ".git"
111
66
 
112
 
    def _rewrite_index(self):
113
 
        self.index.clear()
114
 
        for path, entry in self._inventory.iter_entries():
115
 
            if entry.kind == "directory":
116
 
                # Git indexes don't contain directories
117
 
                continue
118
 
            if entry.kind == "file":
119
 
                blob = Blob()
120
 
                try:
121
 
                    file, stat_val = self.get_file_with_stat(entry.file_id, path)
122
 
                except (errors.NoSuchFile, IOError):
123
 
                    # TODO: Rather than come up with something here, use the old index
124
 
                    file = StringIO()
125
 
                    from posix import stat_result
126
 
                    stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
127
 
                blob.set_raw_string(file.read())
128
 
            elif entry.kind == "symlink":
129
 
                blob = Blob()
130
 
                try:
131
 
                    stat_val = os.lstat(self.abspath(path))
132
 
                except (errors.NoSuchFile, OSError):
133
 
                    # TODO: Rather than come up with something here, use the 
134
 
                    # old index
135
 
                    from posix import stat_result
136
 
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
137
 
                blob.set_raw_string(entry.symlink_target)
138
 
            else:
139
 
                raise AssertionError("unknown kind '%s'" % entry.kind)
140
 
            # Add object to the repository if it didn't exist yet
141
 
            if not blob.id in self.repository._git.object_store:
142
 
                self.repository._git.object_store.add_object(blob)
143
 
            # Add an entry to the index or update the existing entry
144
 
            flags = 0 # FIXME
145
 
            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)
146
 
 
147
 
    def flush(self):
148
 
        # TODO: Maybe this should only write on dirty ?
149
 
        if self._control_files._lock_mode != 'w':
150
 
            raise errors.NotWriteLocked(self)
151
 
        self._rewrite_index()           
152
 
        self.index.write()
153
 
        self._inventory_is_modified = False
154
 
 
155
 
    def get_ignore_list(self):
156
 
        ignoreset = getattr(self, '_ignoreset', None)
157
 
        if ignoreset is not None:
158
 
            return ignoreset
159
 
 
160
 
        ignore_globs = set()
161
 
        ignore_globs.update(ignores.get_runtime_ignores())
162
 
        ignore_globs.update(ignores.get_user_ignores())
163
 
        if self.has_filename(IGNORE_FILENAME):
164
 
            f = self.get_file_byname(IGNORE_FILENAME)
165
 
            try:
166
 
                ignore_globs.update(ignores.parse_ignore_file(f))
167
 
            finally:
168
 
                f.close()
169
 
        self._ignoreset = ignore_globs
170
 
        return ignore_globs
171
 
 
172
 
    def set_last_revision(self, revid):
173
 
        self._change_last_revision(revid)
174
 
 
175
 
    def _reset_data(self):
176
 
        self._inventory_is_modified = False
177
 
        try:
178
 
            head = self.repository._git.head()
179
 
        except KeyError, name:
180
 
            raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
181
 
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(head))
182
 
        store = self.repository._git.object_store
183
 
        commit = store[head]
184
 
        try:
185
 
            file_id_map_sha = store[commit.tree][self.mapping.BZR_FILE_IDS_FILE][1]
186
 
        except KeyError:
187
 
            file_ids = {}
188
 
        else:
189
 
            file_ids = self.mapping.import_fileid_map(store[file_id_map_sha])
190
 
        fileid_map = GitFileIdMap(file_ids, self.mapping)
191
 
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
192
 
        self._set_inventory(result, dirty=False)
193
 
 
194
 
    @needs_read_lock
195
 
    def get_file_sha1(self, file_id, path=None, stat_value=None):
196
 
        if not path:
197
 
            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 []
 
67
    def _get_inventory(self):
 
68
        return inventory.Inventory()
 
69
 
 
70
    inventory = property(_get_inventory,
 
71
                         doc="Inventory of this Tree")
212
72
 
213
73
 
214
74
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
215
75
 
216
 
    @property
217
 
    def _matchingbzrdir(self):
218
 
        from bzrlib.plugins.git import LocalGitBzrDirFormat
219
 
        return LocalGitBzrDirFormat()
220
 
 
221
76
    def get_format_description(self):
222
77
        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
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
245
 
            specific_file=specific_files, require_versioned=require_versioned)
246
 
        if want_unversioned:
247
 
            for e in self.target.extras():
248
 
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
249
 
        return ret
250
 
 
251
 
    def iter_changes(self, include_unchanged=False, specific_files=None,
252
 
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
253
 
        changes = self._index.changes_from_tree(
254
 
            self.source._repository._git.object_store, self.source.tree, 
255
 
            want_unchanged=include_unchanged)
256
 
        # FIXME: Handle want_unversioned
257
 
        return changes_from_git_changes(changes, self.target.mapping, 
258
 
            specific_file=specific_files)
259
 
 
260
 
tree.InterTree.register_optimiser(InterIndexGitTree)