/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2010-05-25 17:09:02 UTC
  • mto: This revision was merged to the branch mainline in revision 691.
  • Revision ID: jelmer@samba.org-20100525170902-3to8g5iw7ovw79kh
Split out olive into a separate directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
 
1
# Copyright (C) 2007, 2008 John Arbash Meinel <john@arbash-meinel.com>
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
"""Test the Commit functionality."""
 
18
 
 
19
import os
 
20
 
 
21
import gtk
 
22
 
 
23
from bzrlib import (
 
24
    branch,
 
25
    revision,
 
26
    tests,
 
27
    uncommit,
 
28
    )
 
29
try:
 
30
    from bzrlib import bencode
 
31
except ImportError:
 
32
    from bzrlib.util import bencode
 
33
 
 
34
from bzrlib.plugins.gtk import commit
 
35
 
 
36
 
 
37
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
 
38
# TestCaseWithTransport, just a TestCaseWithMemoryTransport or somesuch.
 
39
 
 
40
class TestPendingRevisions(tests.TestCaseWithTransport):
 
41
 
 
42
    def test_pending_revisions_none(self):
 
43
        tree = self.make_branch_and_tree('.')
 
44
        tree.commit('one')
 
45
 
 
46
        self.assertIs(None, commit.pending_revisions(tree))
 
47
 
 
48
    def test_pending_revisions_simple(self):
 
49
        tree = self.make_branch_and_tree('tree')
 
50
        rev_id1 = tree.commit('one')
 
51
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
52
        rev_id2 = tree2.commit('two')
 
53
        tree.merge_from_branch(tree2.branch)
 
54
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
 
55
 
 
56
        pending_revisions = commit.pending_revisions(tree)
 
57
        # One primary merge
 
58
        self.assertEqual(1, len(pending_revisions))
 
59
        # Revision == rev_id2
 
60
        self.assertEqual(rev_id2, pending_revisions[0][0].revision_id)
 
61
        # No children of this revision.
 
62
        self.assertEqual([], pending_revisions[0][1])
 
63
 
 
64
    def test_pending_revisions_with_children(self):
 
65
        tree = self.make_branch_and_tree('tree')
 
66
        rev_id1 = tree.commit('one')
 
67
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
68
        rev_id2 = tree2.commit('two')
 
69
        rev_id3 = tree2.commit('three')
 
70
        rev_id4 = tree2.commit('four')
 
71
        tree.merge_from_branch(tree2.branch)
 
72
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
 
73
 
 
74
        pending_revisions = commit.pending_revisions(tree)
 
75
        # One primary merge
 
76
        self.assertEqual(1, len(pending_revisions))
 
77
        # Revision == rev_id2
 
78
        self.assertEqual(rev_id4, pending_revisions[0][0].revision_id)
 
79
        # Two children for this revision
 
80
        self.assertEqual(2, len(pending_revisions[0][1]))
 
81
        self.assertEqual(rev_id3, pending_revisions[0][1][0].revision_id)
 
82
        self.assertEqual(rev_id2, pending_revisions[0][1][1].revision_id)
 
83
 
 
84
    def test_pending_revisions_multi_merge(self):
 
85
        tree = self.make_branch_and_tree('tree')
 
86
        rev_id1 = tree.commit('one')
 
87
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
88
        rev_id2 = tree2.commit('two')
 
89
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
90
        rev_id3 = tree2.commit('three')
 
91
        rev_id4 = tree3.commit('four')
 
92
        rev_id5 = tree3.commit('five')
 
93
        tree.merge_from_branch(tree2.branch)
 
94
        tree.merge_from_branch(tree3.branch, force=True)
 
95
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
 
96
 
 
97
        pending_revisions = commit.pending_revisions(tree)
 
98
        # Two primary merges
 
99
        self.assertEqual(2, len(pending_revisions))
 
100
        # Revision == rev_id2
 
101
        self.assertEqual(rev_id3, pending_revisions[0][0].revision_id)
 
102
        self.assertEqual(rev_id5, pending_revisions[1][0].revision_id)
 
103
        # One child for the first merge
 
104
        self.assertEqual(1, len(pending_revisions[0][1]))
 
105
        self.assertEqual(rev_id2, pending_revisions[0][1][0].revision_id)
 
106
        # One child for the second merge
 
107
        self.assertEqual(1, len(pending_revisions[1][1]))
 
108
        self.assertEqual(rev_id4, pending_revisions[1][1][0].revision_id)
 
109
 
 
110
 
 
111
class Test_RevToPendingInfo(tests.TestCaseWithTransport):
 
112
 
 
113
    def test_basic_info(self):
 
114
        tree = self.make_branch_and_tree('tree')
 
115
        rev_id = tree.commit('Multiline\ncommit\nmessage',
 
116
                             committer='Joe Foo <joe@foo.com>',
 
117
                             timestamp=1191012408.674,
 
118
                             timezone=-18000
 
119
                             )
 
120
        rev = tree.branch.repository.get_revision(rev_id)
 
121
        rev_dict = commit.CommitDialog._rev_to_pending_info(rev)
 
122
        self.assertEqual({'committer':'Joe Foo',
 
123
                          'summary':'Multiline',
 
124
                          'date':'2007-09-28',
 
125
                          'revision_id':rev_id,
 
126
                         }, rev_dict)
 
127
 
 
128
 
 
129
class CommitDialogNoWidgets(commit.CommitDialog):
 
130
 
 
131
    def construct(self):
 
132
        pass # Don't create any widgets here
 
133
 
 
134
    def fill_in_data(self):
 
135
        pass # With no widgets, there are no widgets to fill out
 
136
 
 
137
 
 
138
class TestCommitDialogSimple(tests.TestCaseWithTransport):
 
139
 
 
140
    def test_setup_parameters_no_pending(self):
 
141
        tree = self.make_branch_and_tree('tree')
 
142
        rev_id = tree.commit('first')
 
143
 
 
144
        dlg = CommitDialogNoWidgets(tree)
 
145
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
 
146
        self.assertIs(None, dlg._pending)
 
147
        self.assertFalse(dlg._is_checkout)
 
148
 
 
149
    def test_setup_parameters_checkout(self):
 
150
        tree = self.make_branch_and_tree('tree')
 
151
        rev_id = tree.commit('first')
 
152
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
153
        tree2.branch.bind(tree.branch)
 
154
 
 
155
        dlg = CommitDialogNoWidgets(tree2)
 
156
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
 
157
        self.assertIs(None, dlg._pending)
 
158
        self.assertTrue(dlg._is_checkout)
 
159
 
 
160
    def test_setup_parameters_pending(self):
 
161
        tree = self.make_branch_and_tree('tree')
 
162
        rev_id1 = tree.commit('one')
 
163
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
164
        rev_id2 = tree2.commit('two')
 
165
        tree.merge_from_branch(tree2.branch)
 
166
 
 
167
        dlg = CommitDialogNoWidgets(tree)
 
168
        self.assertEqual(rev_id1, dlg._basis_tree.get_revision_id())
 
169
        self.assertIsNot(None, dlg._pending)
 
170
        self.assertEqual(1, len(dlg._pending))
 
