/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
1
# Copyright (C) 2008 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Parser of import data into command objects.
18
19
In order to reuse existing front-ends, the stream format is a subset of
20
the one used by git-fast-import (as of the 1.5.4 release of git at least).
21
The grammar is:
22
23
  stream ::= cmd*;
24
25
  cmd ::= new_blob
26
        | new_commit
27
        | new_tag
28
        | reset_branch
29
        | checkpoint
30
        | progress
31
        ;
32
33
  new_blob ::= 'blob' lf
34
    mark?
35
    file_content;
36
  file_content ::= data;
37
38
  new_commit ::= 'commit' sp ref_str lf
39
    mark?
40
    ('author' sp name '<' email '>' when lf)?
41
    'committer' sp name '<' email '>' when lf
42
    commit_msg
43
    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
44
    ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
45
    file_change*
46
    lf?;
47
  commit_msg ::= data;
48
49
  file_change ::= file_clr
50
    | file_del
51
    | file_rnm
52
    | file_cpy
53
    | file_obm
54
    | file_inm;
55
  file_clr ::= 'deleteall' lf;
56
  file_del ::= 'D' sp path_str lf;
57
  file_rnm ::= 'R' sp path_str sp path_str lf;
58
  file_cpy ::= 'C' sp path_str sp path_str lf;
59
  file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
60
  file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
61
    data;
62
63
  new_tag ::= 'tag' sp tag_str lf
64
    'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
65
    'tagger' sp name '<' email '>' when lf
66
    tag_msg;
67
  tag_msg ::= data;
68
69
  reset_branch ::= 'reset' sp ref_str lf
70
    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
71
    lf?;
72
73
  checkpoint ::= 'checkpoint' lf
74
    lf?;
75
76
  progress ::= 'progress' sp not_lf* lf
77
    lf?;
78
79
     # note: the first idnum in a stream should be 1 and subsequent
80
     # idnums should not have gaps between values as this will cause
81
     # the stream parser to reserve space for the gapped values.  An
82
     # idnum can be updated in the future to a new object by issuing
83
     # a new mark directive with the old idnum.
84
     #
85
  mark ::= 'mark' sp idnum lf;
86
  data ::= (delimited_data | exact_data)
87
    lf?;
88
89
    # note: delim may be any string but must not contain lf.
90
    # data_line may contain any data but must not be exactly
0.88.2 by Samuel Bronson
Implement here-document style input data.
91
    # delim. The lf after the final data_line is included in
92
    # the data.
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
93
  delimited_data ::= 'data' sp '<<' delim lf
94
    (data_line lf)*
95
    delim lf;
96
97
     # note: declen indicates the length of binary_data in bytes.
98
     # declen does not include the lf preceeding the binary data.
99
     #
100
  exact_data ::= 'data' sp declen lf
101
    binary_data;
102
103
     # note: quoted strings are C-style quoting supporting \c for
104
     # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
105
     # is the signed byte value in octal.  Note that the only
106
     # characters which must actually be escaped to protect the
107
     # stream formatting is: \, " and LF.  Otherwise these values
108
     # are UTF8.
109
     #
110
  ref_str     ::= ref;
111
  sha1exp_str ::= sha1exp;
112
  tag_str     ::= tag;
113
  path_str    ::= path    | '"' quoted(path)    '"' ;
114
  mode        ::= '100644' | '644'
115
                | '100755' | '755'
116
                | '120000'
117
                ;
118
119
  declen ::= # unsigned 32 bit value, ascii base10 notation;
120
  bigint ::= # unsigned integer value, ascii base10 notation;
121
  binary_data ::= # file content, not interpreted;
122
123
  when         ::= raw_when | rfc2822_when;
124
  raw_when     ::= ts sp tz;
125
  rfc2822_when ::= # Valid RFC 2822 date and time;
126
127
  sp ::= # ASCII space character;
128
  lf ::= # ASCII newline (LF) character;
