← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

import scotts non verbose commit fix to allow non pointless commits

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
 
 
17
import os
18
18
from bzrlib.selftest import TestCaseInTempDir
 
19
from bzrlib.errors import NoCommonAncestor, NoCommits
 
20
from bzrlib.branch import copy_branch
 
21
from bzrlib.merge import merge
19
22
 
20
23
class TestRevisionNamespaces(TestCaseInTempDir):
21
24
    def test_revision_namespaces(self):
22
25
        """Functional tests for hashcache"""
23
 
        from bzrlib.errors import BzrError
 
26
        from bzrlib.errors import NoSuchRevision
24
27
        from bzrlib.branch import Branch
25
28
 
26
29
        b = Branch('.', init=True)
29
32
        b.commit('Commit two', rev_id='a@r-0-2')
30
33
        b.commit('Commit three', rev_id='a@r-0-3')
31
34
 
 
35
        self.assertEquals(b.get_revision_info(None), (0, None))
32
36
        self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
33
37
        self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
34
38
        self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
35
 
        self.assertRaises(BzrError, b.get_revision_info, 'revid:a@r-0-0')
 
39
        self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')
 
40
        self.assertRaises(TypeError, b.get_revision_info, object)
36
41
 
37
42
        self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))
38
43
        self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))
39
44
 
40
45
        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
46
        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
47
 
 
48
        os.mkdir('newbranch')
 
49
        b2 = Branch('newbranch', init=True)
 
50
        self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
 
51
 
 
52
        self.assertRaises(NoCommits, b2.lookup_revision, 'ancestor:.')
 
53
        self.assertEquals(b.lookup_revision('ancestor:.'), 'a@r-0-3')
 
54
        os.mkdir('copy')
 
55
        b3 = copy_branch(b, 'copy')
 
56
        b3.commit('Commit four', rev_id='b@r-0-4')
 
57
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'a@r-0-3')
 
58
        merge(['copy', -1], [None, None])
 
59
        b.commit('Commit five', rev_id='a@r-0-4')
 
60
        self.assertEquals(b.lookup_revision('ancestor:copy'), 'b@r-0-4')
 
61
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'b@r-0-4')