24
24
from bzrlib.tests.blackbox import ExternalBase
25
from bzrlib.tests import TestCaseInTempDir
25
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
28
28
class TestLog(ExternalBase):
30
def _prepare(self, format=None):
32
self.runbzr("init --format="+format)
32
35
self.build_tree(['hello.txt', 'goodbye.txt', 'meep.txt'])
33
36
self.runbzr("add hello.txt")
34
37
self.runbzr("commit -m message1 hello.txt")
108
111
self.assertTrue('branch nick: branch2\n' in log)
109
112
self.assertTrue('branch nick: branch1\n' not in log)
114
def test_log_nonexistent_file(self):
115
# files that don't exist in either the basis tree or working tree
116
# should give an error
117
wt = self.make_branch_and_tree('.')
118
out, err = self.run_bzr('log', 'does-not-exist', retcode=3)
119
self.assertContainsRe(
120
err, 'Path does not have any revision history: does-not-exist')
122
def test_log_with_tags(self):
123
self._prepare(format='dirstate-tags')
124
self.runbzr('tag -r1 tag1')
125
self.runbzr('tag -r1 tag1.1')
126
self.runbzr('tag tag3')
128
log = self.runbzr("log -r-1")[0]
129
self.assertTrue('tags: tag3' in log)
131
log = self.runbzr("log -r1")[0]
132
# I guess that we can't know the order of tags in the output
133
# since dicts are unordered, need to check both possibilities
134
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
136
def test_merged_log_with_tags(self):
139
self._prepare(format='dirstate-tags')
141
self.runbzr('branch branch1 branch2')
143
self.runbzr('commit -m foobar --unchanged')
144
self.runbzr('tag tag1')
145
os.chdir('../branch2')
146
self.runbzr('merge ../branch1')
147
self.runbzr('commit -m merge_branch_1')
148
log = self.runbzr("log -r-1")[0]
149
self.assertContainsRe(log, r' tags: tag1')
151
def test_log_limit(self):
153
log = self.runbzr("log --limit 2")[0]
154
self.assertTrue('revno: 1\n' not in log)
155
self.assertTrue('revno: 2\n' in log)
156
self.assertTrue('revno: 3\n' in log)
112
159
class TestLogMerges(ExternalBase):
167
217
# but we dont have a nice pattern matcher hooked up yet, so:
168
# we check for the indenting of the commit message:
218
# we check for the indenting of the commit message and the
220
self.assertTrue('revno: 2' in out)
169
221
self.assertTrue(' merge branch 1' in out)
222
self.assertTrue(' revno: 1.1.2' in out)
170
223
self.assertTrue(' merge branch 2' in out)
224
self.assertTrue(' revno: 1.1.1.1' in out)
171
225
self.assertTrue(' branch 2' in out)
226
self.assertTrue(' revno: 1.1.1' in out)
172
227
self.assertTrue(' branch 1' in out)
228
self.assertTrue('revno: 1' in out)
173
229
self.assertTrue(' first post' in out)
174
230
self.assertEqual('', err)
274
330
# Make sure the cp1251 string is not found anywhere
275
331
self.assertEquals(-1, stdout.find(test_in_cp1251))
334
class TestLogFile(TestCaseWithTransport):
336
def test_log_local_branch_file(self):
337
"""We should be able to log files in local treeless branches"""
338
tree = self.make_branch_and_tree('tree')
339
self.build_tree(['tree/file'])
341
tree.commit('revision 1')
342
tree.bzrdir.destroy_workingtree()
343
self.run_bzr('log', 'tree/file')
345
def test_log_file(self):
346
"""The log for a particular file should only list revs for that file"""
347
tree = self.make_branch_and_tree('parent')
348
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
350
tree.commit('add file1')
352
tree.commit('add file2')
354
tree.commit('add file3')
355
self.run_bzr('branch', 'parent', 'child')
356
print >> file('child/file2', 'wb'), 'hello'
357
self.run_bzr('commit', '-m', 'branch 1', 'child')
359
self.run_bzr('merge', '../child')
360
self.run_bzr('commit', '-m', 'merge child branch')
362
log = self.run_bzr('log', 'file1')[0]
363
self.assertContainsRe(log, 'revno: 1\n')
364
self.assertNotContainsRe(log, 'revno: 2\n')
365
self.assertNotContainsRe(log, 'revno: 3\n')
366
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
367
self.assertNotContainsRe(log, 'revno: 4\n')
368
log = self.run_bzr('log', 'file2')[0]
369
self.assertNotContainsRe(log, 'revno: 1\n')
370
self.assertContainsRe(log, 'revno: 2\n')
371
self.assertNotContainsRe(log, 'revno: 3\n')
372
self.assertContainsRe(log, 'revno: 3.1.1\n')
373
self.assertContainsRe(log, 'revno: 4\n')
374
log = self.run_bzr('log', 'file3')[0]
375
self.assertNotContainsRe(log, 'revno: 1\n')
376
self.assertNotContainsRe(log, 'revno: 2\n')
377
self.assertContainsRe(log, 'revno: 3\n')
378
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
379
self.assertNotContainsRe(log, 'revno: 4\n')