129
130
     # note: a colon (':') must precede the numerical value assigned to
131
     # an idnum.  This is to distinguish it from a ref or tag name as
132
     # GIT does not permit ':' in ref or tag strings.
133
     #
134
  idnum   ::= ':' bigint;
135
  path    ::= # GIT style file path, e.g. "a/b/c";
136
  ref     ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
137
  tag     ::= # GIT tag name, e.g. "FIREFOX_1_5";
138
  sha1exp ::= # Any valid GIT SHA1 expression;
139
  hexsha1 ::= # SHA1 in hexadecimal format;
140
141
     # note: name and email are UTF8 strings, however name must not
142
     # contain '<' or lf and email must not contain any of the
143
     # following: '<', '>', lf.
144
     #
145
  name  ::= # valid GIT author/committer name;
146
  email ::= # valid GIT author/committer email;
147
  ts    ::= # time since the epoch in seconds, ascii base10 notation;
148
  tz    ::= # GIT style timezone;
149
150
     # note: comments may appear anywhere in the input, except
151
     # within a data command.  Any form of the data command
152
     # always escapes the related input from comment processing.
153
     #
154
     # In case it is not clear, the '#' that starts the comment
155
     # must be the first character on that the line (an lf have
156
     # preceeded it).
157
     #
158
  comment ::= '#' not_lf* lf;
159
  not_lf  ::= # Any byte that is not ASCII newline (LF);
160
"""
161
162
163
import re
164
import sys
165
166
import commands
167
import dates
168
import errors
169
170
171
## Stream parsing ##
172
173
class LineBasedParser(object):
174
175
    def __init__(self, input):
176
        """A Parser that keeps track of line numbers.
177
178
        :param input: the file-like object to read from
179
        """
180
        self.input = input
181
        self.lineno = 0
182
        # Lines pushed back onto the input stream
183
        self._buffer = []
184
185
    def abort(self, exception, *args):
186
        """Raise an exception providing line number information."""
187
        raise exception(self.lineno, *args)
188
189
    def readline(self):
190
        """Get the next line including the newline or '' on EOF."""
191
        self.lineno += 1
192
        if self._buffer:
193
            return self._buffer.pop()
194
        else:
195
            return self.input.readline()
196
197
    def next_line(self):
198
        """Get the next line without the newline or None on EOF."""
199
        line = self.readline()
200
        if line:
201
            return line[:-1]
202
        else:
203
            return None
204
205
    def push_line(self, line):
206
        """Push line back onto the line buffer.
207
        
208
        :param line: the line with no trailing newline
209
        """
210
        self.lineno -= 1
211
        self._buffer.append(line + "\n")
212
213
    def read_bytes(self, count):
214
        """Read a given number of bytes from the input stream.
215
        
216
        Throws MissingBytes if the bytes are not found.
217
218
        Note: This method does not read from the line buffer.
0.64.6 by Ian Clatworthy
generic processing method working for one revision in one branch
219
220
        :return: a string
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
221
        """
0.64.143 by Ian Clatworthy
speed up blob parsing
222
        result = self.input.read(count)
223
        found = len(result)
224
        self.lineno += result.count("\n")
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
225
        if found != count:
226
            self.abort(errors.MissingBytes, count, found)
0.64.143 by Ian Clatworthy
speed up blob parsing
227
        return result
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
228
229
    def read_until(self, terminator):
230
        """Read the input stream until the terminator is found.
231
        
232
        Throws MissingTerminator if the terminator is not found.
233
234
        Note: This method does not read from the line buffer.
235
236
        :return: the bytes read up to but excluding the terminator.
