/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 issues pointed out by pyflakes.

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