/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/git/git_remote_helper.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-24 20:32:24 UTC
  • mto: This revision was merged to the branch mainline in revision 7054.
  • Revision ID: jelmer@jelmer.uk-20180724203224-3h7jeutnl8na513m
Fix another 128 tests on python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/git_remote_helper.py
142
142
    def cmd_import(self, outf, argv):
143
143
        if "fastimport" in CAPABILITIES:
144
144
            raise Exception("install fastimport for 'import' command support")
145
 
        dest_branch_name = ref_to_branch_name(argv[1].encode('utf-8'))
 
145
        ref = argv[1].encode('utf-8')
 
146
        dest_branch_name = ref_to_branch_name(ref)
146
147
        if dest_branch_name == "master":
147
148
            dest_branch_name = None
148
149
        remote_branch = self.remote_dir.open_branch(name=dest_branch_name)
149
150
        exporter = fastexporter.BzrFastExporter(remote_branch,
150
 
            outf=outf, ref=argv[1],
 
151
            outf=outf, ref=ref,
151
152
            checkpoint=None, import_marks_file=None,
152
153
            export_marks_file=None, revision=None,
153
154
            verbose=None, plain_format=True,