1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Black-box tests for bzr missing."""
1
"""Black-box tests for bzr missing.
23
6
from bzrlib.branch import Branch
24
7
from bzrlib.tests import TestCaseInTempDir
27
9
class TestMissing(TestCaseInTempDir):
29
10
def test_missing(self):
30
def bzr(*args, **kwargs):
31
return self.run_bzr(*args, **kwargs)[0]
32
11
missing = "You are missing 1 revision(s):"
34
13
# create a source branch
38
17
open('a', 'wb').write('initial\n')
40
bzr('commit', '-m', 'inital')
19
self.capture('commit -m inital')
42
21
# clone and add a differing revision
43
bzr('branch', '.', '../b')
22
self.capture('branch . ../b')
45
24
open('a', 'ab').write('more\n')
46
bzr('commit', '-m', 'more')
25
self.capture('commit -m more')
48
# run missing in a against b
50
# this should not require missing to take out a write lock on a
51
# or b. So we take a write lock on both to test that at the same
52
# time. This may let the test pass while the default branch is an
53
# os-locking branch, but it will trigger failures with lockdir based
55
branch_a = Branch.open('.')
57
branch_b = Branch.open('../b')
59
out,err = self.run_bzr('missing', '../b', retcode=1)
60
lines = out.splitlines()
29
lines = self.capture('missing ../b', retcode=1).splitlines()
61
30
# we're missing the extra revision here
62
31
self.assertEqual(missing, lines[0])
63
# and we expect 8 lines of output which we trust at the moment to be
65
32
self.assertEqual(8, len(lines))
66
# we do not expect any error output.
67
self.assertEqual('', err)
68
# unlock the branches for the rest of the test
72
34
# get extra revision from b
74
bzr('commit', '-m', 'merge')
35
self.capture('merge ../b')
36
self.capture('commit -m merge')
76
38
# compare again, but now we have the 'merge' commit extra
77
lines = bzr('missing', '../b', retcode=1).splitlines()
39
lines = self.capture('missing ../b', retcode=1).splitlines()
78
40
self.assertEqual("You have 1 extra revision(s):", lines[0])
79
41
self.assertEqual(8, len(lines))
80
lines2 = bzr('missing', '../b', '--mine-only', retcode=1)
42
lines2 = self.capture('missing ../b --mine-only', retcode=1)
81
43
lines2 = lines2.splitlines()
82
44
self.assertEqual(lines, lines2)
83
lines3 = bzr('missing', '../b', '--theirs-only', retcode=1)
45
lines3 = self.capture('missing ../b --theirs-only', retcode=1)
84
46
lines3 = lines3.splitlines()
85
47
self.assertEqual(0, len(lines3))
87
49
# relative to a, missing the 'merge' commit
89
lines = bzr('missing', '../a', retcode=1).splitlines()
51
lines = self.capture('missing ../a', retcode=1).splitlines()
90
52
self.assertEqual(missing, lines[0])
91
53
self.assertEqual(8, len(lines))
92
lines2 = bzr('missing', '../a', '--theirs-only', retcode=1)
54
lines2 = self.capture('missing ../a --theirs-only', retcode=1)
93
55
lines2 = lines2.splitlines()
94
56
self.assertEqual(lines, lines2)
95
lines3 = bzr('missing', '../a', '--mine-only', retcode=1)
57
lines3 = self.capture('missing ../a --mine-only', retcode=1)
96
58
lines3 = lines3.splitlines()
97
59
self.assertEqual(0, len(lines3))
98
lines4 = bzr('missing', '../a', '--short', retcode=1)
60
lines4 = self.capture('missing ../a --short', retcode=1)
99
61
lines4 = lines4.splitlines()
100
62
self.assertEqual(4, len(lines4))
101
lines5 = bzr('missing', '../a', '--line', retcode=1)
63
lines5 = self.capture('missing ../a --line', retcode=1)
102
64
lines5 = lines5.splitlines()
103
65
self.assertEqual(2, len(lines5))
104
lines6 = bzr('missing', '../a', '--reverse', retcode=1)
66
lines6 = self.capture('missing ../a --reverse', retcode=1)
105
67
lines6 = lines6.splitlines()
106
68
self.assertEqual(lines6, lines)
107
lines7 = bzr('missing', '../a', '--show-ids', retcode=1)
69
lines7 = self.capture('missing ../a --show-ids', retcode=1)
108
70
lines7 = lines7.splitlines()
109
71
self.assertEqual(11, len(lines7))
110
lines8 = bzr('missing', '../a', '--verbose', retcode=1)
72
lines8 = self.capture('missing ../a --verbose', retcode=1)
111
73
lines8 = lines8.splitlines()
112
74
self.assertEqual("modified:", lines8[-2])
113
75
self.assertEqual(" a", lines8[-1])
116
78
# after a pull we're back on track
118
80
self.assertEqual("Branches are up to date.\n",
119
bzr('missing', '../a'))
81
self.capture('missing ../a'))
added
removed
bzrlib/tests/blackbox/test_missing.py