237
        """
0.88.2 by Samuel Bronson
Implement here-document style input data.
238
        
239
        lines = []
240
        term = terminator + '\n'
241
        while True:
242
            line = self.input.readline()
243
            if line == term:
244
                break
245
            else:
246
                lines.append(line)
247
        return ''.join(lines)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
248
249
0.64.3 by Ian Clatworthy
tweak parser for better git-fast-export compatibility
250
# Regular expression used for parsing. (Note: The spec states that the name
251
# part should be non-empty but git-fast-export doesn't always do that so
0.65.2 by James Westby
The space between the author and email is optional in committer.
252
# the first bit is \w*, not \w+.) Also git-fast-import code says the
253
# space before the email is optional.
0.64.103 by Ian Clatworthy
handle empty emails & names/paths that aren't utf8 encoded
254
_WHO_AND_WHEN_RE = re.compile(r'([^<]*)<(.*)> (.+)')
255
_WHO_RE = re.compile(r'([^<]*)<(.*)>')
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
256
257
258
class ImportParser(LineBasedParser):
259
260
    def __init__(self, input, verbose=False, output=sys.stdout):
261
        """A Parser of import commands.
262
263
        :param input: the file-like object to read from
264
        :param verbose: display extra information of not
265
        :param output: the file-like object to write messages to (YAGNI?)
266
        """
267
        LineBasedParser.__init__(self, input)
268
        self.verbose = verbose
269
        self.output = output
270
        # We auto-detect the date format when a date is first encountered
271
        self.date_parser = None
272
0.64.241 by Ian Clatworthy
fix warning messages on non-utf8 names & emails
273
    def warning(self, msg):
0.64.203 by Ian Clatworthy
fix reporting of non-utf8 commits to go to stderr
274
        sys.stderr.write("warning line %d: %s\n" % (self.lineno, msg))
0.64.191 by Ian Clatworthy
Force parser to generate commit messages in unicode - even when not in utf8 in the input stream
275
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
276
    def iter_commands(self):
277
        """Iterator returning ImportCommand objects."""
278
        while True:
279
            line = self.next_line()
280
            if line is None:
281
                break
282
            elif len(line) == 0 or line.startswith('#'):
283
                continue
284
            # Search for commands in order of likelihood
285
            elif line.startswith('commit '):
286
                yield self._parse_commit(line[len('commit '):])
287
            elif line.startswith('blob'):
288
                yield self._parse_blob()
289
            elif line.startswith('progress '):
290
                yield commands.ProgressCommand(line[len('progress '):])
291
            elif line.startswith('reset '):
292
                yield self._parse_reset(line[len('reset '):])
293
            elif line.startswith('tag '):
294
                yield self._parse_tag(line[len('tag '):])
295
            elif line.startswith('checkpoint'):
296
                yield commands.CheckpointCommand()
0.102.8 by Ian Clatworthy
feature parsing
297
            elif line.startswith('feature'):
298
                yield self._parse_feature(line[len('feature '):])
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
299
            else:
300
                self.abort(errors.InvalidCommand, line)
301
302
    def iter_file_commands(self):
303
        """Iterator returning FileCommand objects.
304
        
305
        If an invalid file command is found, the line is silently
306
        pushed back and iteration ends.
