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