/brz/remove-bazaar

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