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