307
        """
308
        while True:
309
            line = self.next_line()
310
            if line is None:
311
                break
312
            elif len(line) == 0 or line.startswith('#'):
313
                continue
314
            # Search for file commands in order of likelihood
315
            elif line.startswith('M '):
316
                yield self._parse_file_modify(line[2:])
317
            elif line.startswith('D '):
318
                path = self._path(line[2:])
319
                yield commands.FileDeleteCommand(path)
320
            elif line.startswith('R '):
321
                old, new = self._path_pair(line[2:])
322
                yield commands.FileRenameCommand(old, new)
323
            elif line.startswith('C '):
324
                src, dest = self._path_pair(line[2:])
0.77.11 by Ian Clatworthy
fix parsing of filecopy command
325
                yield commands.FileCopyCommand(src, dest)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
326
            elif line.startswith('deleteall'):
327
                yield commands.FileDeleteAllCommand()
328
            else:
329
                self.push_line(line)
330
                break
331
332
    def _parse_blob(self):
333
        """Parse a blob command."""
0.64.35 by Ian Clatworthy
identify unmarked blobs and commits by line numbers
334
        lineno = self.lineno
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
335
        mark = self._get_mark_if_any()
336
        data = self._get_data('blob')
0.64.35 by Ian Clatworthy
identify unmarked blobs and commits by line numbers
337
        return commands.BlobCommand(mark, data, lineno)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
338
339
    def _parse_commit(self, ref):
340
        """Parse a commit command."""
0.64.35 by Ian Clatworthy
identify unmarked blobs and commits by line numbers
341
        lineno  = self.lineno
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
342
        mark = self._get_mark_if_any()
343
        author = self._get_user_info('commit', 'author', False)
0.102.9 by Ian Clatworthy
parsing of multiple authors and commit properties
344
        more_authors = []
345
        while True:
346
            another_author = self._get_user_info('commit', 'author', False)
347
            if another_author is not None:
348
                more_authors.append(another_author)
349
            else:
350
                break
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
351
        committer = self._get_user_info('commit', 'committer')
0.64.78 by Ian Clatworthy
fix from Pieter de Bie - hack around broken front-ends
352
        message = self._get_data('commit', 'message')
353
        try:
354
            message = message.decode('utf_8')
355
        except UnicodeDecodeError:
0.64.241 by Ian Clatworthy
fix warning messages on non-utf8 names & emails
356
            self.warning(
0.64.191 by Ian Clatworthy
Force parser to generate commit messages in unicode - even when not in utf8 in the input stream
357
                "commit message not in utf8 - replacing unknown characters")
358
            message = message.decode('utf_8', 'replace')
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
359
        from_ = self._get_from()
0.64.60 by Ian Clatworthy
support merges when from clause implicit
360
        merges = []
361
        while True:
362
            merge = self._get_merge()
363
            if merge is not None:
0.64.104 by Ian Clatworthy
handle multiple merges in the one merge clause
364
                # while the spec suggests it's illegal, git-fast-export
365
                # outputs multiple merges on the one line, e.g.
366
                # merge :x :y :z
367
                these_merges = merge.split(" ")
368
                merges.extend(these_merges)
0.64.60 by Ian Clatworthy
support merges when from clause implicit
369
            else:
370
                break
0.102.9 by Ian Clatworthy
parsing of multiple authors and commit properties
371
        properties = {}
372
        while True:
373
            name_value = self._get_property()
374
            if name_value is not None:
375
                name, value = name_value
376
                properties[name] = value
377
            else:
378
                break
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
379
        return commands.CommitCommand(ref, mark, author, committer, message,
0.102.9 by Ian Clatworthy
parsing of multiple authors and commit properties
380
            from_, merges, self.iter_file_commands, lineno=lineno,
381
            more_authors=more_authors, properties=properties)
0.102.8 by Ian Clatworthy
feature parsing
382
383
    def _parse_feature(self, info):
384
        """Parse a feature command."""
385
        parts = info.split("=", 1)
386
        name = parts[0]
387
        if len(parts) > 1:
388
            value = self._path(parts[1])
389
        else:
390
            value = None
391
        return commands.FeatureCommand(name, value, lineno=self.lineno)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
392
393
    def _parse_file_modify(self, info):
394
        """Parse a filemodify command within a commit.
395
396
        :param info: a string in the format "mode dataref path"
397
          (where dataref might be the hard-coded literal 'inline').
