/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 bzrlib/bzrdir.py

Fix test_upgrade defects related to non local or absent working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1069
1069
                              format.workingtree_format.__class__):
1070
1070
                # the workingtree needs an upgrade.
1071
1071
                return True
1072
 
        except errors.NotBranchError:
 
1072
        except (errors.NoWorkingTree, errors.NotLocalUrl):
1073
1073
            pass
1074
1074
        return False
1075
1075
 
2082
2082
                branch_converter.convert(branch)
2083
2083
        try:
2084
2084
            tree = self.bzrdir.open_workingtree()
2085
 
        except errors.NotBranchError:
 
2085
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2086
2086
            pass
2087
2087
        else:
2088
2088
            # TODO: conversions of Branch and Tree should be done by