/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
1
# Copyright (C) 2007 David Allouche <ddaa@ddaa.net>
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
2
# Copyright (C) 2007-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
17
18
"""Black-box tests for bzr-git."""
19
0.358.3 by Jelmer Vernooij
Enable absolute import.
20
from __future__ import absolute_import
21
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
22
from dulwich.repo import (
23
    Repo as GitRepo,
24
    )
25
0.200.89 by Jelmer Vernooij
Support sprouting branches.
26
import os
27
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
28
from ...controldir import (
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
29
    ControlDir,
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
30
    )
31
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
32
from ...tests.blackbox import ExternalBase
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
33
from ...workingtree import WorkingTree
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
34
0.200.1642 by Jelmer Vernooij
Use relative imports in tests.
35
from .. import (
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
36
    tests,
37
    )
7290.26.1 by Jelmer Vernooij
Fix switching in git repositories.
38
from ...tests.script import TestCaseWithTransportAndScript
7211.8.1 by Jelmer Vernooij
Fix stats in Python3 git repositories.
39
from ...tests.features import PluginLoadedFeature
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
40
41
42
class TestGitBlackBox(ExternalBase):
43
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
44
    def simple_commit(self):
45
        # Create a git repository with a revision.
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
46
        repo = GitRepo.init(self.test_dir)
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
47
        builder = tests.GitBranchBuilder()
7018.3.2 by Jelmer Vernooij
Fix some git tests.
48
        builder.set_file('a', b'text for a\n', False)
49
        r1 = builder.commit(b'Joe Foo <joe@foo.com>', u'<The commit message>')
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
50
        return repo, builder.finish()[r1]
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
51
0.200.294 by Jelmer Vernooij
Add test for nick.
52
    def test_nick(self):
0.200.1559 by Jelmer Vernooij
Fix compatibility with bzr 2.5.
53
        r = GitRepo.init(self.test_dir)
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
54
        dir = ControlDir.open(self.test_dir)
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
55
        dir.create_branch()
