/brz/remove-bazaar

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