← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 18:16:47 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-20051201181647-2d65af900f14ba6a
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
67
67
                            pumpfile,
68
68
                            splitpath,
69
69
                            rand_bytes,
 
70
                            abspath,
70
71
                            realpath,
71
72
                            relpath,
72
73
                            rename)
230
231
            # sanity check.
231
232
            if path.find('://') != -1:
232
233
                raise NotBranchError(path=path)
233
 
        path = os.path.abspath(path)
 
234
        path = abspath(path)
234
235
        tail = u''
235
236
        while True:
236
237
            try:
265
266
    def abspath(self, filename):
266
267
        return pathjoin(self.basedir, filename)
267
268
 
268
 
    def relpath(self, abspath):
 
269
    def relpath(self, abs):
269
270
        """Return the local path portion from a given absolute path."""
270
 
        return relpath(self.basedir, abspath)
 
271
        return relpath(self.basedir, abs)
271
272
 
272
273
    def has_filename(self, filename):
273
274
        return bzrlib.osutils.lexists(self.abspath(filename))