← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

[merge] from robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
108
108
    def test_relpath(self):
109
109
        """test for branch path lookups
110
110
    
111
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
111
        bzrlib.osutils._relpath do a simple but subtle
112
112
        job: given a path (either relative to cwd or absolute), work out
113
113
        if it is inside a branch and return the path relative to the base.
114
114
        """
115
 
        from bzrlib.branch import _relpath
 
115
        from bzrlib.osutils import relpath
116
116
        import tempfile, shutil
117
117
        
118
118
        savedir = os.getcwdu()
121
121
        dtmp = os.path.realpath(dtmp)
122
122
 
123
123
        def rp(p):
124
 
            return _relpath(dtmp, p)
 
124
            return relpath(dtmp, p)
125
125
        
126
126
        try:
127
127
            # check paths inside dtmp while standing outside it