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