/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to parser.py

support merges when from clause implicit

Show diffs side-by-side

added added

removed removed

Lines of Context:
parser.py
339
339
        committer = self._get_user_info('commit', 'committer')
340
340
        message = self._get_data('commit', 'message')
341
341
        from_ = self._get_from()
342
 
        if from_ is not None:
343
 
            parents = [from_]
344
 
            while True:
345
 
                merge = self._get_merge()
346
 
                if merge is not None:
347
 
                    parents.append(merge)
348
 
                else:
349
 
                    break
350
 
        else:
351
 
            parents = []
 
342
        merges = []
 
343
        while True:
 
344
            merge = self._get_merge()
 
345
            if merge is not None:
 
346
                merges.append(merge)
 
347
            else:
 
348
                break
352
349
        return commands.CommitCommand(ref, mark, author, committer, message,
353
 
            parents, self.iter_file_commands, lineno)
 
350
            from_, merges, self.iter_file_commands, lineno)
354
351
 
355
352
    def _parse_file_modify(self, info):
356
353
        """Parse a filemodify command within a commit.