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