171
        self.assertEqual(rev_id2, dlg._pending[0][0].revision_id)
 
172
 
 
173
    def test_setup_parameters_delta(self):
 
174
        tree = self.make_branch_and_tree('tree')
 
175
        self.build_tree(['tree/a'])
 
176
        tree.add(['a'], ['a-id'])
 
177
 
 
178
        dlg = CommitDialogNoWidgets(tree)
 
179
        self.assertIs(None, dlg._delta)
 
180
        dlg._compute_delta()
 
181
 
 
182
        delta = dlg._delta
 
183
        self.assertEqual([], delta.modified)
 
184
        self.assertEqual([], delta.renamed)
 
185
        self.assertEqual([], delta.removed)
 
186
        self.assertEqual([(u'a', 'a-id', 'file')], delta.added)
 
187
 
 
188
 
 
189
class TestCommitDialog(tests.TestCaseWithTransport):
 
190
 
 
191
    def test_bound(self):
 
192
        tree = self.make_branch_and_tree('tree')
 
193
        rev_id = tree.commit('first')
 
194
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
195
        tree2.branch.bind(tree.branch)
 
196
 
 
197
        # tree is not a checkout
 
198
        dlg = commit.CommitDialog(tree)
 
199
        self.assertFalse(dlg._check_local.get_property('visible'))
 
200
 
 
201
        # tree2 is a checkout
 
202
        dlg2 = commit.CommitDialog(tree2)
 
203
        self.assertTrue(dlg2._check_local.get_property('visible'))
 
204
 
 
205
    def test_no_pending(self):
 
206
        tree = self.make_branch_and_tree('tree')
 
207
        rev_id1 = tree.commit('one')
 
208
 
 
209
        dlg = commit.CommitDialog(tree)
 
210
 
 
211
        self.assertFalse(dlg._pending_box.get_property('visible'))
 
212
 
 
213
        commit_col = dlg._treeview_files.get_column(0)
 
214
        self.assertEqual('Commit', commit_col.get_title())
 
215
        renderer = commit_col.get_cell_renderers()[0]
 
216
        self.assertTrue(renderer.get_property('activatable'))
 
217
 
 
218
        self.assertEqual('Commit all changes',
 
219
                         dlg._commit_all_files_radio.get_label())
 
220
        self.assertTrue(dlg._commit_all_files_radio.get_property('sensitive'))
 
221
        self.assertTrue(dlg._commit_selected_radio.get_property('sensitive'))
 
222
 
 
223
    def test_pending(self):
 
224
        tree = self.make_branch_and_tree('tree')
 
225
        rev_id1 = tree.commit('one')
 
226
 
 
227
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
228
        rev_id2 = tree2.commit('two',
 
229
                               committer='Joe Foo <joe@foo.com>',
 
230
                               timestamp=1191264271.05,
 
231
                               timezone=+7200)
 
232
        tree.merge_from_branch(tree2.branch)
 
233
 
 
234
        dlg = commit.CommitDialog(tree)
 
235
 
 
236
        self.assertTrue(dlg._pending_box.get_property('visible'))
 
237
 
 
238
        commit_col = dlg._treeview_files.get_column(0)
 
239
        self.assertEqual('Commit*', commit_col.get_title())
 
240
        renderer = commit_col.get_cell_renderers()[0]
 
241
        self.assertFalse(renderer.get_property('activatable'))
 
242
 
 
243
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
 
244
        self.assertEqual([(rev_id2, '2007-10-01', 'Joe Foo', 'two')], values)
 
245
 
 
246
        self.assertEqual('Commit all changes*',
 
247
                         dlg._commit_all_files_radio.get_label())
 
248
        self.assertFalse(dlg._commit_all_files_radio.get_property('sensitive'))
 
249
        self.assertFalse(dlg._commit_selected_radio.get_property('sensitive'))
 
250
 
 
251
    def test_pending_multiple(self):
 
252
        tree = self.make_branch_and_tree('tree')
 
253
        rev_id1 = tree.commit('one')
 
254
 
 
255
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
256
        rev_id2 = tree2.commit('two',
 
257
                               committer='Joe Foo <joe@foo.com>',
 
258
                               timestamp=1191264271.05,
 
259
                               timezone=+7200)
 
260
        rev_id3 = tree2.commit('three',
 
261
                               committer='Jerry Foo <jerry@foo.com>',
 
262
                               timestamp=1191264278.05,
 
263
                               timezone=+7200)
 
264
        tree.merge_from_branch(tree2.branch)
 
265
        tree3 = tree.bzrdir.sprout('tree3').open_workingtree()
 
266
        rev_id4 = tree3.commit('four',
 
267
                               committer='Joe Foo <joe@foo.com>',
 
268
                               timestamp=1191264279.05,
 
269
                               timezone=+7200)
 
270
        rev_id5 = tree3.commit('five',
 
271
                               committer='Jerry Foo <jerry@foo.com>',
 
272
                               timestamp=1191372278.05,
 
273
                               timezone=+7200)
 
274
        tree.merge_from_branch(tree3.branch, force=True)
 
275
 
 
276
        dlg = commit.CommitDialog(tree)
 
277
        # TODO: assert that the pending box is set to show
 
278
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
 
279
        self.assertEqual([(rev_id3, '2007-10-01', 'Jerry Foo', 'three'),
 
280
                          (rev_id2, '2007-10-01', 'Joe Foo', 'two'),
 
281
                          (rev_id5, '2007-10-03', 'Jerry Foo', 'five'),
 
282
                          (rev_id4, '2007-10-01', 'Joe Foo', 'four'),
 
283
                         ], values)
 
284
 
 
285
    def test_filelist_added(self):
 
286
        tree = self.make_branch_and_tree('tree')
 
287
        self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
 
288
        tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
 
289
 
 
290
        dlg = commit.CommitDialog(tree)
 
291
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
292
        self.assertEqual([(None, None, True, 'All Files', ''),
 
293
                          ('a-id', 'a', True, 'a', 'added'),
 
294
                          ('b-id', 'b', True, 'b/', 'added'),
 
295
                          ('c-id', 'b/c', True, 'b/c', 'added'),
 
296
                         ], values)
 
297
 
 
298
    def test_filelist_renamed(self):
 
299
        tree = self.make_branch_and_tree('tree')
 
300
        self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
 
301
        tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
 
302
        rev_id1 = tree.commit('one')
 
303
 
 
304
        tree.rename_one('b', 'd')
 
305
        tree.rename_one('a', 'd/a')
 
306
 
 
307
        dlg = commit.CommitDialog(tree)
 
308
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
309
        self.assertEqual([(None, None, True, 'All Files', ''),
 
310
                          ('b-id', 'd', True, 'b/ => d/', 'renamed'),
 
311
                          ('a-id', 'd/a', True, 'a => d/a', 'renamed'),
 
312
                         ], values)
 
313
 
 
314
    def test_filelist_modified(self):
 
315
        tree = self.make_branch_and_tree('tree')
 
316
        self.build_tree(['tree/a'])
 
317
        tree.add(['a'], ['a-id'])
 
318
        rev_id1 = tree.commit('one')
 
