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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
53
53
from .lock import LogicalLockResult
54
54
from .sixish import (
55
55
    BytesIO,
 
56
    text_type,
56
57
    viewitems,
57
58
    )
58
59
from .trace import mutter, mutter_callsite, note, is_quiet
771
772
        # FIXUP this and get_parent in a future branch format bump:
772
773
        # read and rewrite the file. RBC 20060125
773
774
        if url is not None:
774
 
            if isinstance(url, unicode):
 
775
            if isinstance(url, text_type):
775
776
                try:
776
777
                    url = url.encode('ascii')
777
778
                except UnicodeEncodeError: