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