/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 breezy/plugins/fastimport/cmds.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-04 12:50:55 UTC
  • mfrom: (7027.2.8 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180704125055-8nni25pn2439p48v
Fix eol handling in knits on Python 3, port fastimport plugin to Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/fastimport-fixes/+merge/348924

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/cmds.py
268
268
                        'The import algorithm to use.',
269
269
                        title='Import Algorithm',
270
270
                        default='Use the preferred algorithm (inventory deltas).',
271
 
                        classic="Use the original algorithm (mutable inventories).",
272
271
                        experimental="Enable experimental features.",
273
272
                        value_switches=True, enum_switch=False,
274
273
                        ),
495
494
        branch = Branch.open_containing(source)[0]
496
495
        outf = exporter._get_output_stream(destination)
497
496
        exporter = exporter.BzrFastExporter(branch,
498
 
            outf=outf, ref="refs/heads/%s" % git_branch, checkpoint=checkpoint,
 
497
            outf=outf, ref=b"refs/heads/%s" % git_branch.encode('utf-8'), checkpoint=checkpoint,
499
498
            import_marks_file=import_marks, export_marks_file=export_marks,
500
499
            revision=revision, verbose=verbose, plain_format=plain,
501
500
            rewrite_tags=rewrite_tag_names, no_tags=no_tags, baseline=baseline)