/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/tests/test_whitebox.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-30 23:18:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3072.
  • Revision ID: john@arbash-meinel.com-20071130231815-0r6ce70307kmv28r
Use a Graph.heads() check to determine if the ancestries are compatible.
Whether we should do nothing because source is already ahead,
raise an exception because we have diverged,
or move forward because the new revision is a tip revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_whitebox.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
import unittest
30
30
 
31
31
    def test_relpath(self):
32
32
        """test for branch path lookups
33
 
 
 
33
    
34
34
        bzrlib.osutils._relpath do a simple but subtle
35
35
        job: given a path (either relative to cwd or absolute), work out
36
36
        if it is inside a branch and return the path relative to the base.
37
37
        """
38
38
        import tempfile
39
 
 
 
39
        
40
40
        savedir = os.getcwdu()
41
 
        dtmp = osutils.mkdtemp()
 
41
        dtmp = tempfile.mkdtemp()
42
42
        # On Mac OSX, /tmp actually expands to /private/tmp
43
43
        dtmp = realpath(dtmp)
44
44
 
45
45
        def rp(p):
46
46
            return relpath(dtmp, p)
47
 
 
 
47
        
48
48
        try:
49
49
            # check paths inside dtmp while standing outside it
50
50
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')