/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
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
 
17
18
"""An adapter between a Git index and a Bazaar Working Tree"""
18
19
 
 
20
 
 
21
from cStringIO import (
 
22
    StringIO,
 
23
    )
 
24
import errno
 
25
from dulwich.objects import (
 
26
    Blob,
 
27
    )
19
28
import os
 
29
import stat
20
30
 
21
31
from bzrlib import (
22
 
    inventory,
 
32
    errors,
 
33
    ignores,
23
34
    lockable_files,
24
35
    lockdir,
 
36
    osutils,
25
37
    transport,
 
38
    tree,
26
39
    urlutils,
27
40
    workingtree,
28
41
    )
29
 
 
30
 
from dulwich.index import Index
 
42
from bzrlib.decorators import (
 
43
    needs_read_lock,
 
44
    )
 
45
 
 
46
 
 
47
from bzrlib.plugins.git.inventory import (
 
48
    GitIndexInventory,
 
49
    )
 
50
 
 
51
 
 
52
IGNORE_FILENAME = ".gitignore"
 
53
 
31
54
 
32
55
class GitWorkingTree(workingtree.WorkingTree):
33
56
    """A Git working tree."""
34
57
 
35
58
    def __init__(self, bzrdir, repo, branch):
36
 
        self.basedir = bzrdir.transport.base
 
59
        self.basedir = bzrdir.root_transport.local_abspath('.')
37
60
        self.bzrdir = bzrdir
38
61
        self.repository = repo
 
62
        self.mapping = self.repository.get_mapping()
39
63
        self._branch = branch
40
64
        self._transport = bzrdir.transport
41
65
 
42
 
        self.controldir = urlutils.join(self.repository._git.path, 'bzr')
 
66
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
43
67
 
44
68
        try:
45
69
            os.makedirs(self.controldir)
49
73
 
50
74
        self._control_files = lockable_files.LockableFiles(
51
75
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
52
 
 
53
76
        self._format = GitWorkingTreeFormat()
54
 
 
55
 
        self.index = Index(os.path.join(self.repository._git.controldir(), 
56
 
            "index"))
57
 
 
58
 
    def lock_read(self):
59
 
        pass
 
77
        self.index = self.repository._git.open_index()
 
78
        self.views = self._make_views()
 
79
        self._detect_case_handling()
60
80
 
61
81
    def unlock(self):
62
 
        pass
 
82
        # non-implementation specific cleanup
 
83
        self._cleanup()
 
84
 
 
85
        # reverse order of locking.
 
86
        try:
 
87
            return self._control_files.unlock()
 
88
        finally:
 
89
            self.branch.unlock()
63
90
 
64
91
    def is_control_filename(self, path):
65
92
        return os.path.basename(path) == ".git"
66
93
 
67
 
    def _get_inventory(self):
68
 
        return inventory.Inventory()
69
 
 
70
 
    inventory = property(_get_inventory,
71
 
                         doc="Inventory of this Tree")
 
94
    def _rewrite_index(self):
 
95
        self.index.clear()
 
96
        for path, entry in self._inventory.iter_entries():
 
97
            if entry.kind == "directory":
 
98
                # Git indexes don't contain directories
 
99
                continue
 
100
            if entry.kind == "file":
 
101
                blob = Blob()
 
102
                try:
 
103
                    file, stat_val = self.get_file_with_stat(entry.file_id, path)
 
104
                except (errors.NoSuchFile, IOError):
 
105
                    # TODO: Rather than come up with something here, use the old index
 
106
                    file = StringIO()
 
107
                    from posix import stat_result
 
108
                    stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
 
109
                blob.set_raw_string(file.read())
 
110
            elif entry.kind == "symlink":
 
111
                blob = Blob()
 
112
                try:
 
113
                    stat_val = os.lstat(self.abspath(path))
 
114
                except (errors.NoSuchFile, OSError):
 
115
                    # TODO: Rather than come up with something here, use the 
 
116
                    # old index
 
117
                    from posix import stat_result
 
118
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
 
119
                blob.set_raw_string(entry.symlink_target)
 
120
            # Add object to the repository if it didn't exist yet
 
121
            if not blob.id in self.repository._git.object_store:
 
122
                self.repository._git.object_store.add_object(blob)
 
123
            # Add an entry to the index or update the existing entry
 
124
            flags = 0 # FIXME
 
125
            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)
 
126
 
 
127
    def flush(self):
 
128
        # TODO: Maybe this should only write on dirty ?
 
129
        if self._control_files._lock_mode != 'w':
 
130
            raise errors.NotWriteLocked(self)
 
131
        self._rewrite_index()           
 
132
        self.index.write()
 
133
        self._inventory_is_modified = False
 
134
 
 
135
    def get_ignore_list(self):
 
136
        ignoreset = getattr(self, '_ignoreset', None)
 
137
        if ignoreset is not None:
 
138
            return ignoreset
 
139
 
 
140
        ignore_globs = set()
 
141
        ignore_globs.update(ignores.get_runtime_ignores())
 
142
        ignore_globs.update(ignores.get_user_ignores())
 
143
        if self.has_filename(IGNORE_FILENAME):
 
144
            f = self.get_file_byname(IGNORE_FILENAME)
 
145
            try:
 
146
                ignore_globs.update(ignores.parse_ignore_file(f))
 
147
            finally:
 
148
                f.close()
 
149
        self._ignoreset = ignore_globs
 
150
        return ignore_globs
 
151
 
 
152
    def set_last_revision(self, revid):
 
153
        self._change_last_revision(revid)
 
154
 
 
155
    def _reset_data(self):
 
156
        self._inventory_is_modified = False
 
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)
 
160
        self._set_inventory(result, dirty=False)
 
161
 
 
162
    @needs_read_lock
 
163
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
164
        if not path:
 
165
            path = self._inventory.id2path(file_id)
 
166
        try:
 
167
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
 
168
        except OSError, (num, msg):
 
169
            if num in (errno.EISDIR, errno.ENOENT):
 
170
                return None
 
171
            raise
 
172
 
 
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):
 
176
 
 
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)
72
180
 
73
181
 
74
182
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):