319
 
 
320
        self.build_tree_contents([('tree/a', 'new contents for a\n')])
 
321
 
 
322
        dlg = commit.CommitDialog(tree)
 
323
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
324
        self.assertEqual([(None, None, True, 'All Files', ''),
 
325
                          ('a-id', 'a', True, 'a', 'modified'),
 
326
                         ], values)
 
327
 
 
328
    def test_filelist_renamed_and_modified(self):
 
329
        tree = self.make_branch_and_tree('tree')
 
330
        self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
 
331
        tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
 
332
        rev_id1 = tree.commit('one')
 
333
 
 
334
        tree.rename_one('b', 'd')
 
335
        tree.rename_one('a', 'd/a')
 
336
        self.build_tree_contents([('tree/d/a', 'new contents for a\n'),
 
337
                                  ('tree/d/c', 'new contents for c\n'),
 
338
                                 ])
 
339
        # 'c' is not considered renamed, because only its parent was moved, it
 
340
        # stayed in the same directory
 
341
 
 
342
        dlg = commit.CommitDialog(tree)
 
343
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
344
        self.assertEqual([(None, None, True, 'All Files', ''),
 
345
                          ('b-id', 'd', True, 'b/ => d/', 'renamed'),
 
346
                          ('a-id', 'd/a', True, 'a => d/a', 'renamed and modified'),
 
347
                          ('c-id', 'd/c', True, 'd/c', 'modified'),
 
348
                         ], values)
 
349
 
 
350
    def test_filelist_kind_changed(self):
 
351
        tree = self.make_branch_and_tree('tree')
 
352
        self.build_tree(['tree/a', 'tree/b'])
 
353
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
354
        tree.commit('one')
 
355
 
 
356
        os.remove('tree/a')
 
357
        self.build_tree(['tree/a/'])
 
358
        # XXX:  This is technically valid, and the file list handles it fine,
 
359
        #       but 'show_diff_trees()' does not, so we skip this part of the
 
360
        #       test for now.
 
361
        # tree.rename_one('b', 'c')
 
362
        # os.remove('tree/c')
 
363
        # self.build_tree(['tree/c/'])
 
364
 
 
365
        dlg = commit.CommitDialog(tree)
 
366
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
367
        self.assertEqual([(None, None, True, 'All Files', ''),
 
368
                          ('a-id', 'a', True, 'a => a/', 'kind changed'),
 
369
                          # ('b-id', 'c', True, 'b => c/', 'renamed and modified'),
 
370
                         ], values)
 
371
 
 
372
    def test_filelist_removed(self):
 
373
        tree = self.make_branch_and_tree('tree')
 
374
        self.build_tree(['tree/a', 'tree/b/'])
 
375
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
376
        tree.commit('one')
 
377
 
 
378
        os.remove('tree/a')
 
379
        tree.remove('b', force=True)
 
380
 
 
381
        dlg = commit.CommitDialog(tree)
 
382
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
383
        self.assertEqual([(None, None, True, 'All Files', ''),
 
384
                          ('a-id', 'a', True, 'a', 'removed'),
 
385
                          ('b-id', 'b', True, 'b/', 'removed'),
 
386
                         ], values)
 
387
        # All Files should be selected
 
388
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
 
389
 
 
390
    def test_filelist_with_selected(self):
 
391
        tree = self.make_branch_and_tree('tree')
 
392
        self.build_tree(['tree/a', 'tree/b/'])
 
393
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
394
 
 
395
        dlg = commit.CommitDialog(tree, selected='a')
 
396
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
 
397
        self.assertEqual([(None, None, False, 'All Files', ''),
 
398
                          ('a-id', 'a', True, 'a', 'added'),
 
399
                          ('b-id', 'b', False, 'b/', 'added'),
 
400
                         ], values)
 
401
        # This file should also be selected in the file list, rather than the
 
402
        # 'All Files' selection
 
403
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
 
404
 
 
405
    def test_diff_view(self):
 
406
        tree = self.make_branch_and_tree('tree')
 
407
        self.build_tree(['tree/a', 'tree/b'])
 
408
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
409
        tree.commit('one')
 
410
 
 
411
        self.build_tree_contents([('tree/a', 'new contents for a\n')])
 
412
        tree.remove('b')
 
413
 
 
414
        dlg = commit.CommitDialog(tree)
 
415
        diff_buffer = dlg._diff_view.buffer
 
416
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
 
417
                                    diff_buffer.get_end_iter()).splitlines(True)
 
418
 
 
419
        self.assertEqual("=== modified file 'a'\n", text[0])
 
