~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-07 01:06:26 UTC
  • mto: (6437.3.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@samba.org-20120107010626-vytp4nsgs8c3hnc3
Fix some tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1450
1450
            branches = dir.get_branches()
1451
1451
            names = {}
1452
1452
            for name, branch in branches.iteritems():
1453
 
                if name is None:
 
1453
                if name == "":
1454
1454
                    continue
1455
1455
                active = (active_branch is not None and
1456
1456
                          active_branch.base == branch.base)
1457
1457
                names[name] = active
1458
1458
            # Only mention the current branch explicitly if it's not
1459
1459
            # one of the colocated branches
1460
 
            if not any(names.values()) and active_branch is not None:
 
1460
            if not any(names.values()) and active_branch != "":
1461
1461
                self.outf.write("* %s\n" % gettext("(default)"))
1462
1462
            for name in sorted(names.keys()):
1463
1463
                active = names[name]