0.200.294 by Jelmer Vernooij
Add test for nick.
56
        output, error = self.run_bzr(['nick'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
57
        self.assertEqual("master\n", output)
0.200.294 by Jelmer Vernooij
Add test for nick.
58
0.327.1 by Jelmer Vernooij
Add test for branches command.
59
    def test_branches(self):
60
        self.simple_commit()
61
        output, error = self.run_bzr(['branches'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
62
        self.assertEqual("* master\n", output)
0.327.1 by Jelmer Vernooij
Add test for branches command.
63
0.200.68 by Jelmer Vernooij
Add blackbox test for info.
64
    def test_info(self):
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
65
        self.simple_commit()
0.200.68 by Jelmer Vernooij
Add blackbox test for info.
66
        output, error = self.run_bzr(['info'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
67
        self.assertEqual(error, '')
7211.9.1 by Jelmer Vernooij
Report colocated branch name in 'brz info'.
68
        self.assertEqual(
7211.9.2 by Jelmer Vernooij
Fix formatting.
69
            output,
70
            'Standalone tree (format: git)\n'
71
            'Location:\n'
72
            '            light checkout root: .\n'
73
            '  checkout of co-located branch: master\n')
0.200.68 by Jelmer Vernooij
Add blackbox test for info.
74
7199.4.1 by Jelmer Vernooij
Fix 'brz ignore' in Git working trees.
75
    def test_ignore(self):
76
        self.simple_commit()
77
        output, error = self.run_bzr(['ignore', 'foo'])
78
        self.assertEqual(error, '')
79
        self.assertEqual(output, '')
80
        self.assertFileEqual("foo\n", ".gitignore")
81
7290.7.1 by Jelmer Vernooij
Print proper error when running `brz cat-revision` on Git repositories.
82
    def test_cat_revision(self):
83
        self.simple_commit()
84
        output, error = self.run_bzr(['cat-revision', '-r-1'], retcode=3)
85
        self.assertContainsRe(
86
            error,
87
            'brz: ERROR: Repository .* does not support access to raw '
88
            'revision texts')
89
        self.assertEqual(output, '')
90
0.200.89 by Jelmer Vernooij
Support sprouting branches.
91
    def test_branch(self):
92
        os.mkdir("gitbranch")
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
93
        GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
94
        os.chdir('gitbranch')
0.200.89 by Jelmer Vernooij
Support sprouting branches.
95
        builder = tests.GitBranchBuilder()
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
96
        builder.set_file(b'a', b'text for a\n', False)
97
        builder.commit(b'Joe Foo <joe@foo.com>', b'<The commit message>')
0.200.89 by Jelmer Vernooij
Support sprouting branches.
98
        builder.finish()
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
99
        os.chdir('..')
0.200.89 by Jelmer Vernooij
Support sprouting branches.
100
101
        output, error = self.run_bzr(['branch', 'gitbranch', 'bzrbranch'])
0.200.1382 by Jelmer Vernooij
Fix test after i18n fixes in bzr.dev.
102
        self.assertTrue(
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
103
            (error == 'Branched 1 revision(s).\n') or
104
            (error == 'Branched 1 revision.\n'),
0.200.1382 by Jelmer Vernooij
Fix test after i18n fixes in bzr.dev.
105
            error)
0.200.89 by Jelmer Vernooij
Support sprouting branches.
106
0.200.1151 by Jelmer Vernooij
Update NEWS, add test for bug fixed earlier.
107
    def test_checkout(self):
108
        os.mkdir("gitbranch")
109
        GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
110
        os.chdir('gitbranch')
111
        builder = tests.GitBranchBuilder()
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
112
        builder.set_file(b'a', b'text for a\n', False)
113
        builder.commit(b'Joe Foo <joe@foo.com>', b'<The commit message>')
0.200.1151 by Jelmer Vernooij
Update NEWS, add test for bug fixed earlier.
114
        builder.finish()
115
        os.chdir('..')
116
117
        output, error = self.run_bzr(['checkout', 'gitbranch', 'bzrbranch'])
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
118
        self.assertEqual(error,
7143.15.2 by Jelmer Vernooij
Run autopep8.
119
                         'Fetching from Git to Bazaar repository. '
120
                         'For better performance, fetch into a Git repository.\n')
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
121
        self.assertEqual(output, '')
0.200.1151 by Jelmer Vernooij
Update NEWS, add test for bug fixed earlier.
122
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
123
    def test_branch_ls(self):
0.200.78 by Jelmer Vernooij
Add blackbox test for ls.
124
        self.simple_commit()
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
125
        output, error = self.run_bzr(['ls', '-r-1'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
126
        self.assertEqual(error, '')
127
        self.assertEqual(output, "a\n")
0.200.78 by Jelmer Vernooij
Add blackbox test for ls.
128
0.200.108 by Jelmer Vernooij
Support bzr init --git.
129
    def test_init(self):
0.200.1653 by Jelmer Vernooij
--git is now --format=git.
130
        self.run_bzr("init --format=git repo")
0.200.108 by Jelmer Vernooij
Support bzr init --git.
131
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
132
    def test_info_verbose(self):
133
        self.simple_commit()
134
135
        output, error = self.run_bzr(['info', '-v'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
136
        self.assertEqual(error, '')
137
        self.assertTrue("Standalone tree (format: git)" in output)
138
        self.assertTrue("control: Local Git Repository" in output)
139
        self.assertTrue("branch: Local Git Branch" in output)
140
        self.assertTrue("repository: Git Repository" in output)
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
141
0.200.1325 by Jelmer Vernooij
More test fixes.
142
    def test_push_roundtripping(self):
0.267.1 by Martin
Don't raise the deprecated KnownFailure from tests
143
        self.knownFailure("roundtripping is not yet supported")
0.200.1325 by Jelmer Vernooij
More test fixes.
144
        self.with_roundtripping()
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
145
        os.mkdir("bla")
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
146
        GitRepo.init(os.path.join(self.test_dir, "bla"))
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
147
        self.run_bzr(['init', 'foo'])
148
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
0.200.1156 by Jelmer Vernooij
Disable push.
149
        # when roundtripping is supported
0.252.12 by Jelmer Vernooij
Fix push blackbox test.
150
        output, error = self.run_bzr(['push', '-d', 'foo', 'bla'])
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
151
        self.assertEqual(b"", output)
152
        self.assertTrue(error.endswith(b"Created new branch.\n"))
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
153
7339.1.6 by Jelmer Vernooij
Also support revno-less push/pull operations.
154
    def test_push_without_calculate_revnos(self):
155
        self.run_bzr(['init', '--git', 'bla'])
156
        self.run_bzr(['init', '--git', 'foo'])
157
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
158
        output, error = self.run_bzr(
159
            ['push', '-Ocalculate_revnos=no', '-d', 'foo', 'bla'])
160
        self.assertEqual("", output)
161
        self.assertContainsRe(
162
            error,
7339.1.10 by Jelmer Vernooij
Fix test.
163
            'Pushed up to revision id git(.*).\n')
7339.1.6 by Jelmer Vernooij
Also support revno-less push/pull operations.
164
7296.4.1 by Jelmer Vernooij
Fix pushing non-mainline revisions from bzr to git.
165
    def test_push_lossy_non_mainline(self):
166
        self.run_bzr(['init', '--git', 'bla'])
167
        self.run_bzr(['init', 'foo'])
168
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
169
        self.run_bzr(['branch', 'foo', 'foo1'])
170
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo1'])
171
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
172
        self.run_bzr(['merge', '-d', 'foo', 'foo1'])
173
        self.run_bzr(['commit', '--unchanged', '-m', 'merge', 'foo'])
174
        output, error = self.run_bzr(['push', '--lossy', '-r1.1.1', '-d', 'foo', 'bla'])
7296.4.2 by Jelmer Vernooij
Fix test.
175
        self.assertEqual("", output)
7296.4.1 by Jelmer Vernooij
Fix pushing non-mainline revisions from bzr to git.
176
        self.assertEqual(
7296.4.2 by Jelmer Vernooij
Fix test.
177
            'Pushing from a Bazaar to a Git repository. For better '
178
            'performance, push into a Bazaar repository.\n'
7350.1.3 by Vincent Ladeuil
Fix test_push_lossy_non_mainline failure.
179
            'All changes applied successfully.\n'
7296.4.2 by Jelmer Vernooij
Fix test.
180
            'Pushed up to revision 2.\n', error)
7296.4.1 by Jelmer Vernooij
Fix pushing non-mainline revisions from bzr to git.
181
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
182
    def test_log(self):
183
        # Smoke test for "bzr log" in a git repository.
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
184
        self.simple_commit()
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
185
186
        # Check that bzr log does not fail and includes the revision.
187
        output, error = self.run_bzr(['log'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
188
        self.assertEqual(error, '')
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
189
        self.assertTrue(
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
190
            '<The commit message>' in output,
191
            "Commit message was not found in output:\n%s" % (output,))
0.200.80 by Jelmer Vernooij
Add blackbox test for bzr log -v.
192
193
    def test_log_verbose(self):
194
        # Smoke test for "bzr log -v" in a git repository.
195
        self.simple_commit()
196
197
        # Check that bzr log does not fail and includes the revision.
198
        output, error = self.run_bzr(['log', '-v'])
7339.1.3 by Jelmer Vernooij
Support calculate_revnos option.
199
        self.assertContainsRe(output, 'revno: 1')
200
201
    def test_log_without_revno(self):
202
        # Smoke test for "bzr log -v" in a git repository.
203
        self.simple_commit()
204
205
        # Check that bzr log does not fail and includes the revision.
206
        output, error = self.run_bzr(['log', '-Ocalculate_revnos=no'])
207
        self.assertNotContainsRe(output, 'revno: 1')
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
208
7339.1.4 by Jelmer Vernooij
Only display revnos in commit if calculate_revnos is enabled.
209
    def test_commit_without_revno(self):
210
        repo = GitRepo.init(self.test_dir)
211
        output, error = self.run_bzr(
212
            ['commit', '-Ocalculate_revnos=yes', '--unchanged', '-m', 'one'])
213
        self.assertContainsRe(error, 'Committed revision 1.')
214
        output, error = self.run_bzr(
215
            ['commit', '-Ocalculate_revnos=no', '--unchanged', '-m', 'two'])
216
        self.assertNotContainsRe(error, 'Committed revision 2.')
217
        self.assertContainsRe(error, 'Committed revid .*.')
218
7290.36.1 by Jelmer Vernooij
Fix filegraph operations on Git.
219
    def test_log_file(self):
220
        # Smoke test for "bzr log" in a git repository.
221
        repo = GitRepo.init(self.test_dir)
222
        builder = tests.GitBranchBuilder()
223
        builder.set_file('a', b'text for a\n', False)
224
        r1 = builder.commit(b'Joe Foo <joe@foo.com>', u'First')
225
        builder.set_file('a', b'text 3a for a\n', False)
226
        r2a = builder.commit(b'Joe Foo <joe@foo.com>', u'Second a', base=r1)
227
        builder.set_file('a', b'text 3b for a\n', False)
228
        r2b = builder.commit(b'Joe Foo <joe@foo.com>', u'Second b', base=r1)
229
        builder.set_file('a', b'text 4 for a\n', False)
230
        builder.commit(b'Joe Foo <joe@foo.com>', u'Third', merge=[r2a], base=r2b)
231
        builder.finish()
232
233
        # Check that bzr log does not fail and includes the revision.
234
        output, error = self.run_bzr(['log', '-n2', 'a'])
235
        self.assertEqual(error, '')
236
        self.assertIn('Second a', output)
237
        self.assertIn('Second b', output)
238
        self.assertIn('First', output)
239
        self.assertIn('Third', output)
240
0.200.83 by Jelmer Vernooij
Add blackbox test for 'bzr tags'
241
    def test_tags(self):
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
242
        git_repo, commit_sha1 = self.simple_commit()
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
243
        git_repo.refs[b"refs/tags/foo"] = commit_sha1
0.200.83 by Jelmer Vernooij
Add blackbox test for 'bzr tags'
244
245
        output, error = self.run_bzr(['tags'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
246
        self.assertEqual(error, '')
247
        self.assertEqual(output, "foo                  1\n")
0.200.83 by Jelmer Vernooij
Add blackbox test for 'bzr tags'
248
0.200.85 by Jelmer Vernooij
Add test for creating new tags.
249
    def test_tag(self):
250
        self.simple_commit()
251
252
        output, error = self.run_bzr(["tag", "bar"])
253
0.258.1 by Max Bowsher
Make tests tolerant to bzr <= 2.2.
254
        # bzr <= 2.2 emits this message in the output stream
255
        # bzr => 2.3 emits this message in the error stream
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
256
        self.assertEqual(error + output, 'Created tag bar.\n')
0.200.85 by Jelmer Vernooij
Add test for creating new tags.
257
0.200.288 by Jelmer Vernooij
Add test for init-repo.
258
    def test_init_repo(self):
0.200.1653 by Jelmer Vernooij
--git is now --format=git.
259
        output, error = self.run_bzr(["init", "--format=git", "bla.git"])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
260
        self.assertEqual(error, '')
261
        self.assertEqual(output, 'Created a standalone tree (format: git)\n')
0.200.288 by Jelmer Vernooij
Add test for init-repo.
262
0.200.1332 by Jelmer Vernooij
Add smoke test for 'bzr diff --format=git'.
263
    def test_diff_format(self):
264
        tree = self.make_branch_and_tree('.')
265
        self.build_tree(['a'])
266
        tree.add(['a'])
267
        output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
268
        self.assertEqual(error, '')
7290.27.1 by Vincent Ladeuil
Backport dulwich fix.
269
        # Some older versions of Dulwich (< 0.19.12) formatted diffs slightly
270
        # differently.
7324.1.1 by Jelmer Vernooij
Fix compatibility with pre-0.19.12 versions of Dulwich.
271
        from dulwich import __version__ as dulwich_version
272
        if dulwich_version < (0, 19, 12):
273
            self.assertEqual(output,
274
                             'diff --git /dev/null b/a\n'
275
                             'old mode 0\n'
276
                             'new mode 100644\n'
277
                             'index 0000000..c197bd8 100644\n'
278
                             '--- /dev/null\n'
279
                             '+++ b/a\n'
280
                             '@@ -0,0 +1 @@\n'
281
                             '+contents of a\n')
282
        else:
283
            self.assertEqual(output,
284
                             'diff --git a/a b/a\n'
285
                             'old file mode 0\n'
286
                             'new file mode 100644\n'
287
                             'index 0000000..c197bd8 100644\n'
288
                             '--- /dev/null\n'
289
                             '+++ b/a\n'
290
                             '@@ -0,0 +1 @@\n'
291
                             '+contents of a\n')
0.200.1450 by Jelmer Vernooij
Fix git-import after branch refactoring.
292
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
293
    def test_git_import_uncolocated(self):
294
        r = GitRepo.init("a", mkdir=True)
295
        self.build_tree(["a/file"])
296
        r.stage("file")
7143.15.2 by Jelmer Vernooij
Run autopep8.
297
        r.do_commit(ref=b"refs/heads/abranch",
298
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
299
        r.do_commit(ref=b"refs/heads/bbranch",
300
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
301
        self.run_bzr(["git-import", "a", "b"])
7143.15.2 by Jelmer Vernooij
Run autopep8.
302
        self.assertEqual(
303
            set([".bzr", "abranch", "bbranch"]), set(os.listdir("b")))
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
304
0.200.1450 by Jelmer Vernooij
Fix git-import after branch refactoring.
305
    def test_git_import(self):
306
        r = GitRepo.init("a", mkdir=True)
307
        self.build_tree(["a/file"])
308
        r.stage("file")
7143.15.2 by Jelmer Vernooij
Run autopep8.
309
        r.do_commit(ref=b"refs/heads/abranch",
310
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
311
        r.do_commit(ref=b"refs/heads/bbranch",
312
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
313
        self.run_bzr(["git-import", "--colocated", "a", "b"])
6964.2.3 by Jelmer Vernooij
Review comments.
314
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
315
        self.assertEqual(set(["abranch", "bbranch"]),
7143.15.2 by Jelmer Vernooij
Run autopep8.
316
                         set(ControlDir.open("b").get_branches().keys()))
0.200.1451 by Jelmer Vernooij
Add some more tests for git-import.
317
318
    def test_git_import_incremental(self):
319
        r = GitRepo.init("a", mkdir=True)
320
        self.build_tree(["a/file"])
321
        r.stage("file")
7143.15.2 by Jelmer Vernooij
Run autopep8.
322
        r.do_commit(ref=b"refs/heads/abranch",
323
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
324
        self.run_bzr(["git-import", "--colocated", "a", "b"])
325
        self.run_bzr(["git-import", "--colocated", "a", "b"])
6964.2.3 by Jelmer Vernooij
Review comments.
326
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
327
        b = ControlDir.open("b")
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
328
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
0.200.1451 by Jelmer Vernooij
Add some more tests for git-import.
329
330
    def test_git_import_tags(self):
331
        r = GitRepo.init("a", mkdir=True)
332
        self.build_tree(["a/file"])
333
        r.stage("file")
7143.15.2 by Jelmer Vernooij
Run autopep8.
334
        cid = r.do_commit(ref=b"refs/heads/abranch",
335
                          committer=b"Joe <joe@example.com>", message=b"Dummy")
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
336
        r[b"refs/tags/atag"] = cid
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
337
        self.run_bzr(["git-import", "--colocated", "a", "b"])
6964.2.3 by Jelmer Vernooij
Review comments.
338
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
339
        b = ControlDir.open("b")
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
340
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
6964.2.3 by Jelmer Vernooij
Review comments.
341
        self.assertEqual(["atag"],
7143.15.2 by Jelmer Vernooij
Run autopep8.
342
                         list(b.open_branch("abranch").tags.get_tag_dict().keys()))
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
343
344
    def test_git_import_colo(self):
345
        r = GitRepo.init("a", mkdir=True)
346
        self.build_tree(["a/file"])
347
        r.stage("file")
7143.15.2 by Jelmer Vernooij
Run autopep8.
348
        r.do_commit(ref=b"refs/heads/abranch",
349
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
350
        r.do_commit(ref=b"refs/heads/bbranch",
351
                    committer=b"Joe <joe@example.com>", message=b"Dummy")
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
352
        self.make_controldir("b", format="development-colo")
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
353
        self.run_bzr(["git-import", "--colocated", "a", "b"])
6964.2.3 by Jelmer Vernooij
Review comments.
354
        self.assertEqual(
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
355
            set([b.name for b in ControlDir.open("b").list_branches()]),
0.200.1501 by Jelmer Vernooij
Provide ControlDir.get_branches.
356
            set(["abranch", "bbranch"]))
0.200.1521 by Jelmer Vernooij
Fix git-refs command.
357
358
    def test_git_refs_from_git(self):
359
        r = GitRepo.init("a", mkdir=True)
360
        self.build_tree(["a/file"])
361
        r.stage("file")
7143.15.2 by Jelmer Vernooij
Run autopep8.
362
        cid = r.do_commit(ref=b"refs/heads/abranch",
363
                          committer=b"Joe <joe@example.com>", message=b"Dummy")
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
364
        r[b"refs/tags/atag"] = cid
0.200.1521 by Jelmer Vernooij
Fix git-refs command.
365
        (stdout, stderr) = self.run_bzr(["git-refs", "a"])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
366
        self.assertEqual(stderr, "")
6964.2.3 by Jelmer Vernooij
Review comments.
367
        self.assertEqual(stdout,
7143.15.2 by Jelmer Vernooij
Run autopep8.
368
                         'refs/heads/abranch -> ' + cid.decode('ascii') + '\n'
369
                         'refs/tags/atag -> ' + cid.decode('ascii') + '\n')
0.200.1521 by Jelmer Vernooij
Fix git-refs command.
370
371
    def test_git_refs_from_bzr(self):
372
        tree = self.make_branch_and_tree('a')
373
        self.build_tree(["a/file"])
374
        tree.add(["file"])
7143.15.2 by Jelmer Vernooij
Run autopep8.
375
        revid = tree.commit(
376
            committer=b"Joe <joe@example.com>", message=b"Dummy")
0.200.1521 by Jelmer Vernooij
Fix git-refs command.
377
        tree.branch.tags.set_tag("atag", revid)
378
        (stdout, stderr) = self.run_bzr(["git-refs", "a"])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
379
        self.assertEqual(stderr, "")
380
        self.assertTrue("refs/tags/atag -> " in stdout)
381
        self.assertTrue("HEAD -> " in stdout)
0.200.1591 by Jelmer Vernooij
Add basic test for dpush.
382
0.425.1 by Jelmer Vernooij
Add really basic check implementation.
383
    def test_check(self):
384
        r = GitRepo.init("gitr", mkdir=True)
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
385
        self.build_tree_contents([("gitr/foo", b"hello from git")])
0.425.1 by Jelmer Vernooij
Add really basic check implementation.
386
        r.stage("foo")
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
387
        r.do_commit(b"message", committer=b"Somebody <user@example.com>")
0.425.1 by Jelmer Vernooij
Add really basic check implementation.
388
        out, err = self.run_bzr(["check", "gitr"])
389
        self.maxDiff = None
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
390
        self.assertEqual(out, '')
391
        self.assertTrue(err.endswith, '3 objects\n')
6965.1.2 by Jelmer Vernooij
Add test.
392
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
393
394
class ShallowTests(ExternalBase):
395
396
    def setUp(self):
397
        super(ShallowTests, self).setUp()
398
        # Smoke test for "bzr log" in a git repository with shallow depth.
399
        self.repo = GitRepo.init('gitr', mkdir=True)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
400
        self.build_tree_contents([("gitr/foo", b"hello from git")])
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
401
        self.repo.stage("foo")
402
        self.repo.do_commit(
7143.15.2 by Jelmer Vernooij
Run autopep8.
403
            b"message", committer=b"Somebody <user@example.com>",
7268.1.1 by Jelmer Vernooij
Fix compatibility with newer versions of Dulwich.
404
            author=b"Somebody <user@example.com>",
7143.15.2 by Jelmer Vernooij
Run autopep8.
405
            commit_timestamp=1526330165, commit_timezone=0,
406
            author_timestamp=1526330165, author_timezone=0,
407
            merge_heads=[b'aa' * 20])
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
408
6965.1.2 by Jelmer Vernooij
Add test.
409
    def test_log_shallow(self):
410
        # Check that bzr log does not fail and includes the revision.
411
        output, error = self.run_bzr(['log', 'gitr'], retcode=3)
7143.15.2 by Jelmer Vernooij
Run autopep8.
412
        self.assertEqual(
413
            error, 'brz: ERROR: Further revision history missing.\n')
6965.1.2 by Jelmer Vernooij
Add test.
414
        self.assertEqual(output,
7143.15.2 by Jelmer Vernooij
Run autopep8.
415
                         '------------------------------------------------------------\n'
416
                         'revision-id: git-v1:' + self.repo.head().decode('ascii') + '\n'
417
                         'git commit: ' + self.repo.head().decode('ascii') + '\n'
418
                         'committer: Somebody <user@example.com>\n'
419
                         'timestamp: Mon 2018-05-14 20:36:05 +0000\n'
420
                         'message:\n'
421
                         '  message\n')
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
422
423
    def test_version_info_rio(self):
424
        output, error = self.run_bzr(['version-info', '--rio', 'gitr'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
425
        self.assertEqual(error, '')
426
        self.assertNotIn('revno:', output)
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
427
428
    def test_version_info_python(self):
429
        output, error = self.run_bzr(['version-info', '--python', 'gitr'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
430
        self.assertEqual(error, '')
431
        self.assertNotIn('revno:', output)
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
432
433
    def test_version_info_custom_with_revno(self):
434
        output, error = self.run_bzr(
7143.15.2 by Jelmer Vernooij
Run autopep8.
435
            ['version-info', '--custom',
436
             '--template=VERSION_INFO r{revno})\n', 'gitr'], retcode=3)
437
        self.assertEqual(
438
            error, 'brz: ERROR: Variable {revno} is not available.\n')
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
439
        self.assertEqual(output, 'VERSION_INFO r')
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
440
441
    def test_version_info_custom_without_revno(self):
442
        output, error = self.run_bzr(
7143.15.2 by Jelmer Vernooij
Run autopep8.
443
            ['version-info', '--custom', '--template=VERSION_INFO \n',
444
             'gitr'])
7027.4.1 by Jelmer Vernooij
Use StringIOWithEncoding on Python3.
445
        self.assertEqual(error, '')
446
        self.assertEqual(output, 'VERSION_INFO \n')
7143.17.1 by Jelmer Vernooij
Fix grep in git working trees.
447
448
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
449
class SwitchTests(ExternalBase):
450
451
    def test_switch_branch(self):
452
        # Create a git repository with a revision.
453
        repo = GitRepo.init(self.test_dir)
454
        builder = tests.GitBranchBuilder()
455
        builder.set_branch(b'refs/heads/oldbranch')
456
        builder.set_file('a', b'text for a\n', False)
457
        builder.commit(b'Joe Foo <joe@foo.com>', u'<The commit message>')
458
        builder.set_branch(b'refs/heads/newbranch')
459
        builder.reset()
460
        builder.set_file('a', b'text for new a\n', False)
461
        builder.commit(b'Joe Foo <joe@foo.com>', u'<The commit message>')
462
        builder.finish()
463
464
        repo.refs.set_symbolic_ref(b'HEAD', b'refs/heads/newbranch')
465
466
        repo.reset_index()
467
468
        output, error = self.run_bzr('switch oldbranch')
469
        self.assertEqual(output, '')
470
        self.assertTrue(error.startswith('Updated to revision 1.\n'), error)
471
472
        self.assertFileEqual("text for a\n", 'a')
473
        tree = WorkingTree.open('.')
474
        with tree.lock_read():
475
            basis_tree = tree.basis_tree()
476
            with basis_tree.lock_read():
477
                self.assertEqual([], list(tree.iter_changes(basis_tree)))
7143.18.2 by Jelmer Vernooij
Merge trunk.
478
479
7290.26.1 by Jelmer Vernooij
Fix switching in git repositories.
480
class SwitchScriptTests(TestCaseWithTransportAndScript):
481
482
    def test_switch_preserves(self):
483
        # See https://bugs.launchpad.net/brz/+bug/1820606
484
        self.run_script("""
485
$ brz init --git r
486
Created a standalone tree (format: git)
487
$ cd r
488
$ echo original > file.txt
489
$ brz add
490
adding file.txt
491
$ brz ci -q -m "Initial"
492
$ echo "entered on master branch" > file.txt
493
$ brz stat
494
modified:
495
  file.txt
496
$ brz switch -b other
497
2>Tree is up to date at revision 1.
498
2>Switched to branch other
499
$ cat file.txt
500
entered on master branch
501
""")
502
503
7143.17.1 by Jelmer Vernooij
Fix grep in git working trees.
504
class GrepTests(ExternalBase):
505
506
    def test_simple_grep(self):
507
        tree = self.make_branch_and_tree('.', format='git')
508
        self.build_tree_contents([('a', 'text for a\n')])
509
        tree.add(['a'])
510
        output, error = self.run_bzr('grep text')
511
        self.assertEqual(output, 'a:text for a\n')
512
        self.assertEqual(error, '')
7211.8.1 by Jelmer Vernooij
Fix stats in Python3 git repositories.
513
514
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
515
class ReconcileTests(ExternalBase):
516
517
    def test_simple_reconcile(self):
518
        tree = self.make_branch_and_tree('.', format='git')
519
        self.build_tree_contents([('a', 'text for a\n')])
520
        tree.add(['a'])
521
        output, error = self.run_bzr('reconcile')
522
        self.assertContainsRe(
523
            output,
524
            'Reconciling branch file://.*\n'
525
            'Reconciling repository file://.*\n'
526
            'Reconciliation complete.\n')
527
        self.assertEqual(error, '')
7206.6.6 by Jelmer Vernooij
Merge trunk.
528
529
7211.10.1 by Jelmer Vernooij
Add test for status with an empty dir.
530
class StatusTests(ExternalBase):
531
532
    def test_empty_dir(self):
533
        tree = self.make_branch_and_tree('.', format='git')
534
        self.build_tree(['a/', 'a/foo'])
535
        self.build_tree_contents([('.gitignore', 'foo\n')])
536
        tree.add(['.gitignore'])
537
        tree.commit('add ignore')
538
        output, error = self.run_bzr('st')
7211.10.5 by Jelmer Vernooij
Fix handling of directories.
539
        self.assertEqual(output, '')
7211.10.1 by Jelmer Vernooij
Add test for status with an empty dir.
540
        self.assertEqual(error, '')
7211.10.6 by Jelmer Vernooij
Merge trunk.
541
542
7211.8.1 by Jelmer Vernooij
Fix stats in Python3 git repositories.
543
class StatsTests(ExternalBase):
544
545
    def test_simple_stats(self):
546
        self.requireFeature(PluginLoadedFeature('stats'))
547
        tree = self.make_branch_and_tree('.', format='git')
548
        self.build_tree_contents([('a', 'text for a\n')])
549
        tree.add(['a'])
550
        tree.commit('a commit', committer='Somebody <somebody@example.com>')
551
        output, error = self.run_bzr('stats')
552
        self.assertEqual(output, '   1 Somebody <somebody@example.com>\n')
7233.2.1 by Jelmer Vernooij
Fix import for git-objects.
553
554
555
class GitObjectsTests(ExternalBase):
556
557
    def run_simple(self, format):
558
        tree = self.make_branch_and_tree('.', format=format)
559
        self.build_tree(['a/', 'a/foo'])
560
        tree.add(['a'])
561
        tree.commit('add a')
562
        output, error = self.run_bzr('git-objects')
563
        shas = list(output.splitlines())
564
        self.assertEqual([40, 40], [len(s) for s in shas])
565
        self.assertEqual(error, '')
566
567
        output, error = self.run_bzr('git-object %s' % shas[0])
568
        self.assertEqual('', error)
569
570
    def test_in_native(self):
571
        self.run_simple(format='git')
572
573
    def test_in_bzr(self):
574
        self.run_simple(format='2a')
7268.7.1 by Jelmer Vernooij
Fix git-apply.
575
576
577
class GitApplyTests(ExternalBase):
578
579
    def test_apply(self):
580
        b = self.make_branch_and_tree('.')
581
582
        with open('foo.patch', 'w') as f:
583
            f.write("""\
584
From bdefb25fab801e6af0a70e965f60cb48f2b759fa Mon Sep 17 00:00:00 2001
585
From: Dmitry Bogatov <KAction@debian.org>
586
Date: Fri, 8 Feb 2019 23:28:30 +0000
587
Subject: [PATCH] Add fixed for out-of-date-standards-version
588
589
---
590
 message           | 3 +++
591
 1 files changed, 14 insertions(+)
592
 create mode 100644 message
593
594
diff --git a/message b/message
595
new file mode 100644
596
index 0000000..05ec0b1
597
--- /dev/null
598
+++ b/message
599
@@ -0,0 +1,3 @@
600
+Update standards version, no changes needed.
601
+Certainty: certain
602
+Fixed-Lintian-Tags: out-of-date-standards-version
603
""")
604
        output, error = self.run_bzr('git-apply foo.patch')
605
        self.assertContainsRe(
606
            error,
607
            'Committing to: .*\n'
608
            'Committed revision 1.\n')