/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/commands.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 03:20:44 UTC
  • mfrom: (7018.3.10 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180703032044-t5a5w5y0tmzrbezc
Port a few more bits of the git plugin to python 3.

Merged from https://code.launchpad.net/~jelmer/brz/git-fixes2/+merge/348803

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/commands.py
33
33
    )
34
34
from ...sixish import (
35
35
    text_type,
 
36
    viewitems,
36
37
    )
37
38
 
38
39
 
129
130
        refs = interrepo.fetch()
130
131
        pb = ui.ui_factory.nested_progress_bar()
131
132
        try:
132
 
            for i, (name, sha) in enumerate(refs.iteritems()):
 
133
            for i, (name, sha) in enumerate(viewitems(refs)):
133
134
                try:
134
135
                    branch_name = ref_to_branch_name(name)
135
136
                except ValueError:
232
233
        object_store = get_object_store(repo)
233
234
        with object_store.lock_read():
234
235
            refs = get_refs_container(controldir, object_store)
235
 
            for k, v in refs.as_dict().iteritems():
236
 
                self.outf.write("%s -> %s\n" % (k, v))
 
236
            for k, v in sorted(viewitems(refs.as_dict())):
 
237
                self.outf.write("%s -> %s\n" % (k.decode('utf-8'), v.decode('utf-8')))
237
238
 
238
239
 
239
240
class cmd_git_apply(Command):