← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-22 12:52:39 UTC
  • mto: (4471.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4472.
  • Revision ID: v.ladeuil+lp@free.fr-20090622125239-kabo9smxt9c3vnir
Use a consistent scheme for naming pyrex source files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
19
import warnings
20
20
 
21
21
from bzrlib import (
 
22
    bugtracker,
22
23
    revision,
23
24
    symbol_versioning,
24
25
    )
25
26
from bzrlib.branch import Branch
26
 
from bzrlib.errors import NoSuchRevision
 
27
from bzrlib.errors import (
 
28
    InvalidBugStatus,
 
29
    InvalidLineInBugsProperty,
 
30
    NoSuchRevision,
 
31
    )
27
32
from bzrlib.deprecated_graph import Graph
28
33
from bzrlib.revision import (find_present_ancestors,
29
34
                             NULL_REVISION)
30
 
from bzrlib.symbol_versioning import one_three
31
35
from bzrlib.tests import TestCase, TestCaseWithTransport
32
36
from bzrlib.trace import mutter
33
37
from bzrlib.workingtree import WorkingTree
47
51
 
48
52
    the object graph is
49
53
    B:     A:
50
 
    a..0   a..0 
 
54
    a..0   a..0
51
55
    a..1   a..1
52
56
    a..2   a..2
53
57
    b..3   a..3 merges b..4
60
64
    """
61
65
    tree1 = self.make_branch_and_tree("branch1", format=format)
62
66
    br1 = tree1.branch
63
 
    
 
67
 
64
68
    tree1.commit("Commit one", rev_id="a@u-0-0")
65
69
    tree1.commit("Commit two", rev_id="a@u-0-1")
66
70
    tree1.commit("Commit three", rev_id="a@u-0-2")
67
71
 
68
 
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
 
72
    tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
69
73
    br2 = tree2.branch
70
74
    tree2.commit("Commit four", rev_id="b@u-0-3")
71
75
    tree2.commit("Commit five", rev_id="b@u-0-4")
72
76
    revisions_2 = br2.revision_history()
73
77
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
74
 
    
 
78
 
75
79
    tree1.merge_from_branch(br2)
76
80
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
81
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
82
    tree2.commit("Commit eight", rev_id="b@u-0-5")
79
83
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
80
 
    
 
84
 
81
85
    tree1.merge_from_branch(br2)
82
86
    tree1.commit("Commit nine", rev_id="a@u-0-5")
83
87
    # DO NOT MERGE HERE - we WANT a GHOST.
84
88
    tree2.add_parent_tree_id(br1.revision_history()[4])
85
89
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
86
 
    
 
90
 
87
91
    return br1, br2
88
92
 
89
93
 
123
127
                       rev_id, branch.repository.get_ancestry(rev_id))
124
128
                result = sorted(branch.repository.get_ancestry(rev_id))
125
129
                self.assertEquals(result, [None] + sorted(anc))
126
 
    
 
130
 
127
131
 
128
132
class TestIntermediateRevisions(TestCaseWithTransport):
129
133
 
142
146
        wt2.merge_from_branch(self.br1)
143
147
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
148
 
145
 
        from bzrlib.revision import MultipleRevisionSources
146
 
        self.sources = self.applyDeprecated(one_three,
147
 
                        MultipleRevisionSources, self.br1.repository,
148
 
                                                 self.br2.repository)
149
 
 
150
 
 
151
149
 
152
150
class MockRevisionSource(object):
153
151
    """A RevisionSource that takes a pregenerated graph.
214
212
    def test_get_apparent_author(self):
215
213
        r = revision.Revision('1')
216
214
        r.committer = 'A'
217
 
        self.assertEqual('A', r.get_apparent_author())
218
 
        r.properties['author'] = 'B'
219
 
        self.assertEqual('B', r.get_apparent_author())
 
215
        author = self.applyDeprecated(
 
216
                symbol_versioning.deprecated_in((1, 13, 0)),
 
217
                r.get_apparent_author)
 
218
        self.assertEqual('A', author)
 
219
        r.properties['author'] = 'B'
 
220
        author = self.applyDeprecated(
 
221
                symbol_versioning.deprecated_in((1, 13, 0)),
 
222
                r.get_apparent_author)
 
223
        self.assertEqual('B', author)
 
224
        r.properties['authors'] = 'C\nD'
 
225
        author = self.applyDeprecated(
 
226
                symbol_versioning.deprecated_in((1, 13, 0)),
 
227
                r.get_apparent_author)
 
228
        self.assertEqual('C', author)
 
229
 
 
230
    def test_get_apparent_author_none(self):
 
231
        r = revision.Revision('1')
 
232
        author = self.applyDeprecated(
 
233
                symbol_versioning.deprecated_in((1, 13, 0)),
 
234
                r.get_apparent_author)
 
235
        self.assertEqual(None, author)
 
236
 
 
237
    def test_get_apparent_authors(self):
 
238
        r = revision.Revision('1')
 
239
        r.committer = 'A'
 
240
        self.assertEqual(['A'], r.get_apparent_authors())
 
241
        r.properties['author'] = 'B'
 
242
        self.assertEqual(['B'], r.get_apparent_authors())
 
243
        r.properties['authors'] = 'C\nD'
 
244
        self.assertEqual(['C', 'D'], r.get_apparent_authors())
 
245
 
 
246
    def test_get_apparent_authors_no_committer(self):
 
247
        r = revision.Revision('1')
 
248
        self.assertEqual([], r.get_apparent_authors())
 
249
 
 
250
 
 
251
class TestRevisionBugs(TestCase):
 
252
    """Tests for getting the bugs that a revision is linked to."""
 
253
 
 
254
    def test_no_bugs(self):
 
255
        r = revision.Revision('1')
 
256
        self.assertEqual([], list(r.iter_bugs()))
 
257
 
 
258
    def test_some_bugs(self):
 
259
        r = revision.Revision(
 
260
            '1', properties={
 
261
                'bugs': bugtracker.encode_fixes_bug_urls(
 
262
                    ['http://example.com/bugs/1',
 
263
                     'http://launchpad.net/bugs/1234'])})
 
264
        self.assertEqual(
 
265
            [('http://example.com/bugs/1', bugtracker.FIXED),
 
266
             ('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
 
267
            list(r.iter_bugs()))
 
268
 
 
269
    def test_no_status(self):
 
270
        r = revision.Revision(
 
271
            '1', properties={'bugs': 'http://example.com/bugs/1'})
 
272
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
 
273
 
 
274
    def test_too_much_information(self):
 
275
        r = revision.Revision(
 
276
            '1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
 
277
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
 
278
 
 
279
    def test_invalid_status(self):
 
280
        r = revision.Revision(
 
281
            '1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
 
282
        self.assertRaises(InvalidBugStatus, list, r.iter_bugs())