/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2007 Canonical Ltd
0.252.32 by Jelmer Vernooij
update copyright
2
# Copyright (C) 2008-2010 Jelmer Vernooij <jelmer@samba.org>
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
3
# Copyright (C) 2008 John Carr
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
4
#
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
#
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
19
"""Converters, etc for going between Bazaar and Git ids."""
20
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
21
from __future__ import absolute_import
22
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
23
import base64
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
24
import stat
25
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
26
from ... import (
0.200.926 by Jelmer Vernooij
Fix formatting, drop support for Bazaar < 2.0.
27
    bencode,
0.200.292 by Jelmer Vernooij
Fix formatting.
28
    errors,
29
    foreign,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
30
    trace,
0.200.292 by Jelmer Vernooij
Fix formatting.
31
    )
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
32
from ...bzr.inventory import (
0.200.292 by Jelmer Vernooij
Fix formatting.
33
    ROOT_ID,
34
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
35
from ...foreign import (
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
36
    ForeignVcs,
37
    VcsMappingRegistry,
0.200.292 by Jelmer Vernooij
Fix formatting.
38
    ForeignRevision,
39
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
40
from ...revision import (
0.200.701 by Jelmer Vernooij
Fix check in git repos.
41
    NULL_REVISION,
42
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
43
from .errors import (
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
44
    NoPushSupport,
45
    UnknownCommitExtra,
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
46
    UnknownMercurialCommitExtra,
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
47
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
48
from .hg import (
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
49
    format_hg_metadata,
50
    extract_hg_metadata,
51
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
52
from .roundtrip import (
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
53
    extract_bzr_metadata,
0.252.4 by Jelmer Vernooij
More work on roundtripping.
54
    inject_bzr_metadata,
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
55
    CommitSupplement,
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
56
    deserialize_fileid_map,
57
    serialize_fileid_map,
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
58
    )
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
59
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
60
DEFAULT_FILE_MODE = stat.S_IFREG | 0644
0.200.1638 by Jelmer Vernooij
Support HG:rename-source extra fields.
61
HG_RENAME_SOURCE = "HG:rename-source"
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
62
HG_EXTRA = "HG:extra"
63
64
# This HG extra is used to indicate the commit that this commit was based on.
65
HG_EXTRA_AMEND_SOURCE = "amend_source"
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
66
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
67
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
68
def escape_file_id(file_id):
0.200.1419 by Jelmer Vernooij
Escape/unescape ^L characters.
69
    return file_id.replace('_', '__').replace(' ', '_s').replace('\x0c', '_c')
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
70
71
72
def unescape_file_id(file_id):
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
73
    ret = []
74
    i = 0
75
    while i < len(file_id):
76
        if file_id[i] != '_':
77
            ret.append(file_id[i])
78
        else:
79
            if file_id[i+1] == '_':
80
                ret.append("_")
81
            elif file_id[i+1] == 's':
82
                ret.append(" ")
0.200.1419 by Jelmer Vernooij
Escape/unescape ^L characters.
83
            elif file_id[i+1] == 'c':
84
                ret.append("\x0c")
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
85
            else:
0.200.826 by Jelmer Vernooij
Fix some long lines.
86
                raise AssertionError("unknown escape character %s" %
87
                    file_id[i+1])
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
88
            i += 1
89
        i += 1
90
    return "".join(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
91
92
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
93
def fix_person_identifier(text):
94
    if "<" in text and ">" in text:
0.200.1625 by Jelmer Vernooij
Cope with missing space before <
95
        if not " <" in text and text.count("<") == 1:
96
            text = text.replace("<", " <")
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
97
        return text
98
    return "%s <%s>" % (text, text)
99
100
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
101
def warn_escaped(commit, num_escaped):
102
    trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
103
                  "to regenerate the SHA map.", num_escaped, commit)
104
105
106
def warn_unusual_mode(commit, path, mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
107
    trace.mutter("Unusual file mode %o for %s in %s. Storing as revision "
108
                 "property. ", mode, path, commit)
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
109
110
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
111
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
112
    """Class that maps between Git and Bazaar semantics."""
113
    experimental = False
114
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
115
    BZR_FILE_IDS_FILE = None
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
116
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
117
    BZR_DUMMY_FILE = None
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
118
0.200.1328 by Jelmer Vernooij
More test fixes.
119
    def is_special_file(self, filename):
120
        return (filename in (self.BZR_FILE_IDS_FILE, self.BZR_DUMMY_FILE))
121
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
122
    def __init__(self):
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
123
        super(BzrGitMapping, self).__init__(foreign_vcs_git)
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
124
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
125
    def __eq__(self, other):
0.200.1020 by Jelmer Vernooij
Store testament-sha1 in metadata.
126
        return (type(self) == type(other) and
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
127
                self.revid_prefix == other.revid_prefix)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
128
129
    @classmethod
130
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
131
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
132
        from dulwich.protocol import ZERO_SHA
133
        if git_rev_id == ZERO_SHA:
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
134
            return NULL_REVISION
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
135
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
136
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
137
    @classmethod
138
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
139
        """Convert a Bazaar revision id to a git revision id handle."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
140
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
141
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
142
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
143
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
144
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
145
        # Git paths are just bytestrings
146
        # We must just hope they are valid UTF-8..
0.200.157 by Jelmer Vernooij
Fix some bit of fetching.
147
        if path == "":
148
            return ROOT_ID
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
149
        if type(path) is unicode:
150
            path = path.encode("utf-8")
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
151
        return escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
152
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
153
    def is_control_file(self, path):
154
        return path in (self.BZR_FILE_IDS_FILE, self.BZR_DUMMY_FILE)
155
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
156
    def parse_file_id(self, file_id):
157
        if file_id == ROOT_ID:
158
            return ""
159
        return unescape_file_id(file_id)
160
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
161
    def revid_as_refname(self, revid):
162
        import urllib
163
        return "refs/bzr/%s" % urllib.quote(revid)
164
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
165
    def import_unusual_file_modes(self, rev, unusual_file_modes):
166
        if unusual_file_modes:
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
167
            ret = [(path, unusual_file_modes[path])
168
                   for path in sorted(unusual_file_modes.keys())]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
169
            rev.properties['file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
170
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
171
    def export_unusual_file_modes(self, rev):
172
        try:
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
173
            file_modes = rev.properties['file-modes']
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
174
        except KeyError:
175
            return {}
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
176
        else:
177
            return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(file_modes.encode("utf-8"))])
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
178
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
179
    def _generate_git_svn_metadata(self, rev, encoding):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
180
        try:
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
181
            git_svn_id = rev.properties["git-svn-id"]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
182
        except KeyError:
183
            return ""
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
184
        else:
185
            return "\ngit-svn-id: %s\n" % git_svn_id.encode(encoding)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
186
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
187
    def _generate_hg_message_tail(self, rev):
188
        extra = {}
189
        renames = []
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
190
        branch = 'default'
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
191
        for name in rev.properties:
192
            if name == 'hg:extra:branch':
193
                branch = rev.properties['hg:extra:branch']
194
            elif name.startswith('hg:extra'):
0.200.826 by Jelmer Vernooij
Fix some long lines.
195
                extra[name[len('hg:extra:'):]] = base64.b64decode(
196
                    rev.properties[name])
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
197
            elif name == 'hg:renames':
0.200.826 by Jelmer Vernooij
Fix some long lines.
198
                renames = bencode.bdecode(base64.b64decode(
199
                    rev.properties['hg:renames']))
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
200
            # TODO: Export other properties as 'bzr:' extras?
0.200.660 by Jelmer Vernooij
Fix encoding issues.
201
        ret = format_hg_metadata(renames, branch, extra)
202
        assert isinstance(ret, str)
203
        return ret
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
204
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
205
    def _extract_git_svn_metadata(self, rev, message):
206
        lines = message.split("\n")
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
207
        if not (lines[-1] == "" and len(lines) >= 2 and lines[-2].startswith("git-svn-id:")):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
208
            return message
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
209
        git_svn_id = lines[-2].split(": ", 1)[1]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
210
        rev.properties['git-svn-id'] = git_svn_id
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
211
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
212
        # FIXME: Convert this to converted-from property somehow..
0.200.660 by Jelmer Vernooij
Fix encoding issues.
213
        ret = "\n".join(lines[:-2])
214
        assert isinstance(ret, str)
215
        return ret
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
216
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
217
    def _extract_hg_metadata(self, rev, message):
218
        (message, renames, branch, extra) = extract_hg_metadata(message)
219
        if branch is not None:
220
            rev.properties['hg:extra:branch'] = branch
221
        for name, value in extra.iteritems():
222
            rev.properties['hg:extra:' + name] = base64.b64encode(value)
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
223
        if renames:
0.200.826 by Jelmer Vernooij
Fix some long lines.
224
            rev.properties['hg:renames'] = base64.b64encode(bencode.bencode(
225
                [(new, old) for (old, new) in renames.iteritems()]))
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
226
        return message
227
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
228
    def _extract_bzr_metadata(self, rev, message):
229
        (message, metadata) = extract_bzr_metadata(message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
230
        return message, metadata
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
231
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
232
    def _decode_commit_message(self, rev, message, encoding):
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
233
        return message.decode(encoding), CommitSupplement()
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
234
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
235
    def _encode_commit_message(self, rev, message, encoding):
236
        return message.encode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
237
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
238
    def export_fileid_map(self, fileid_map):
239
        """Export a file id map to a fileid map.
240
241
        :param fileid_map: File id map, mapping paths to file ids
242
        :return: A Git blob object
243
        """
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
244
        from dulwich.objects import Blob
245
        b = Blob()
246
        b.set_raw_chunks(serialize_fileid_map(fileid_map))
247
        return b
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
248
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
249
    def export_commit(self, rev, tree_sha, parent_lookup, lossy,
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
250
                      verifiers):
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
251
        """Turn a Bazaar revision in to a Git commit
252
253
        :param tree_sha: Tree sha for the commit
0.200.826 by Jelmer Vernooij
Fix some long lines.
254
        :param parent_lookup: Function for looking up the GIT sha equiv of a
255
            bzr revision
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
256
        :param lossy: Whether to store roundtripping information.
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
257
        :param verifiers: Verifiers info
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
258
        :return dulwich.objects.Commit represent the revision:
259
        """
260
        from dulwich.objects import Commit
261
        commit = Commit()
262
        commit.tree = tree_sha
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
263
        if not lossy:
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
264
            metadata = CommitSupplement()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
265
            metadata.verifiers = verifiers
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
266
        else:
267
            metadata = None
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
268
        parents = []
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
269
        for p in rev.parent_ids:
0.200.705 by Jelmer Vernooij
Cope with imports.
270
            try:
271
                git_p = parent_lookup(p)
272
            except KeyError:
273
                git_p = None
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
274
                if metadata is not None:
275
                    metadata.explicit_parent_ids = rev.parent_ids
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
276
            if git_p is not None:
277
                assert len(git_p) == 40, "unexpected length for %r" % git_p
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
278
                parents.append(git_p)
279
        commit.parents = parents
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
280
        try:
281
            encoding = rev.properties['git-explicit-encoding']
282
        except KeyError:
283
            encoding = rev.properties.get('git-implicit-encoding', 'utf-8')
284
        commit.encoding = rev.properties.get('git-explicit-encoding')
285
        commit.committer = fix_person_identifier(rev.committer.encode(
286
            encoding))
287
        commit.author = fix_person_identifier(
288
            rev.get_apparent_authors()[0].encode(encoding))
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
289
        commit.commit_time = long(rev.timestamp)
290
        if 'author-timestamp' in rev.properties:
291
            commit.author_time = long(rev.properties['author-timestamp'])
292
        else:
293
            commit.author_time = commit.commit_time
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
294
        commit._commit_timezone_neg_utc = "commit-timezone-neg-utc" in rev.properties
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
295
        commit.commit_timezone = rev.timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
296
        commit._author_timezone_neg_utc = "author-timezone-neg-utc" in rev.properties
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
297
        if 'author-timezone' in rev.properties:
298
            commit.author_timezone = int(rev.properties['author-timezone'])
299
        else:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
300
            commit.author_timezone = commit.commit_timezone
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
301
        commit.message = self._encode_commit_message(rev, rev.message,
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
302
            encoding)
0.252.40 by Jelmer Vernooij
Checks for roundtripping.
303
        assert type(commit.message) == str
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
304
        if metadata is not None:
0.252.4 by Jelmer Vernooij
More work on roundtripping.
305
            try:
306
                mapping_registry.parse_revision_id(rev.revision_id)
307
            except errors.InvalidRevisionId:
308
                metadata.revision_id = rev.revision_id
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
309
            mapping_properties = set(
310
                ['author', 'author-timezone', 'author-timezone-neg-utc',
311
                 'commit-timezone-neg-utc', 'git-implicit-encoding',
0.252.15 by Jelmer Vernooij
Add file-modes to list of mapping properties.
312
                 'git-explicit-encoding', 'author-timestamp', 'file-modes'])
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
313
            for k, v in rev.properties.iteritems():
314
                if not k in mapping_properties:
315
                    metadata.properties[k] = v
0.200.1510 by Jelmer Vernooij
Fix tests.
316
        if not lossy:
317
            if self.roundtripping:
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
318
                commit.message = inject_bzr_metadata(commit.message, metadata,
0.200.1510 by Jelmer Vernooij
Fix tests.
319
                                                     encoding)
320
            else:
321
                raise NoPushSupport()
0.252.40 by Jelmer Vernooij
Checks for roundtripping.
322
        assert type(commit.message) == str
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
323
        if 'git-extra' in rev.properties:
324
            commit.extra.extend([l.split(' ', 1) for l in rev.properties['git-extra'].splitlines()])
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
325
        return commit
326
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
327
    def import_fileid_map(self, blob):
328
        """Convert a git file id map blob.
329
330
        :param blob: Git blob object with fileid map
331
        :return: Dictionary mapping paths to file ids
332
        """
0.252.35 by Jelmer Vernooij
Ignore control files in inventories.
333
        return deserialize_fileid_map(blob.data)
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
334
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
335
    def import_commit(self, commit, lookup_parent_revid):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
336
        """Convert a git commit to a bzr revision.
337
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
338
        :return: a `breezy.revision.Revision` object, foreign revid and a
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
339
            testament sha1
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
340
        """
341
        if commit is None:
342
            raise AssertionError("Commit object can't be None")
0.200.826 by Jelmer Vernooij
Fix some long lines.
343
        rev = ForeignRevision(commit.id, self,
344
                self.revision_id_foreign_to_bzr(commit.id))
0.252.4 by Jelmer Vernooij
More work on roundtripping.
345
        rev.git_metadata = None
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
346
        def decode_using_encoding(rev, commit, encoding):
347
            rev.committer = str(commit.committer).decode(encoding)
348
            if commit.committer != commit.author:
349
                rev.properties['author'] = str(commit.author).decode(encoding)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
350
            rev.message, rev.git_metadata = self._decode_commit_message(
351
                rev, commit.message, encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
352
        if commit.encoding is not None:
353
            rev.properties['git-explicit-encoding'] = commit.encoding
354
            decode_using_encoding(rev, commit, commit.encoding)
355
        else:
356
            for encoding in ('utf-8', 'latin1'):
357
                try:
358
                    decode_using_encoding(rev, commit, encoding)
359
                except UnicodeDecodeError:
360
                    pass
361
                else:
362
                    if encoding != 'utf-8':
363
                        rev.properties['git-implicit-encoding'] = encoding
364
                    break
0.200.350 by Jelmer Vernooij
Support author_time
365
        if commit.commit_time != commit.author_time:
366
            rev.properties['author-timestamp'] = str(commit.author_time)
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
367
        if commit.commit_timezone != commit.author_timezone:
0.200.826 by Jelmer Vernooij
Fix some long lines.
368
            rev.properties['author-timezone'] = "%d" % commit.author_timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
369
        if commit._author_timezone_neg_utc:
370
            rev.properties['author-timezone-neg-utc'] = ""
371
        if commit._commit_timezone_neg_utc:
372
            rev.properties['commit-timezone-neg-utc'] = ""
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
373
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
374
        rev.timezone = commit.commit_timezone
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
375
        rev.parent_ids = None
0.252.4 by Jelmer Vernooij
More work on roundtripping.
376
        if rev.git_metadata is not None:
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
377
            md = rev.git_metadata
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
378
            roundtrip_revid = md.revision_id
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
379
            if md.explicit_parent_ids:
380
                rev.parent_ids = md.explicit_parent_ids
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
381
            rev.properties.update(md.properties)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
382
            verifiers = md.verifiers
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
383
        else:
384
            roundtrip_revid = None
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
385
            verifiers = {}
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
386
        if rev.parent_ids is None:
387
            rev.parent_ids = tuple([lookup_parent_revid(p) for p in commit.parents])
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
388
        unknown_extra_fields = []
389
        extra_lines = []
390
        for k, v in commit.extra:
391
            if k == HG_RENAME_SOURCE:
392
                extra_lines.append(k + ' ' + v + '\n')
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
393
            elif k == HG_EXTRA:
394
                hgk, hgv = v.split(':', 1)
395
                if hgk not in (HG_EXTRA_AMEND_SOURCE, ):
396
                    raise UnknownMercurialCommitExtra(commit, hgk)
397
                extra_lines.append(k + ' ' + v + '\n')
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
398
            else:
399
                unknown_extra_fields.append(k)
400
        if unknown_extra_fields:
401
            raise UnknownCommitExtra(commit, unknown_extra_fields)
402
        if extra_lines:
403
            rev.properties['git-extra'] = ''.join(extra_lines)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
404
        return rev, roundtrip_revid, verifiers
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
405
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
406
    def get_fileid_map(self, lookup_object, tree_sha):
407
        """Obtain a fileid map for a particular tree.
408
409
        :param lookup_object: Function for looking up an object
410
        :param tree_sha: SHA of the root tree
411
        :return: GitFileIdMap instance
412
        """
413
        try:
414
            file_id_map_sha = lookup_object(tree_sha)[self.BZR_FILE_IDS_FILE][1]
415
        except KeyError:
416
            file_ids = {}
417
        else:
418
            file_ids = self.import_fileid_map(lookup_object(file_id_map_sha))
419
        return GitFileIdMap(file_ids, self)
420
0.200.97 by Jelmer Vernooij
use mapping object.
421
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
422
class BzrGitMappingv1(BzrGitMapping):
423
    revid_prefix = 'git-v1'
424
    experimental = False
425
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
426
    def __str__(self):
427
        return self.revid_prefix
428
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
429
430
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
431
    revid_prefix = 'git-experimental'
432
    experimental = True
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
433
    roundtripping = True
0.200.97 by Jelmer Vernooij
use mapping object.
434
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
435
    BZR_FILE_IDS_FILE = '.bzrfileids'
436
437
    BZR_DUMMY_FILE = '.bzrdummy'
438
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
439
    def _decode_commit_message(self, rev, message, encoding):
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
440
        message = self._extract_hg_metadata(rev, message)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
441
        message = self._extract_git_svn_metadata(rev, message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
442
        message, metadata = self._extract_bzr_metadata(rev, message)
443
        return message.decode(encoding), metadata
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
444
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
445
    def _encode_commit_message(self, rev, message, encoding):
446
        ret = message.encode(encoding)
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
447
        ret += self._generate_hg_message_tail(rev)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
448
        ret += self._generate_git_svn_metadata(rev, encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
449
        return ret
450
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
451
    def import_commit(self, commit, lookup_parent_revid):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
452
        rev, roundtrip_revid, verifiers = super(BzrGitMappingExperimental, self).import_commit(commit, lookup_parent_revid)
0.200.642 by Jelmer Vernooij
In experimental mappings, set 'converted_revision' property.
453
        rev.properties['converted_revision'] = "git %s\n" % commit.id
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
454
        return rev, roundtrip_revid, verifiers
0.200.642 by Jelmer Vernooij
In experimental mappings, set 'converted_revision' property.
455
0.200.97 by Jelmer Vernooij
use mapping object.
456
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
457
class GitMappingRegistry(VcsMappingRegistry):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
458
    """Registry with available git mappings."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
459
460
    def revision_id_bzr_to_foreign(self, bzr_revid):
0.200.701 by Jelmer Vernooij
Fix check in git repos.
461
        if bzr_revid == NULL_REVISION:
0.200.892 by Jelmer Vernooij
Lazy import ZERO_SHA.
462
            from dulwich.protocol import ZERO_SHA
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
463
            return ZERO_SHA, None
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
464
        if not bzr_revid.startswith("git-"):
465
            raise errors.InvalidRevisionId(bzr_revid, None)
466
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
467
        mapping = self.get(mapping_version)
468
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
469
470
    parse_revision_id = revision_id_bzr_to_foreign
471
472
473
mapping_registry = GitMappingRegistry()
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
474
mapping_registry.register_lazy('git-v1', "breezy.plugins.git.mapping",
0.200.826 by Jelmer Vernooij
Fix some long lines.
475
    "BzrGitMappingv1")
476
mapping_registry.register_lazy('git-experimental',
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
477
    "breezy.plugins.git.mapping", "BzrGitMappingExperimental")
0.200.1507 by Jelmer Vernooij
Add note on experimental mapping format.
478
# Uncomment the next line to enable the experimental bzr-git mappings.
479
# This will make sure all bzr metadata is pushed into git, allowing for
480
# full roundtripping later.
481
# NOTE: THIS IS EXPERIMENTAL. IT MAY EAT YOUR DATA OR CORRUPT
482
# YOUR BZR OR GIT REPOSITORIES. USE WITH CARE.
0.200.1416 by Jelmer Vernooij
Don't use experimental mapping by default.
483
#mapping_registry.set_default('git-experimental')
484
mapping_registry.set_default('git-v1')
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
485
486
487
class ForeignGit(ForeignVcs):
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
488
    """The Git Stupid Content Tracker"""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
489
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
490
    @property
491
    def branch_format(self):
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
492
        from .branch import GitBranchFormat
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
493
        return GitBranchFormat()
494
0.200.657 by Jelmer Vernooij
Provide repository_format attribute, as required by newer foreign VCS tests in bzrlib.
495
    @property
496
    def repository_format(self):
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
497
        from .repository import GitRepositoryFormat
0.200.657 by Jelmer Vernooij
Provide repository_format attribute, as required by newer foreign VCS tests in bzrlib.
498
        return GitRepositoryFormat()
499
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
500
    def __init__(self):
501
        super(ForeignGit, self).__init__(mapping_registry)
0.200.646 by Jelmer Vernooij
Store abbreviation in foreign branch.
502
        self.abbreviation = "git"
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
503
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
504
    @classmethod
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
505
    def serialize_foreign_revid(self, foreign_revid):
506
        return foreign_revid
507
508
    @classmethod
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
509
    def show_foreign_revid(cls, foreign_revid):
510
        return { "git commit": foreign_revid }
511
512
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
513
foreign_vcs_git = ForeignGit()
0.200.637 by Jelmer Vernooij
Allow single place for configuration of default mapping.
514
default_mapping = mapping_registry.get_default()()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
515
516
0.275.1 by Jelmer Vernooij
Use root_inventory.
517
def symlink_to_blob(symlink_target):
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
518
    from dulwich.objects import Blob
519
    blob = Blob()
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
520
    if type(symlink_target) == unicode:
521
        symlink_target = symlink_target.encode('utf-8')
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
522
    blob.data = symlink_target
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
523
    return blob
524
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
525
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
526
def mode_is_executable(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
527
    """Check if mode should be considered executable."""
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
528
    return bool(mode & 0111)
529
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
530
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
531
def mode_kind(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
532
    """Determine the Bazaar inventory kind based on Unix file mode."""
0.200.1538 by Jelmer Vernooij
More work on tree-reference support.
533
    if mode is None:
534
        return None
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
535
    entry_kind = (mode & 0700000) / 0100000
536
    if entry_kind == 0:
537
        return 'directory'
538
    elif entry_kind == 1:
539
        file_kind = (mode & 070000) / 010000
540
        if file_kind == 0:
541
            return 'file'
542
        elif file_kind == 2:
543
            return 'symlink'
544
        elif file_kind == 6:
545
            return 'tree-reference'
546
        else:
547
            raise AssertionError(
548
                "Unknown file kind %d, perms=%o." % (file_kind, mode,))
549
    else:
550
        raise AssertionError(
551
            "Unknown kind, perms=%r." % (mode,))
552
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
553
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
554
def object_mode(kind, executable):
555
    if kind == 'directory':
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
556
        return stat.S_IFDIR
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
557
    elif kind == 'symlink':
0.245.1 by INADA Naoki
Handle executable mode for symlink.
558
        mode = stat.S_IFLNK
559
        if executable:
0.200.703 by Jelmer Vernooij
Merge support for executable symlinks.
560
            mode |= 0111
0.245.1 by INADA Naoki
Handle executable mode for symlink.
561
        return mode
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
562
    elif kind == 'file':
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
563
        mode = stat.S_IFREG | 0644
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
564
        if executable:
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
565
            mode |= 0111
566
        return mode
0.200.665 by Jelmer Vernooij
Add more checks for submodules.
567
    elif kind == 'tree-reference':
568
        from dulwich.objects import S_IFGITLINK
569
        return S_IFGITLINK
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
570
    else:
571
        raise AssertionError
572
573
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
574
def entry_mode(entry):
575
    """Determine the git file mode for an inventory entry."""
576
    return object_mode(entry.kind, entry.executable)
577
578
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
579
def directory_to_tree(children, lookup_ie_sha1, unusual_modes, empty_file_name,
580
                      allow_empty=False):
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
581
    """Create a Git Tree object from a Bazaar directory.
582
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
583
    :param children: Children inventory entries
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
584
    :param lookup_ie_sha1: Lookup the Git SHA1 for a inventory entry
585
    :param unusual_modes: Dictionary with unusual file modes by file ids
586
    :param empty_file_name: Name to use for dummy files in empty directories,
587
        None to ignore empty directories.
588
    """
589
    from dulwich.objects import Blob, Tree
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
590
    tree = Tree()
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
591
    for name, value in children.iteritems():
592
        ie = children[name]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
593
        try:
594
            mode = unusual_modes[ie.file_id]
595
        except KeyError:
596
            mode = entry_mode(ie)
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
597
        hexsha = lookup_ie_sha1(ie)
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
598
        if hexsha is not None:
0.200.1152 by Jelmer Vernooij
Require dulwich 0.7.1.
599
            tree.add(name.encode("utf-8"), mode, hexsha)
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
600
    if not allow_empty and len(tree) == 0:
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
601
        # Only the root can be an empty tree
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
602
        if empty_file_name is not None:
0.200.1152 by Jelmer Vernooij
Require dulwich 0.7.1.
603
            tree.add(empty_file_name, stat.S_IFREG | 0644, Blob().id)
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
604
        else:
605
            return None
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
606
    return tree
607
608
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
609
def extract_unusual_modes(rev):
610
    try:
0.200.826 by Jelmer Vernooij
Fix some long lines.
611
        foreign_revid, mapping = mapping_registry.parse_revision_id(
612
            rev.revision_id)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
613
    except errors.InvalidRevisionId:
614
        return {}
615
    else:
616
        return mapping.export_unusual_file_modes(rev)
617
618
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
619
def parse_git_svn_id(text):
620
    (head, uuid) = text.rsplit(" ", 1)
621
    (full_url, rev) = head.rsplit("@", 1)
0.200.653 by Jelmer Vernooij
Fix typo in git-svn-id parser, return revnum as integer.
622
    return (full_url, int(rev), uuid)
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
623
624
625
class GitFileIdMap(object):
626
627
    def __init__(self, file_ids, mapping):
628
        self.file_ids = file_ids
629
        self.paths = None
630
        self.mapping = mapping
631
0.200.1569 by Jelmer Vernooij
Implement GitRevisionTree.all_file_ids().
632
    def all_file_ids(self):
633
        return self.file_ids.values()
634
0.200.1201 by Jelmer Vernooij
Implement _set_root_id.
635
    def set_file_id(self, path, file_id):
0.200.1209 by Jelmer Vernooij
Check for types in file id map.
636
        assert type(path) is str
637
        assert type(file_id) is str
0.200.1201 by Jelmer Vernooij
Implement _set_root_id.
638
        self.file_ids[path] = file_id
639
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
640
    def lookup_file_id(self, path):
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
641
        assert type(path) is str
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
642
        try:
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
643
            file_id = self.file_ids[path]
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
644
        except KeyError:
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
645
            file_id = self.mapping.generate_file_id(path)
646
        assert type(file_id) is str
647
        return file_id
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
648
649
    def lookup_path(self, file_id):
650
        if self.paths is None:
651
            self.paths = {}
652
            for k, v in self.file_ids.iteritems():
653
                self.paths[v] = k
654
        try:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
655
            path = self.paths[file_id]
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
656
        except KeyError:
657
            return self.mapping.parse_file_id(file_id)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
658
        else:
659
            assert type(path) is str
660
            return path
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
661
662
    def copy(self):
663
        return self.__class__(dict(self.file_ids), self.mapping)