/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/transport/local.py

  • Committer: Patch Queue Manager
  • Date: 2011-11-24 13:15:51 UTC
  • mfrom: (6240.4.5 rmbranch-colo)
  • Revision ID: pqm@pqm.ubuntu.com-20111124131551-u7xzxgto1p1yfz57
(gz) Support removing colocated branches in 'bzr rmbranch' (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
146
146
        if abspath is None:
147
147
            abspath = u'.'
148
148
 
149
 
        return urlutils.file_relpath(
150
 
            urlutils.strip_trailing_slash(self.base),
151
 
            urlutils.strip_trailing_slash(abspath))
 
149
        return urlutils.file_relpath(self.base, abspath)
152
150
 
153
151
    def has(self, relpath):
154
152
        return os.access(self._abspath(relpath), os.F_OK)
540
538
            """See Transport.symlink."""
541
539
            abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
542
540
            source_rel = urlutils.file_relpath(
543
 
                urlutils.strip_trailing_slash(abs_link_dirpath),
544
 
                urlutils.strip_trailing_slash(self.abspath(source))
545
 
            )
 
541
                abs_link_dirpath, self.abspath(source))
546
542
 
547
543
            try:
548
544
                os.symlink(source_rel, self._abspath(link_name))