398
        """
399
        params = info.split(' ', 2)
400
        path = self._path(params[2])
0.64.229 by Ian Clatworthy
Handle git submodules in the stream by warning about + ignoring them
401
        is_executable, kind = self._mode(params[0])
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
402
        if params[1] == 'inline':
403
            dataref = None
404
            data = self._get_data('filemodify')
405
        else:
406
            dataref = params[1]
407
            data = None
408
        return commands.FileModifyCommand(path, kind, is_executable, dataref,
409
            data)
410
411
    def _parse_reset(self, ref):
412
        """Parse a reset command."""
413
        from_ = self._get_from()
414
        return commands.ResetCommand(ref, from_)
415
416
    def _parse_tag(self, name):
417
        """Parse a tag command."""
418
        from_ = self._get_from('tag')
0.64.78 by Ian Clatworthy
fix from Pieter de Bie - hack around broken front-ends
419
        tagger = self._get_user_info('tag', 'tagger', accept_just_who=True)
0.64.76 by Ian Clatworthy
fix utf-8 decoding bugs
420
        message = self._get_data('tag', 'message').decode('utf_8')
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
421
        return commands.TagCommand(name, from_, tagger, message)
422
423
    def _get_mark_if_any(self):
424
        """Parse a mark section."""
425
        line = self.next_line()
426
        if line.startswith('mark :'):
427
            return line[len('mark :'):]
428
        else:
429
            self.push_line(line)
430
            return None
431
432
    def _get_from(self, required_for=None):
433
        """Parse a from section."""
434
        line = self.next_line()
0.64.172 by Ian Clatworthy
handle commit commands with no from clause and no sub-commands
435
        if line is None:
436
            return None
437
        elif line.startswith('from '):
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
438
            return line[len('from '):]
439
        elif required_for:
440
            self.abort(errors.MissingSection, required_for, 'from')
441
        else:
442
            self.push_line(line)
443
            return None
444
445
    def _get_merge(self):
446
        """Parse a merge section."""
447
        line = self.next_line()
0.64.172 by Ian Clatworthy
handle commit commands with no from clause and no sub-commands
448
        if line is None:
449
            return None
450
        elif line.startswith('merge '):
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
451
            return line[len('merge '):]
452
        else:
453
            self.push_line(line)
454
            return None
455
0.102.9 by Ian Clatworthy
parsing of multiple authors and commit properties
456
    def _get_property(self):
457
        """Parse a property section."""
458
        line = self.next_line()
459
        if line is None:
460
            return None
461
        elif line.startswith('property '):
462
            return self._name_value(line[len('property '):])
463
        else:
464
            self.push_line(line)
465
            return None
466
0.64.78 by Ian Clatworthy
fix from Pieter de Bie - hack around broken front-ends
467
    def _get_user_info(self, cmd, section, required=True,
468
        accept_just_who=False):
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
469
        """Parse a user section."""
470
        line = self.next_line()
471
        if line.startswith(section + ' '):
0.64.78 by Ian Clatworthy
fix from Pieter de Bie - hack around broken front-ends
472
            return self._who_when(line[len(section + ' '):], cmd, section,
473
                accept_just_who=accept_just_who)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
474
        elif required:
475
            self.abort(errors.MissingSection, cmd, section)
476
        else:
477
            self.push_line(line)
478
            return None
479
480
    def _get_data(self, required_for, section='data'):
481
        """Parse a data section."""
482
        line = self.next_line()
483
        if line.startswith('data '):
484
            rest = line[len('data '):]
485
            if rest.startswith('<<'):
486
                return self.read_until(rest[2:])
487
            else:
488
                size = int(rest)
0.65.1 by James Westby
The data sections have an optional LF at the end in the byte count format.
489
                read_bytes = self.read_bytes(size)
490
                # optional LF after data.
491
                next = self.input.readline()
492
                self.lineno += 1
493
                if len(next) > 1 or next != "\n":
0.65.5 by James Westby
Make the parser handle multiple words in the committer name.
494
                    self.push_line(next[:-1])
0.65.1 by James Westby
The data sections have an optional LF at the end in the byte count format.
495
                return read_bytes
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
496
        else:
497
            self.abort(errors.MissingSection, required_for, section)
498
0.64.78 by Ian Clatworthy
fix from Pieter de Bie - hack around broken front-ends
499
    def _who_when(self, s, cmd, section, accept_just_who=False):
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
500
        """Parse who and when information from a string.
