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

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 18:33:35 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201183335-578f560fb6f8d3c3
Changing os.path.normpath to osutils.normpath

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
28
28
from bzrlib.trace import mutter, note
29
29
from bzrlib.osutils import (isdir, quotefn,
30
30
                            rename, splitpath, sha_file,
31
 
                            file_kind, abspath, pathjoin)
 
31
                            file_kind, abspath, normpath, pathjoin)
32
32
import bzrlib.errors as errors
33
33
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
34
34
                           NoSuchRevision, HistoryMissing, NotBranchError,
133
133
        while True:
134
134
            try:
135
135
                return BzrBranch(t), t.relpath(url)
136
 
            except NotBranchError:
137
 
                pass
 
136
            except NotBranchError, e:
 
137
                mutter('not a branch in: %r %s', t.base, e)
138
138
            new_t = t.clone('..')
139
139
            if new_t.base == t.base:
140
140
                # reached the root, whatever that may be
1143
1143
 
1144
1144
def is_control_file(filename):
1145
1145
    ## FIXME: better check
1146
 
    filename = os.path.normpath(filename)
 
1146
    filename = normpath(filename)
1147
1147
    while filename != '':
1148
1148
        head, tail = os.path.split(filename)
1149
1149
        ## mutter('check %r for control file' % ((head, tail), ))