/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_reconcile.py

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-09 21:36:27 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20210109213627-h1xwcutzy9m7a99b
Added 'Case Preserving Working Tree Use Cases' from Canonical Wiki

* Addod a page from the Canonical Bazaar wiki
  with information on the scmeatics of case
  perserving filesystems an a case insensitive
  filesystem works.
  
  * Needs re-work, but this will do as it is the
    same inforamoton as what was on the linked
    page in the currint documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_reconcile.py
17
17
"""Black box tests for the reconcile command."""
18
18
 
19
19
 
20
 
from bzrlib import (
21
 
    bzrdir,
 
20
from breezy import (
 
21
    controldir,
 
22
    tests,
 
23
    )
 
24
from breezy.repository import WriteGroup
 
25
from breezy.bzr import (
22
26
    inventory,
23
 
    repository,
24
 
    tests,
25
27
    )
26
28
 
27
29
 
28
30
class TrivialTest(tests.TestCaseWithTransport):
29
31
 
30
32
    def test_trivial_reconcile(self):
31
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
33
        t = controldir.ControlDir.create_standalone_workingtree('.')
32
34
        (out, err) = self.run_bzr('reconcile')
33
35
        if t.branch.repository._reconcile_backsup_inventory:
34
36
            does_backup_text = "Inventory ok.\n"
40
42
                                  "%s"
41
43
                                  "Reconciliation complete.\n" %
42
44
                                  (t.branch.base,
43
 
                                   t.bzrdir.root_transport.base,
 
45
                                   t.controldir.root_transport.base,
44
46
                                   does_backup_text))
45
47
        self.assertEqualDiff(err, "")
46
48
 
47
49
    def test_does_something_reconcile(self):
48
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
50
        t = controldir.ControlDir.create_standalone_workingtree('.')
49
51
        # an empty inventory with no revision will trigger reconciliation.
50
52
        repo = t.branch.repository
51
 
        inv = inventory.Inventory(revision_id='missing')
52
 
        inv.root.revision='missing'
 
53
        inv = inventory.Inventory(revision_id=b'missing')
 
54
        inv.root.revision = b'missing'
53
55
        repo.lock_write()
54
 
        repo.start_write_group()
55
 
        repo.add_inventory('missing', inv, [])
56
 
        repo.commit_write_group()
57
 
        repo.unlock()
 
56
        with repo.lock_write(), WriteGroup(repo):
 
57
            repo.add_inventory(b'missing', inv, [])
58
58
        (out, err) = self.run_bzr('reconcile')
59
59
        if repo._reconcile_backsup_inventory:
60
60
            does_backup_text = (
68
68
                    "%s"
69
69
                    "Reconciliation complete.\n" %
70
70
                    (t.branch.base,
71
 
                     t.bzrdir.root_transport.base,
 
71
                     t.controldir.root_transport.base,
72
72
                     does_backup_text))
73
73
        self.assertEqualDiff(expected, out)
74
74
        self.assertEqualDiff(err, "")