501
        
0.65.5 by James Westby
Make the parser handle multiple words in the committer name.
502
        :return: a tuple of (name,email,timestamp,timezone). name may be
503
            the empty string if only an email address was given.
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
504
        """
505
        match = _WHO_AND_WHEN_RE.search(s)
506
        if match:
0.64.246 by Ian Clatworthy
fix date parsing bug found while importing samba
507
            datestr = match.group(3).lstrip()
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
508
            if self.date_parser is None:
509
                # auto-detect the date format
0.64.3 by Ian Clatworthy
tweak parser for better git-fast-export compatibility
510
                if len(datestr.split(' ')) == 2:
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
511
                    format = 'raw'
512
                elif datestr == 'now':
513
                    format = 'now'
514
                else:
515
                    format = 'rfc2822'
516
                self.date_parser = dates.DATE_PARSERS_BY_NAME[format]
0.64.246 by Ian Clatworthy
fix date parsing bug found while importing samba
517
            try:
518
                when = self.date_parser(datestr, self.lineno)
519
            except ValueError:
520
                print "failed to parse datestr '%s'" % (datestr,)
521
                raise
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
522
        else:
0.64.78 by Ian Clatworthy
fix from Pieter de Bie - hack around broken front-ends
523
            match = _WHO_RE.search(s)
524
            if accept_just_who and match:
525
                # HACK around missing time
526
                # TODO: output a warning here
527
                when = dates.DATE_PARSERS_BY_NAME['now']('now')
528
            else:
529
                self.abort(errors.BadFormat, cmd, section, s)
530
        name = match.group(1)
531
        if len(name) > 0:
532
            if name[-1] == " ":
0.64.103 by Ian Clatworthy
handle empty emails & names/paths that aren't utf8 encoded
533
                try:
534
                    name = name[:-1].decode('utf_8')
535
                except UnicodeDecodeError:
536
                    # The spec says names are *typically* utf8 encoded
537
                    # but that isn't enforced by git-fast-export (at least)
0.64.240 by Ian Clatworthy
Fix unicode email address parsing
538
                    self.warning("%s name not in utf8 - replacing unknown "
539
                        "characters" % (section,))
540
                    name = name[:-1].decode('utf_8', 'replace')
0.64.197 by Ian Clatworthy
Gracefully handle email addresses with unicode characters
541
        email = match.group(2)
542
        # While it shouldn't happen, some datasets have email addresses
543
        # which contain unicode characters. See bug 338186. We sanitize
544
        # the data at this level just in case.
545
        try:
0.64.240 by Ian Clatworthy
Fix unicode email address parsing
546
            email = email.decode('utf_8')
0.64.197 by Ian Clatworthy
Gracefully handle email addresses with unicode characters
547
        except UnicodeDecodeError:
0.64.240 by Ian Clatworthy
Fix unicode email address parsing
548
            self.warning("%s email not in utf8 - replacing unknown characters"
549
                % (section,))
550
            email = email.decode('utf_8', 'replace')
0.64.197 by Ian Clatworthy
Gracefully handle email addresses with unicode characters
551
        return (name, email, when[0], when[1])
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
552
0.102.9 by Ian Clatworthy
parsing of multiple authors and commit properties
553
    def _name_value(self, s):
554
        """Parse a (name,value) tuple from 'name value-length value'."""
555
        parts = s.split(' ', 2)
0.102.10 by Ian Clatworthy
Store multiple authors and revision properties when defined
556
        name = parts[0]
0.102.9 by Ian Clatworthy
parsing of multiple authors and commit properties
557
        if len(parts) == 1:
558
            value = None
559
        else:
560
            size = int(parts[1])
561
            value = parts[2]
562
            still_to_read = size - len(value)
563
            if still_to_read == 1:
564
                value += "\n"
565
            elif still_to_read > 0:
566
                read_bytes = self.read_bytes(still_to_read - 1)
567
                value += "\n" + read_bytes
568
            value = value.decode('utf8')
569
        return (name, value)
570
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
571
    def _path(self, s):
572
        """Parse a path."""
0.64.10 by Ian Clatworthy
1st cut are dequoting paths
573
        if s.startswith('"'):
574
            if s[-1] != '"':
0.64.175 by Ian Clatworthy
fix parsing when a rename old-path has spaces in it
575
                self.abort(errors.BadFormat, '?', '?', s)
0.64.10 by Ian Clatworthy
1st cut are dequoting paths
576
            else:
577
                return _unquote_c_string(s[1:-1])
0.64.103 by Ian Clatworthy
handle empty emails & names/paths that aren't utf8 encoded
578
        try:
579
            return s.decode('utf_8')
580
        except UnicodeDecodeError:
581
            # The spec recommends utf8 encoding but that isn't enforced
582
            return s
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
583
584
    def _path_pair(self, s):
585
        """Parse two paths separated by a space."""
0.64.10 by Ian Clatworthy
1st cut are dequoting paths
586
        # TODO: handle a space in the first path
0.64.175 by Ian Clatworthy
fix parsing when a rename old-path has spaces in it
587
        if s.startswith('"'):
588
            parts = s[1:].split('" ', 1)
589
        else:
590
            parts = s.split(' ', 1)
0.64.181 by Ian Clatworthy
Ignore quotes around second path in a pair (Dmitri Paduchikh)
591
        if len(parts) != 2:
592
            self.abort(errors.BadFormat, '?', '?', s)
593
        elif parts[1].startswith('"') and parts[1].endswith('"'):
594
            parts[1] = parts[1][1:-1]
595
        elif parts[1].startswith('"') or parts[1].endswith('"'):
596
            self.abort(errors.BadFormat, '?', '?', s)
597
        return map(_unquote_c_string, parts)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
598
599
    def _mode(self, s):
0.64.229 by Ian Clatworthy
Handle git submodules in the stream by warning about + ignoring them
600
        """Parse a file mode into executable and kind.
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
601
        