420
        self.assertContainsRe(text[1],
 
421
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
422
        self.assertContainsRe(text[2],
 
423
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
424
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
 
425
        self.assertEqual('-contents of tree/a\n', text[4])
 
426
        self.assertEqual('+new contents for a\n', text[5])
 
427
        self.assertEqual('\n', text[6])
 
428
 
 
429
        self.assertEqual("=== removed file 'b'\n", text[7])
 
430
        self.assertContainsRe(text[8],
 
431
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
432
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
 
433
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
 
434
        self.assertEqual('-contents of tree/b\n', text[11])
 
435
        self.assertEqual('\n', text[12])
 
436
 
 
437
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
 
438
 
 
439
    def test_commit_partial_toggle(self):
 
440
        tree = self.make_branch_and_tree('tree')
 
441
        self.build_tree(['tree/a', 'tree/b'])
 
442
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
443
 
 
444
        dlg = commit.CommitDialog(tree)
 
445
        checked_col = dlg._treeview_files.get_column(0)
 
446
        self.assertFalse(checked_col.get_property('visible'))
 
447
        self.assertTrue(dlg._commit_all_changes)
 
448
 
 
449
        dlg._commit_selected_radio.set_active(True)
 
450
        self.assertTrue(checked_col.get_property('visible'))
 
451
        self.assertFalse(dlg._commit_all_changes)
 
452
 
 
453
    def test_file_selection(self):
 
454
        """Several things should happen when a file has been selected."""
 
455
        tree = self.make_branch_and_tree('tree')
 
456
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
457
        self.build_tree(['tree/a', 'tree/b'])
 
458
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
459
 
 
460
        dlg = commit.CommitDialog(tree)
 
461
        diff_buffer = dlg._diff_view.buffer
 
462
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
 
463
        self.assertEqual('File commit message',
 
464
                         dlg._file_message_expander.get_label())
 
465
        self.assertFalse(dlg._file_message_expander.get_expanded())
 
466
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
 
467
 
 
468
        dlg._treeview_files.set_cursor((1,))
 
469
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
 
470
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
 
471
                                    diff_buffer.get_end_iter()).splitlines(True)
 
472
        self.assertEqual("=== added file 'a'\n", text[0])
 
473
        self.assertContainsRe(text[1],
 
474
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
475
        self.assertContainsRe(text[2],
 
476
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
477
        self.assertEqual('@@ -0,0 +1,1 @@\n', text[3])
 
478
        self.assertEqual('+contents of tree/a\n', text[4])
 
479
        self.assertEqual('\n', text[5])
 
480
        self.assertEqual('Commit message for a',
 
481
                         dlg._file_message_expander.get_label())
 
482
        self.assertTrue(dlg._file_message_expander.get_expanded())
 
483
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
 
484
 
 
485
        dlg._treeview_files.set_cursor((2,))
 
486
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
 
487
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
 
488
                                    diff_buffer.get_end_iter()).splitlines(True)
 
489
        self.assertEqual("=== added file 'b'\n", text[0])
 
490
        self.assertContainsRe(text[1],
 
491
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
492
        self.assertContainsRe(text[2],
 
493
            r"\+\+\+ b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
494
        self.assertEqual('@@ -0,0 +1,1 @@\n', text[3])
 
495
        self.assertEqual('+contents of tree/b\n', text[4])
 
496
        self.assertEqual('\n', text[5])
 
497
        self.assertEqual('Commit message for b',
 
498
                         dlg._file_message_expander.get_label())
 
499
        self.assertTrue(dlg._file_message_expander.get_expanded())
 
500
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
 
501
 
 
502
        dlg._treeview_files.set_cursor((0,))
 
503
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
 
504
        self.assertEqual('File commit message',
 
505
                         dlg._file_message_expander.get_label())
 
506
        self.assertFalse(dlg._file_message_expander.get_expanded())
 
507
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
 
508
 
 
509
    def test_file_selection_message(self):
 
510
        """Selecting a file should bring up its commit message."""
 
511
        tree = self.make_branch_and_tree('tree')
 
512
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
513
        self.build_tree(['tree/a', 'tree/b/'])
 
514
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
515
 
 
516
        def get_file_text():
 
517
            buf = dlg._file_message_text_view.get_buffer()
 
518
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
 
519
 
 
520
        def get_saved_text(path):
 
521
            """Get the saved text for a given record."""
 
522
            return dlg._files_store.get_value(dlg._files_store.get_iter(path), 5)
 
523
 
 
524
        dlg = commit.CommitDialog(tree)
 
525
        self.assertEqual('File commit message',
 
526
                         dlg._file_message_expander.get_label())
 
527
        self.assertFalse(dlg._file_message_expander.get_expanded())
 
528
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
 
529
        self.assertEqual('', get_file_text())
 
530
 
 
531
        dlg._treeview_files.set_cursor((1,))
 
532
        self.assertEqual('Commit message for a',
 
533
                         dlg._file_message_expander.get_label())
 
534
        self.assertTrue(dlg._file_message_expander.get_expanded())
 
535
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
 
536
        self.assertEqual('', get_file_text())
 
537
 
 
538
        self.assertEqual('', get_saved_text(1))
 
539
        dlg._set_file_commit_message('Some text\nfor a\n')
 
540
        dlg._save_current_file_message()
 
541
        # We should have updated the ListStore with the new file commit info
 
542
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
 
543
 
 
544
        dlg._treeview_files.set_cursor((2,))
 
545
        self.assertEqual('Commit message for b/',
 
546
                         dlg._file_message_expander.get_label())
 
547
        self.assertTrue(dlg._file_message_expander.get_expanded())
 
548
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
 
549
        self.assertEqual('', get_file_text())
 
550
 
 
551
        self.assertEqual('', get_saved_text(2))
 
552
        dlg._set_file_commit_message('More text\nfor b\n')
 
553
        # Now switch back to 'a'. The message should be saved, and the buffer
 
554
        # should be updated with the other text
 
555
        dlg._treeview_files.set_cursor((1,))
 
556
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
 
557
        self.assertEqual('Commit message for a',
 
558
                         dlg._file_message_expander.get_label())
 
559
        self.assertTrue(dlg._file_message_expander.get_expanded())
 
560
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
 
561
        self.assertEqual('Some text\nfor a\n', get_file_text())
 
562
 
 
563
    def test_toggle_all_files(self):
 
564
        """When checking the All Files entry, it should toggle all fields"""
 
565
        tree = self.make_branch_and_tree('tree')
 
566
        self.build_tree(['tree/a', 'tree/b/'])
 
567
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
568
 
 
569
        dlg = commit.CommitDialog(tree)
 
570
        self.assertEqual([(None, None, True),
 
571
                          ('a-id', 'a', True),
 
572
                          ('b-id', 'b', True),
 
573
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
 
574
 
 
575
        # TODO: jam 20071002 I'm not sure how to exactly trigger a toggle, it
 
576
        #       looks like we need to call renderer.activate() and pass an
 
577
        #       event and widget, and lots of other stuff I'm not sure what to
 
578
        #       do with. So instead, we just call toggle directly, and assume
 
579
        #       that toggle is hooked in correctly
 
580
        # column = dlg._treeview_files.get_column(0)
 
581
        # renderer = column.get_cell_renderers()[0]
 
582
 
 
583
        # Toggle a single entry should set just that entry to False
 
584
        dlg._toggle_commit(None, 1, dlg._files_store)
 
585
        self.assertEqual([(None, None, True),
 
586
                          ('a-id', 'a', False),
 
587
                          ('b-id', 'b', True),
 
588
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
 
589
 
 
590
        # Toggling the main entry should set all entries
 
591
        dlg._toggle_commit(None, 0, dlg._files_store)
 
592
        self.assertEqual([(None, None, False),
 
593
                          ('a-id', 'a', False),
 
594
                          ('b-id', 'b', False),
 
595
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
 
596
 
 
597
        dlg._toggle_commit(None, 2, dlg._files_store)
 
598
        self.assertEqual([(None, None, False),
 
599
                          ('a-id', 'a', False),
 
600
                          ('b-id', 'b', True),
 
601
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
 
602
 
 
603
        dlg._toggle_commit(None, 0, dlg._files_store)
 
604
        self.assertEqual([(None, None, True),
 
605
                          ('a-id', 'a', True),
 
606
                          ('b-id', 'b', True),
 
607
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
 
608
 
 
609
    def test_specific_files(self):
 
610
        tree = self.make_branch_and_tree('tree')
 
611
        self.build_tree(['tree/a', 'tree/b/'])
 
612
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
613
 
 
614
        dlg = commit.CommitDialog(tree)
 
615
        self.assertEqual((['a', 'b'], []), dlg._get_specific_files())
 
616
 
 
617
        dlg._commit_selected_radio.set_active(True)
 
618
        dlg._toggle_commit(None, 0, dlg._files_store)
 
619
        self.assertEqual(([], []), dlg._get_specific_files())
 
620
 
 
621
        dlg._toggle_commit(None, 1, dlg._files_store)
 
622
        self.assertEqual((['a'], []), dlg._get_specific_files())
 
623
 
 
624
    def test_specific_files_with_messages(self):
 
625
        tree = self.make_branch_and_tree('tree')
 
626
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
627
        self.build_tree(['tree/a_file', 'tree/b_dir/'])
 
628
        tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])
 
629
 
 
630
        dlg = commit.CommitDialog(tree)
 
631
        dlg._commit_selected_radio.set_active(True)
 
632
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
 
633
 
 
634
        dlg._treeview_files.set_cursor((1,))
 
635
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
 
636
        dlg._treeview_files.set_cursor((2,))
 
637
        dlg._set_file_commit_message('message\nfor b_dir\n')
 
638
 
 
639
        self.assertEqual((['a_file', 'b_dir'],
 
640
                          [{'path':'a_file', 'file_id':'1a-id',
 
641
                            'message':'Test\nmessage\nfor a_file\n'},
 
642
                           {'path':'b_dir', 'file_id':'0b-id',
 
643
                            'message':'message\nfor b_dir\n'},
 
644
                          ]), dlg._get_specific_files())
 
645
 
 
646
        dlg._toggle_commit(None, 1, dlg._files_store)
 
647
        self.assertEqual((['b_dir'],
 
648
                          [{'path':'b_dir', 'file_id':'0b-id',
 
649
                            'message':'message\nfor b_dir\n'},
 
650
                          ]), dlg._get_specific_files())
 
651
 
 
652
    def test_specific_files_sanitizes_messages(self):
 
653
        tree = self.make_branch_and_tree('tree')
 
654
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
655
        self.build_tree(['tree/a_file', 'tree/b_dir/'])
 
656
        tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])
 
657
 
 
658
        dlg = commit.CommitDialog(tree)
 
659
        dlg._commit_selected_radio.set_active(True)
 
660
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
 
661
 
 
662
        dlg._treeview_files.set_cursor((1,))
 
663
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
 
664
        dlg._treeview_files.set_cursor((2,))
 
665
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
 
666
 
 
667
        self.assertEqual((['a_file', 'b_dir'],
 
668
                          [{'path':'a_file', 'file_id':'1a-id',
 
669
                            'message':'Test\nmessage\nfor a_file\n'},
 
670
                           {'path':'b_dir', 'file_id':'0b-id',
 
671
                            'message':'message\nfor\nb_dir\n'},
 
672
                          ]), dlg._get_specific_files())
 
673
 
 
674
 
 
675
class QuestionHelpers(object):
 
676
 
 
677
    def _set_question_yes(self, dlg):
 
678
        """Set the dialog to answer YES to any questions."""
 
679
        self.questions = []
 
680
        def _question_yes(*args, **kwargs):
 
681
            self.questions.append(args)
 
682
            self.questions.append('YES')
 
683
            return gtk.RESPONSE_YES
 
684
        dlg._question_dialog = _question_yes
 
685
 
 
686
    def _set_question_no(self, dlg):
 
687
        """Set the dialog to answer NO to any questions."""
 
688
        self.questions = []
 
689
        def _question_no(*args, **kwargs):
 
690
            self.questions.append(args)
 
691
            self.questions.append('NO')
 
692
            return gtk.RESPONSE_NO
 
693
        dlg._question_dialog = _question_no
 
694
 
 
695
 
 
696
class TestCommitDialog_Commit(tests.TestCaseWithTransport, QuestionHelpers):
 
697
    """Tests on the actual 'commit' button being pushed."""
 
698
 
 
699
    def test_bound_commit_local(self):
 
700
        tree = self.make_branch_and_tree('tree')
 
701
        self.build_tree(['tree/a'])
 
702
        tree.add(['a'], ['a-id'])
 
703
        rev_id1 = tree.commit('one')
 
704
 
 
705
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
706
        self.build_tree(['tree2/b'])
 
707
        tree2.add(['b'], ['b-id'])
 
708
        tree2.branch.bind(tree.branch)
 
709
 
 
710
        dlg = commit.CommitDialog(tree2)
 
711
        # With the check box set, it should only effect the local branch
 
712
        dlg._check_local.set_active(True)
 
713
        dlg._set_global_commit_message('Commit message\n')
 
714
        dlg._do_commit()
 
715
 
 
716
        last_rev = tree2.last_revision()
 
717
        self.assertEqual(last_rev, dlg.committed_revision_id)
 
718
        self.assertEqual(rev_id1, tree.branch.last_revision())
 
719
 
 
720
    def test_commit_global_sanitizes_message(self):
 
721
        tree = self.make_branch_and_tree('tree')
 
722
        self.build_tree(['tree/a'])
 
723
        tree.add(['a'], ['a-id'])
 
724
        rev_id1 = tree.commit('one')
 
725
 
 
726
        self.build_tree(['tree/b'])
 
727
        tree.add(['b'], ['b-id'])
 
728
        dlg = commit.CommitDialog(tree)
 
729
        # With the check box set, it should only effect the local branch
 
730
        dlg._set_global_commit_message('Commit\r\nmessage\rfoo\n')
 
731
        dlg._do_commit()
 
732
        rev = tree.branch.repository.get_revision(tree.last_revision())
 
733
        self.assertEqual('Commit\nmessage\nfoo\n', rev.message)
 
734
 
 
735
    def test_bound_commit_both(self):
 
736
        tree = self.make_branch_and_tree('tree')
 
737
        self.build_tree(['tree/a'])
 
738
        tree.add(['a'], ['a-id'])
 
739
        rev_id1 = tree.commit('one')
 
740
 
 
741
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
742
        self.build_tree(['tree2/b'])
 
743
        tree2.add(['b'], ['b-id'])
 
744
        tree2.branch.bind(tree.branch)
 
745
 
 
746
        dlg = commit.CommitDialog(tree2)
 
747
        # With the check box set, it should only effect the local branch
 
748
        dlg._check_local.set_active(False)
 
749
        dlg._set_global_commit_message('Commit message\n')
 
750
        dlg._do_commit()
 
751
 
 
752
        last_rev = tree2.last_revision()
 
753
        self.assertEqual(last_rev, dlg.committed_revision_id)
 
754
        self.assertEqual(last_rev, tree.branch.last_revision())
 
755
 
 
756
    def test_commit_empty_message(self):
 
757
        tree = self.make_branch_and_tree('tree')
 
758
        self.build_tree(['tree/a', 'tree/b'])
 
759
        tree.add(['a'], ['a-id'])
 
760
        rev_id = tree.commit('one')
 
761
 
 
762
        tree.add(['b'], ['b-id'])
 
763
 
 
764
        dlg = commit.CommitDialog(tree)
 
765
        self._set_question_no(dlg)
 
766
        dlg._do_commit()
 
767
        self.assertEqual(
 
768
            [('Commit with an empty message?',
 
769
              'You can describe your commit intent in the message.'),
 
770
              'NO',
 
771
            ], self.questions)
 
772
        # By saying NO, nothing should be committed.
 
773
        self.assertEqual(rev_id, tree.last_revision())
 
774
        self.assertIs(None, dlg.committed_revision_id)
 
775
        self.assertTrue(dlg._global_message_text_view.get_property('is-focus'))
 
776
 
 
777
        self._set_question_yes(dlg)
 
778
 
 
779
        dlg._do_commit()
 
780
        self.assertEqual(
 
781
            [('Commit with an empty message?',
 
782
              'You can describe your commit intent in the message.'),
 
783
              'YES',
 
784
            ], self.questions)
 
785
        committed = tree.last_revision()
 
786
        self.assertNotEqual(rev_id, committed)
 
787
        self.assertEqual(committed, dlg.committed_revision_id)
 
788
 
 
789
    def test_initial_commit(self):
 
790
        tree = self.make_branch_and_tree('tree')
 
791
        self.build_tree(['tree/a'])
 
792
        tree.add(['a'], ['a-id'])
 
793
 
 
794
        dlg = commit.CommitDialog(tree)
 
795
        dlg._set_global_commit_message('Some text\n')
 
796
        dlg._do_commit()
 
797
 
 
798
        last_rev = tree.last_revision()
 
799
        self.assertEqual(last_rev, dlg.committed_revision_id)
 
800
        rev = tree.branch.repository.get_revision(last_rev)
 
801
        self.assertEqual(last_rev, rev.revision_id)
 
802
        self.assertEqual('Some text\n', rev.message)
 
803
 
 
804
    def test_pointless_commit(self):
 
805
        tree = self.make_branch_and_tree('tree')
 
806
        self.build_tree(['tree/a'])
 
807
        tree.add(['a'], ['a-id'])
 
808
        rev_id1 = tree.commit('one')
 
809
 
 
810
        dlg = commit.CommitDialog(tree)
 
811
        dlg._set_global_commit_message('Some text\n')
 
812
 
 
813
        self._set_question_no(dlg)
 
814
        dlg._do_commit()
 
815
 
 
816
        self.assertIs(None, dlg.committed_revision_id)
 
817
        self.assertEqual(rev_id1, tree.last_revision())
 
818
        self.assertEqual(
 
819
            [('Commit with no changes?',
 
820
              'There are no changes in the working tree.'
 
821
              ' Do you want to commit anyway?'),
 
822
              'NO',
 
823
            ], self.questions)
 
824
 
 
825
        self._set_question_yes(dlg)
 
826
        dlg._do_commit()
 
827
 
 
828
        rev_id2 = tree.last_revision()
 
829
        self.assertEqual(rev_id2, dlg.committed_revision_id)
 
830
        self.assertNotEqual(rev_id1, rev_id2)
 
831
        self.assertEqual(
 
832
            [('Commit with no changes?',
 
833
              'There are no changes in the working tree.'
 
834
              ' Do you want to commit anyway?'),
 
835
              'YES',
 
836
            ], self.questions)
 
837
 
 
838
    def test_unknowns(self):
 
839
        """We should check if there are unknown files."""
 
840
        tree = self.make_branch_and_tree('tree')
 
841
        rev_id1 = tree.commit('one')
 
842
        self.build_tree(['tree/a', 'tree/b'])
 
843
        tree.add(['a'], ['a-id'])
 
844
 
 
845
        dlg = commit.CommitDialog(tree)
 
846
        dlg._set_global_commit_message('Some text\n')
 
847
        self._set_question_no(dlg)
 
848
 
 
849
        dlg._do_commit()
 
850
 
 
851
        self.assertIs(None, dlg.committed_revision_id)
 
852
        self.assertEqual(rev_id1, tree.last_revision())
 
853
        self.assertEqual(
 
854
            [("Commit with unknowns?",
 
855
              "Unknown files exist in the working tree. Commit anyway?"),
 
856
              "NO",
 
857
            ], self.questions)
 
858
 
 
859
        self._set_question_yes(dlg)
 
860
        dlg._do_commit()
 
861
 
 
862
        rev_id2 = tree.last_revision()
 
863
        self.assertNotEqual(rev_id1, rev_id2)
 
864
        self.assertEqual(rev_id2, dlg.committed_revision_id)
 
865
        self.assertEqual(
 
866
            [("Commit with unknowns?",
 
867
              "Unknown files exist in the working tree. Commit anyway?"),
 
868
              "YES",
 
869
            ], self.questions)
 
870
 
 
871
    def test_commit_specific_files(self):
 
872
        tree = self.make_branch_and_tree('tree')
 
873
        rev_id1 = tree.commit('one')
 
874
        self.build_tree(['tree/a', 'tree/b'])
 
875
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
876
 
 
877
        dlg = commit.CommitDialog(tree)
 
878
        dlg._commit_selected_radio.set_active(True) # enable partial
 
879
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
 
880
 
 
881
        dlg._set_global_commit_message('Committing just "a"\n')
 
882
        dlg._do_commit()
 
883
 
 
884
        rev_id2 = dlg.committed_revision_id
 
885
        self.assertIsNot(None, rev_id2)
 
886
        self.assertEqual(rev_id2, tree.last_revision())
 
887
 
 
888
        rt = tree.branch.repository.revision_tree(rev_id2)
 
889
        entries = [(path, ie.file_id) for path, ie in rt.iter_entries_by_dir()
 
890
                                       if path] # Ignore the root entry
 
891
        self.assertEqual([('a', 'a-id')], entries)
 
892
 
 
893
    def test_commit_partial_no_partial(self):
 
894
        """Ignore the checkboxes if committing all files."""
 
895
        tree = self.make_branch_and_tree('tree')
 
896
        rev_id1 = tree.commit('one')
 
897
        self.build_tree(['tree/a', 'tree/b'])
 
898
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
899
 
 
900
        dlg = commit.CommitDialog(tree)
 
901
        dlg._commit_selected_radio.set_active(True) # enable partial
 
902
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
 
903
 
 
904
        # Switch back to committing all changes
 
905
        dlg._commit_all_files_radio.set_active(True)
 
906
 
 
907
        dlg._set_global_commit_message('Committing everything\n')
 
908
        dlg._do_commit()
 
909
 
 
910
        rev_id2 = dlg.committed_revision_id
 
911
        self.assertIsNot(None, rev_id2)
 
912
        self.assertEqual(rev_id2, tree.last_revision())
 
913
 
 
914
        rt = tree.branch.repository.revision_tree(rev_id2)
 
915
        entries = [(path, ie.file_id) for path, ie in rt.iter_entries_by_dir()
 
916
                                       if path] # Ignore the root entry
 
917
        self.assertEqual([('a', 'a-id'), ('b', 'b-id')], entries)
 
918
 
 
919
    def test_commit_no_messages(self):
 
920
        tree = self.make_branch_and_tree('tree')
 
921
        rev_id1 = tree.commit('one')
 
922
        self.build_tree(['tree/a', 'tree/b'])
 
923
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
924
 
 
925
        dlg = commit.CommitDialog(tree)
 
926
        dlg._set_global_commit_message('Simple commit\n')
 
927
        dlg._do_commit()
 
928
 
 
929
        rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
 
930
        self.failIf('file-info' in rev.properties)
 
931
 
 
932
    def test_commit_disabled_messages(self):
 
933
        tree = self.make_branch_and_tree('tree')
 
934
        rev_id1 = tree.commit('one')
 
935
 
 
936
        self.build_tree(['tree/a', 'tree/b'])
 
937
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
938
 
 
939
        dlg = commit.CommitDialog(tree)
 
940
        self.assertFalse(dlg._file_message_expander.get_property('visible'))
 
941
        self.assertEqual('Commit Message',
 
942
                         dlg._global_message_label.get_text())
 
943
 
 
944
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
945
        dlg = commit.CommitDialog(tree)
 
946
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
 
947
        self.assertEqual('Global Commit Message',
 
948
                         dlg._global_message_label.get_text())
 
949
 
 
950
        tree.branch.get_config().set_user_option('per_file_commits', 'on')
 
951
        dlg = commit.CommitDialog(tree)
 
952
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
 
953
        self.assertEqual('Global Commit Message',
 
954
                         dlg._global_message_label.get_text())
 
955
 
 
956
        tree.branch.get_config().set_user_option('per_file_commits', 'y')
 
957
        dlg = commit.CommitDialog(tree)
 
958
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
 
959
        self.assertEqual('Global Commit Message',
 
960
                         dlg._global_message_label.get_text())
 
961
 
 
962
        tree.branch.get_config().set_user_option('per_file_commits', 'n')
 
963
        dlg = commit.CommitDialog(tree)
 
964
        self.assertFalse(dlg._file_message_expander.get_property('visible'))
 
965
        self.assertEqual('Commit Message',
 
966
                         dlg._global_message_label.get_text())
 
967
 
 
968
    def test_commit_specific_files_with_messages(self):
 
969
        tree = self.make_branch_and_tree('tree')
 
970
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
971
        rev_id1 = tree.commit('one')
 
972
        self.build_tree(['tree/a', 'tree/b'])
 
973
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
974
 
 
975
        dlg = commit.CommitDialog(tree)
 
976
        dlg._commit_selected_radio.set_active(True) # enable partial
 
977
        dlg._treeview_files.set_cursor((1,))
 
978
        dlg._set_file_commit_message('Message for A\n')
 
979
        dlg._treeview_files.set_cursor((2,))
 
980
        dlg._set_file_commit_message('Message for B\n')
 
981
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
 
982
        dlg._set_global_commit_message('Commit just "a"')
 
983
 
 
984
        dlg._do_commit()
 
985
 
 
986
        rev_id2 = dlg.committed_revision_id
 
987
        self.assertEqual(rev_id2, tree.last_revision())
 
988
        rev = tree.branch.repository.get_revision(rev_id2)
 
989
        self.assertEqual('Commit just "a"', rev.message)
 
990
        file_info = rev.properties['file-info']
 
991
        self.assertEqual(u'ld7:file_id4:a-id'
 
992
                         '7:message14:Message for A\n'
 
993
                         '4:path1:a'
 
994
                         'ee',
 
995
                         file_info)
 
996
        self.assertEqual([{'path':'a', 'file_id':'a-id',
 
997
                           'message':'Message for A\n'},],
 
998
                         bencode.bdecode(file_info.encode('UTF-8')))
 
999
 
 
1000
    def test_commit_messages_after_merge(self):
 
1001
        tree = self.make_branch_and_tree('tree')
 
1002
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
1003
        rev_id1 = tree.commit('one')
 
1004
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
1005
        self.build_tree(['tree2/a', 'tree2/b'])
 
1006
        tree2.add(['a', 'b'], ['a-id', 'b-id'])
 
1007
        rev_id2 = tree2.commit('two')
 
1008
 
 
1009
        tree.merge_from_branch(tree2.branch)
 
1010
 
 
1011
        dlg = commit.CommitDialog(tree)
 
1012
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1013
        dlg._set_file_commit_message('Message for A\n')
 
1014
        # No message for 'B'
 
1015
        dlg._set_global_commit_message('Merging from "tree2"\n')
 
1016
 
 
1017
        dlg._do_commit()
 
1018
 
 
1019
        rev_id3 = dlg.committed_revision_id
 
1020
        self.assertEqual(rev_id3, tree.last_revision())
 
1021
        rev = tree.branch.repository.get_revision(rev_id3)
 
1022
        self.assertEqual('Merging from "tree2"\n', rev.message)
 
1023
        self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
 
1024
        file_info = rev.properties['file-info']
 
1025
        self.assertEqual(u'ld7:file_id4:a-id'
 
1026
                         '7:message14:Message for A\n'
 
1027
                         '4:path1:a'
 
1028
                         'ee',
 
1029
                         file_info)
 
1030
        self.assertEqual([{'path':'a', 'file_id':'a-id',
 
1031
                           'message':'Message for A\n'},],
 
1032
                         bencode.bdecode(file_info.encode('UTF-8')))
 
1033
 
 
1034
    def test_commit_unicode_messages(self):
 
1035
        self.requireFeature(tests.UnicodeFilenameFeature)
 
1036
 
 
1037
        tree = self.make_branch_and_tree('tree')
 
1038
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
 
1039
        self.build_tree(['tree/a', u'tree/\u03a9'])
 
1040
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
 
1041
 
 
1042
        dlg = commit.CommitDialog(tree)
 
1043
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1044
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
 
1045
        dlg._treeview_files.set_cursor((2,)) # omega
 
1046
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
 
1047
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
 
1048
 
 
1049
        self.assertEqual(([u'a', u'\u03a9'],
 
1050
                          [{'path':'a', 'file_id':'a-id',
 
1051
                            'message':'Test \xc3\xban\xc3\xacc\xc3\xb6de\n'},
 
1052
                           {'path':'\xce\xa9', 'file_id':'omega-id',
 
1053
                            'message':'\xce\xa9 is the end of all things.\n'},
 
1054
                          ]), dlg._get_specific_files())
 
1055
 
 
1056
        dlg._do_commit()
 
1057
 
 
1058
        rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
 
1059
        file_info = rev.properties['file-info'].encode('UTF-8')
 
1060
        value = ('ld7:file_id4:a-id'
 
1061
                   '7:message16:Test \xc3\xban\xc3\xacc\xc3\xb6de\n'
 
1062
                   '4:path1:a'
 
1063
                  'e'
 
1064
                  'd7:file_id8:omega-id'
 
1065
                   '7:message29:\xce\xa9 is the end of all things.\n'
 
1066
                   '4:path2:\xce\xa9'
 
1067
                  'e'
 
1068
                 'e')
 
1069
        self.assertEqual(value, file_info)
 
1070
        file_info_decoded = bencode.bdecode(file_info)
 
1071
        for d in file_info_decoded:
 
1072
            d['path'] = d['path'].decode('UTF-8')
 
1073
            d['message'] = d['message'].decode('UTF-8')
 
1074
 
 
1075
        self.assertEqual([{'path':u'a', 'file_id':'a-id',
 
1076
                           'message':u'Test \xfan\xecc\xf6de\n'},
 
1077
                          {'path':u'\u03a9', 'file_id':'omega-id',
 
1078
                           'message':u'\u03a9 is the end of all things.\n'},
 
1079
                         ], file_info_decoded)
 
1080
 
 
1081
 
 
1082
class TestSanitizeMessage(tests.TestCase):
 
1083
 
 
1084
    def assertSanitize(self, expected, original):
 
1085
        self.assertEqual(expected,
 
1086
                         commit._sanitize_and_decode_message(original))
 
1087
 
 
1088
    def test_untouched(self):
 
1089
        self.assertSanitize('foo\nbar\nbaz\n', 'foo\nbar\nbaz\n')
 
1090
 
 
1091
    def test_converts_cr_to_lf(self):
 
1092
        self.assertSanitize('foo\nbar\nbaz\n', 'foo\rbar\rbaz\r')
 
1093
 
 
1094
    def test_converts_crlf_to_lf(self):
 
1095
        self.assertSanitize('foo\nbar\nbaz\n', 'foo\r\nbar\r\nbaz\r\n')
 
1096
 
 
1097
    def test_converts_mixed_to_lf(self):
 
1098
        self.assertSanitize('foo\nbar\nbaz\n', 'foo\r\nbar\rbaz\n')
 
1099
 
 
1100
 
 
1101
class TestSavedCommitMessages(tests.TestCaseWithTransport):
 
1102
 
 
1103
    def setUp(self):
 
1104
        super(TestSavedCommitMessages, self).setUp()
 
1105
        # Install our hook
 
1106
        branch.Branch.hooks.install_named_hook(
 
1107
            'post_uncommit', commit.save_commit_messages, None)
 
1108
 
 
1109
    def _get_file_info_dict(self, rank):
 
1110
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
 
1111
                     dict(path='b', file_id='b-id', message='b msg %d' % rank)]
 
1112
        return file_info
 
1113
 
 
1114
    def _get_file_info_revprops(self, rank):
 
1115
        file_info_prop = self._get_file_info_dict(rank)
 
1116
        return {'file-info': bencode.bencode(file_info_prop).decode('UTF-8')}
 
1117
 
 
1118
    def _get_commit_message(self):
 
1119
        return self.config.get_user_option('gtk_global_commit_message')
 
1120
 
 
1121
    def _get_file_commit_messages(self):
 
1122
        return self.config.get_user_option('gtk_file_commit_messages')
 
1123
 
 
1124
 
 
1125
class TestUncommitHook(TestSavedCommitMessages):
 
1126
 
 
1127
    def setUp(self):
 
1128
        super(TestUncommitHook, self).setUp()
 
1129
        self.tree = self.make_branch_and_tree('tree')
 
1130
        self.config = self.tree.branch.get_config()
 
1131
        self.build_tree(['tree/a', 'tree/b'])
 
1132
        self.tree.add(['a'], ['a-id'])
 
1133
        self.tree.add(['b'], ['b-id'])
 
1134
        rev1 = self.tree.commit('one', rev_id='one-id',
 
1135
                                revprops=self._get_file_info_revprops(1))
 
1136
        rev2 = self.tree.commit('two', rev_id='two-id',
 
1137
                                revprops=self._get_file_info_revprops(2))
 
1138
        rev3 = self.tree.commit('three', rev_id='three-id',
 
1139
                                revprops=self._get_file_info_revprops(3))
 
1140
 
 
1141
    def test_uncommit_one_by_one(self):
 
1142
        uncommit.uncommit(self.tree.branch, tree=self.tree)
 
1143
        self.assertEquals(u'three', self._get_commit_message())
 
1144
        self.assertEquals(u'd4:a-id7:a msg 34:b-id7:b msg 3e',
 
1145
                          self._get_file_commit_messages())
 
1146
 
 
1147
        uncommit.uncommit(self.tree.branch, tree=self.tree)
 
1148
        self.assertEquals(u'two\n******\nthree', self._get_commit_message())
 
1149
        self.assertEquals(u'd4:a-id22:a msg 2\n******\na msg 3'
 
1150
                          '4:b-id22:b msg 2\n******\nb msg 3e',
 
1151
                          self._get_file_commit_messages())
 
1152
 
 
1153
        uncommit.uncommit(self.tree.branch, tree=self.tree)
 
1154
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
 
1155
                          self._get_commit_message())
 
1156
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1157
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1158
                          self._get_file_commit_messages())
 
1159
 
 
1160
    def test_uncommit_all_at_once(self):
 
1161
        uncommit.uncommit(self.tree.branch, tree=self.tree, revno=1)
 
1162
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
 
1163
                          self._get_commit_message())
 
1164
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1165
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1166
                          self._get_file_commit_messages())
 
1167
 
 
1168
 
 
1169
class TestReusingSavedCommitMessages(TestSavedCommitMessages, QuestionHelpers):
 
1170
 
 
1171
    def setUp(self):
 
1172
        super(TestReusingSavedCommitMessages, self).setUp()
 
1173
        self.tree = self.make_branch_and_tree('tree')
 
1174
        self.config = self.tree.branch.get_config()
 
1175
        self.config.set_user_option('per_file_commits', 'true')
 
1176
        self.build_tree(['tree/a', 'tree/b'])
 
1177
        self.tree.add(['a'], ['a-id'])
 
1178
        self.tree.add(['b'], ['b-id'])
 
1179
        rev1 = self.tree.commit('one', revprops=self._get_file_info_revprops(1))
 
1180
        rev2 = self.tree.commit('two', revprops=self._get_file_info_revprops(2))
 
1181
        uncommit.uncommit(self.tree.branch, tree=self.tree)
 
1182
        self.build_tree_contents([('tree/a', 'new a content\n'),
 
1183
                                  ('tree/b', 'new b content'),])
 
1184
 
 
1185
    def _get_commit_dialog(self, tree):
 
1186
        # Ensure we will never use a dialog that can actually prompt the user
 
1187
        # during the test suite. Test *can* and *should* override with the
 
1188
        # correct question dialog type.
 
1189
        dlg = commit.CommitDialog(tree)
 
1190
        self._set_question_no(dlg)
 
1191
        return dlg
 
1192
 
 
1193
    def test_setup_saved_messages(self):
 
1194
        # Check the initial setup
 
1195
        self.assertEquals(u'two', self._get_commit_message())
 
1196
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
 
1197
                          self._get_file_commit_messages())
 
1198
 
 
1199
    def test_messages_are_reloaded(self):
 
1200
        dlg = self._get_commit_dialog(self.tree)
 
1201
        self.assertEquals(u'two', dlg._get_global_commit_message())
 
1202
        self.assertEquals(([u'a', u'b'],
 
1203
                           [{ 'path': 'a',
 
1204
                             'file_id': 'a-id', 'message': 'a msg 2',},
 
1205
                           {'path': 'b',
 
1206
                            'file_id': 'b-id', 'message': 'b msg 2',}],),
 
1207
                          dlg._get_specific_files())
 
1208
 
 
1209
    def test_messages_are_consumed(self):
 
1210
        dlg = self._get_commit_dialog(self.tree)
 
1211
        dlg._do_commit()
 
1212
        self.assertEquals(u'', self._get_commit_message())
 
1213
        self.assertEquals(u'de', self._get_file_commit_messages())
 
1214
 
 
1215
    def test_messages_are_saved_on_cancel_if_required(self):
 
1216
        dlg = self._get_commit_dialog(self.tree)
 
1217
        self._set_question_yes(dlg) # Save messages
 
1218
        dlg._do_cancel()
 
1219
        self.assertEquals(u'two', self._get_commit_message())
 
1220
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
 
1221
                          self._get_file_commit_messages())
 
1222
 
 
1223
    def test_messages_are_cleared_on_cancel_if_required(self):
 
1224
        dlg = self._get_commit_dialog(self.tree)
 
1225
        self._set_question_no(dlg) # Don't save messages
 
1226
        dlg._do_cancel()
 
1227
        self.assertEquals(u'', self._get_commit_message())
 
1228
        self.assertEquals(u'de',
 
1229
                          self._get_file_commit_messages())