1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
# Copyright (C) 2005 by Canonical Ltd
# -*- coding: utf-8 -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Black-box tests for bzr log."""
import os
from bzrlib.tests.blackbox import ExternalBase
class TestLog(ExternalBase):
def _prepare(self):
self.runbzr("init")
self.build_tree(['hello.txt', 'goodbye.txt', 'meep.txt'])
self.runbzr("add hello.txt")
self.runbzr("commit -m message1 hello.txt")
self.runbzr("add goodbye.txt")
self.runbzr("commit -m message2 goodbye.txt")
self.runbzr("add meep.txt")
self.runbzr("commit -m message3 meep.txt")
self.full_log = self.runbzr("log")[0]
def test_log_null_end_revspec(self):
self._prepare()
self.assertTrue('revno: 1\n' in self.full_log)
self.assertTrue('revno: 2\n' in self.full_log)
self.assertTrue('revno: 3\n' in self.full_log)
self.assertTrue('message:\n message1\n' in self.full_log)
self.assertTrue('message:\n message2\n' in self.full_log)
self.assertTrue('message:\n message3\n' in self.full_log)
log = self.runbzr("log -r 1..")[0]
self.assertEquals(log, self.full_log)
def test_log_null_begin_revspec(self):
self._prepare()
log = self.runbzr("log -r ..3")[0]
self.assertEquals(self.full_log, log)
def test_log_null_both_revspecs(self):
self._prepare()
log = self.runbzr("log -r ..")[0]
self.assertEquals(self.full_log, log)
def test_log_negative_begin_revspec_full_log(self):
self._prepare()
log = self.runbzr("log -r -3..")[0]
self.assertEquals(self.full_log, log)
def test_log_negative_both_revspec_full_log(self):
self._prepare()
log = self.runbzr("log -r -3..-1")[0]
self.assertEquals(self.full_log, log)
def test_log_negative_both_revspec_partial(self):
self._prepare()
log = self.runbzr("log -r -3..-2")[0]
self.assertTrue('revno: 1\n' in log)
self.assertTrue('revno: 2\n' in log)
self.assertTrue('revno: 3\n' not in log)
def test_log_negative_begin_revspec(self):
self._prepare()
log = self.runbzr("log -r -2..")[0]
self.assertTrue('revno: 1\n' not in log)
self.assertTrue('revno: 2\n' in log)
self.assertTrue('revno: 3\n' in log)
def test_log_postive_revspecs(self):
self._prepare()
log = self.runbzr("log -r 1..3")[0]
self.assertEquals(self.full_log, log)
class TestLogMerges(ExternalBase):
def test_merges_are_indented_by_level(self):
self.build_tree(['parent/'])
self.run_bzr('init', 'parent')
self.run_bzr('commit', '-m', 'first post', '--unchanged', 'parent')
self.run_bzr('branch', 'parent', 'child')
self.run_bzr('commit', '-m', 'branch 1', '--unchanged', 'child')
self.run_bzr('branch', 'child', 'smallerchild')
self.run_bzr('commit', '-m', 'branch 2', '--unchanged', 'smallerchild')
os.chdir('child')
self.run_bzr('merge', '../smallerchild')
self.run_bzr('commit', '-m', 'merge branch 2')
os.chdir('../parent')
self.run_bzr('merge', '../child')
self.run_bzr('commit', '-m', 'merge branch 1')
out,err = self.run_bzr('log')
# the log will look something like:
# self.assertEqual("""\
#------------------------------------------------------------
#revno: 2
#committer: Robert Collins <foo@example.com>
#branch nick: parent
#timestamp: Tue 2006-03-28 22:31:40 +1100
#message:
# merge branch 1
# ------------------------------------------------------------
# merged: foo@example.com-20060328113140-91f43cfb46dc2863
# committer: Robert Collins <foo@example.com>
# branch nick: child
# timestamp: Tue 2006-03-28 22:31:40 +1100
# message:
# merge branch 2
# ------------------------------------------------------------
# merged: foo@example.com-20060328113140-1ba24f850a0ef573
# committer: Robert Collins <foo@example.com>
# branch nick: smallerchild
# timestamp: Tue 2006-03-28 22:31:40 +1100
# message:
# branch 2
# ------------------------------------------------------------
# merged: foo@example.com-20060328113140-5749a4757a8ac792
# committer: Robert Collins <foo@example.com>
# branch nick: child
# timestamp: Tue 2006-03-28 22:31:40 +1100
# message:
# branch 1
#------------------------------------------------------------
#revno: 1
#committer: Robert Collins <foo@example.com>
#branch nick: parent
#timestamp: Tue 2006-03-28 22:31:39 +1100
#message:
# first post
#""", out)
# but we dont have a nice pattern matcher hooked up yet, so:
# we check for the indenting of the commit message:
self.assertTrue(' merge branch 1' in out)
self.assertTrue(' merge branch 2' in out)
self.assertTrue(' branch 2' in out)
self.assertTrue(' branch 1' in out)
self.assertTrue(' first post' in out)
self.assertEqual('', err)
|