0.64.229 by Ian Clatworthy
Handle git submodules in the stream by warning about + ignoring them
602
        :return (is_executable, kind)
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
603
        """
604
        # Note: Output from git-fast-export slightly different to spec
605
        if s in ['644', '100644', '0100644']:
0.64.229 by Ian Clatworthy
Handle git submodules in the stream by warning about + ignoring them
606
            return False, commands.FILE_KIND
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
607
        elif s in ['755', '100755', '0100755']:
0.64.229 by Ian Clatworthy
Handle git submodules in the stream by warning about + ignoring them
608
            return True, commands.FILE_KIND
0.102.14 by Ian Clatworthy
export and import empty directories
609
        elif s in ['040000', '0040000']:
610
            return False, commands.DIRECTORY_KIND
0.64.3 by Ian Clatworthy
tweak parser for better git-fast-export compatibility
611
        elif s in ['120000', '0120000']:
0.64.229 by Ian Clatworthy
Handle git submodules in the stream by warning about + ignoring them
612
            return False, commands.SYMLINK_KIND
613
        elif s in ['160000', '0160000']:
614
            return False, commands.TREE_REFERENCE_KIND
0.64.1 by Ian Clatworthy
1st cut: gfi parser + --info processing method
615
        else:
616
            self.abort(errors.BadFormat, 'filemodify', 'mode', s)
617
0.64.10 by Ian Clatworthy
1st cut are dequoting paths
618
619
def _unquote_c_string(s):
620
    """replace C-style escape sequences (\n, \", etc.) with real chars."""
621
    # HACK: Python strings are close enough
622
    return s.decode('string_escape', 'replace')