← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2006-11-23 18:06:43 UTC
  • Revision ID: abentley@panoramicfeedback.com-20061123180643-6ry3xqozdbn4cfhy
Update docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
1
 
import os.path
2
1
from bzrlib.diff import _patch_header_date
3
2
import bzrlib.tests
 
3
import os.path
4
4
 
5
 
from bzrlib.plugins.bzrtools.hunk_selector import (
6
 
    ShelveHunkSelector,
7
 
    UnshelveHunkSelector,
8
 
    )
9
 
from bzrlib.plugins.bzrtools.errors import NoColor
 
5
try:
 
6
    from bzrlib.plugins.bzrtools.hunk_selector import (
 
7
        ShelveHunkSelector,
 
8
        UnshelveHunkSelector,
 
9
        )
 
10
    from bzrlib.plugins.bzrtools.errors import NoColor
 
11
except ImportError:
 
12
    from bzrtools.hunk_selector import (
 
13
        ShelveHunkSelector,
 
14
        UnshelveHunkSelector,
 
15
        )
 
16
    from bzrtools.errors import NoColor
10
17
 
11
18
 
12
19
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
33
40
"""
34
41
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
35
42
        old_tree = self.tree.basis_tree()
36
 
        old_tree.lock_read()
37
 
        self.tree.lock_read()
38
 
        try:
39
 
            old_date = _patch_header_date(old_tree,
40
 
                                          old_tree.inventory.path2id(filename),
41
 
                                          filename)
42
 
            new_date = _patch_header_date(self.tree,
43
 
                self.tree.inventory.path2id(filename), filename)
44
 
        finally:
45
 
            old_tree.unlock()
 
43
        old_date = _patch_header_date(old_tree, 
 
44
                                      old_tree.inventory.path2id(filename),
 
45
                                      filename)
 
46
        new_date = _patch_header_date(self.tree, 
 
47
                                      self.tree.inventory.path2id(filename),
 
48
                                      filename)
46
49
        keys = { 'filename' : filename , 'old_date': old_date, 
47
50
                 'new_date': new_date}
48
51
        hdr  = self.DIFF_HEADER % keys
52
55
    def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
53
56
                     new_date=None):
54
57
        old_tree = self.tree.basis_tree()
55
 
        old_tree.lock_read()
56
 
        try:
57
 
            old_date = _patch_header_date(old_tree,
58
 
                                          old_tree.inventory.path2id(filename),
59
 
                                          filename)
60
 
        finally:
61
 
            old_tree.unlock()
 
58
        old_date = _patch_header_date(old_tree, 
 
59
                                      old_tree.inventory.path2id(filename),
 
60
                                      filename)
62
61
        diff = diff % { 'filename' : filename, 'old_date': old_date,
63
62
                        'new_date': new_date}
64
63
        shelf = open(os.path.join(self.tree.basedir,
314
313
 
315
314
    def test_shelf_delete(self):
316
315
        self.tree = self.make_branch_and_tree('.')
317
 
        self.tree.lock_write()
318
 
        try:
319
 
            self.__create_and_add_test_file()
320
 
            self.__create_and_add_test_file(filename='test_file2')
321
 
 
322
 
            # Modify the test files
323
 
            # write in binary mode because on win32 line-endings should be LF
324
 
            f = file('test_file', 'wb')
325
 
            f.write(self.MODIFIED)
326
 
            f.close()
327
 
            f = file('test_file2', 'wb')
328
 
            f.write(self.MODIFIED)
329
 
            f.close()
330
 
            new_date = _patch_header_date(self.tree,
331
 
                self.tree.inventory.path2id('test_file'), 'test_file')
332
 
        finally:
333
 
            self.tree.unlock()
 
316
 
 
317
        self.__create_and_add_test_file()
 
318
        self.__create_and_add_test_file(filename='test_file2')
 
319
 
 
320
        # Modify the test files
 
321
        # write in binary mode because on win32 line-endings should be LF
 
322
        f = file('test_file', 'wb')
 
323
        f.write(self.MODIFIED)
 
324
        f.close()
 
325
        f = file('test_file2', 'wb')
 
326
        f.write(self.MODIFIED)
 
327
        f.close()
 
328
        new_date = _patch_header_date(self.tree, 
 
329
            self.tree.inventory.path2id('test_file'), 'test_file')
334
330
 
335
331
        # Shelve the changes
336
332
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
425
421
        self.run_bzr('shelf', 'ls', retcode=0)
426
422
 
427
423
        old_tree = self.tree.basis_tree()
428
 
        old_tree.lock_read()
429
 
        self.tree.lock_read()
430
 
        try:
431
 
            old_date = _patch_header_date(old_tree,
432
 
                old_tree.inventory.path2id('test_file'),
433
 
                                          'test_file')
434
 
            new_date = _patch_header_date(self.tree,
435
 
                self.tree.inventory.path2id('test_file'), 'test_file')
436
 
        finally:
437
 
            old_tree.unlock()
438
 
            self.tree.unlock()
 
424
        old_date = _patch_header_date(old_tree, 
 
425
                                      old_tree.inventory.path2id('test_file'),
 
426
                                      'test_file')
 
427
        new_date = _patch_header_date(self.tree, 
 
428
                                      self.tree.inventory.path2id('test_file'),
 
429
                                      'test_file')
439
430
        # Fake a -p0 shelved patch
440
431
        diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,
441
432
                               'new_date' : new_date}