1
=== modified file 'breezy/git/tests/test_blackbox.py'
2
--- breezy/git/tests/test_blackbox.py	2018-11-19 20:11:08 +0000
3
+++ breezy/git/tests/test_blackbox.py	2018-12-11 00:00:51 +0000
4
@@ -63,7 +63,12 @@
5
63
        self.simple_commit()
63
        self.simple_commit()
6
64
        output, error = self.run_bzr(['info'])
64
        output, error = self.run_bzr(['info'])
7
65
        self.assertEqual(error, '')
65
        self.assertEqual(error, '')
9
66
        self.assertTrue("Standalone tree (format: git)" in output)
66
        self.assertEqual(
10
67
            output,
11
68
            'Standalone tree (format: git)\n'
12
69
            'Location:\n'
13
70
            '            light checkout root: .\n'
14
71
            '  checkout of co-located branch: master\n')
15
67
72
16
68
    def test_ignore(self):
73
    def test_ignore(self):
17
69
        self.simple_commit()
74
        self.simple_commit()
18
70
75
19
=== modified file 'breezy/info.py'
20
--- breezy/info.py	2018-11-12 01:41:38 +0000
21
+++ breezy/info.py	2018-12-11 00:00:51 +0000
22
@@ -108,7 +108,15 @@
23
108
            else:
108
            else:
24
109
                locs['checkout root'] = branch_path
109
                locs['checkout root'] = branch_path
25
110
        if working_path != master_path:
110
        if working_path != master_path:
27
111
            locs['checkout of branch'] = master_path
111
            (master_path_base, params) = urlutils.split_segment_parameters(
28
112
                master_path)
29
113
            if working_path == master_path_base:
30
114
                locs['checkout of co-located branch'] = params['branch']
31
115
            elif 'branch' in params:
32
116
                locs['checkout of branch'] = "%s, branch %s" (
33
117
                    master_path_base, params['branch'])
34
118
            else:
35
119
                locs['checkout of branch'] = master_path
36
112
        elif repository.is_shared():
120
        elif repository.is_shared():
37
113
            locs['repository branch'] = branch_path
121
            locs['repository branch'] = branch_path
38
114
        elif branch_path is not None:
122
        elif branch_path is not None:
39
@@ -138,9 +146,9 @@
40
138
        locs['shared repository'] = repository.user_url
146
        locs['shared repository'] = repository.user_url
41
139
    order = ['control directory', 'light checkout root',
147
    order = ['control directory', 'light checkout root',
42
140
             'repository checkout root', 'checkout root',
148
             'repository checkout root', 'checkout root',
46
141
             'checkout of branch', 'shared repository',
149
             'checkout of branch', 'checkout of co-located branch',
47
142
             'repository', 'repository branch', 'branch root',
150
             'shared repository', 'repository', 'repository branch',
48
143
             'bound to branch']
151
             'branch root', 'bound to branch']
49
144
    return [(n, locs[n]) for n in order if n in locs]
152
    return [(n, locs[n]) for n in order if n in locs]
50
145
153
51
146
154
52
147
155
53
=== modified file 'breezy/tests/blackbox/test_info.py'
54
--- breezy/tests/blackbox/test_info.py	2018-11-11 04:08:32 +0000
55
+++ breezy/tests/blackbox/test_info.py	2018-12-11 00:00:51 +0000
56
@@ -84,6 +84,18 @@
57
84
                         '  checkout of branch: target\n')
84
                         '  checkout of branch: target\n')
58
85
        self.assertEqual(err, '')
85
        self.assertEqual(err, '')
59
86
86
60
87
    def test_info_colocated(self):
61
88
        br = self.make_branch_and_tree('target', format='development-colo')
62
89
        target = br.controldir.create_branch(name='dichtbij')
63
90
        br.controldir.set_branch_reference(target)
64
91
        out, err = self.run_bzr('info target')
65
92
        self.assertEqual(out,
66
93
                         'Standalone tree (format: development-colo)\n'
67
94
                         'Location:\n'
68
95
                         '            light checkout root: target\n'
69
96
                         '  checkout of co-located branch: dichtbij\n')
70
97
        self.assertEqual(err, '')
71
98
72
87
    def test_info_standalone(self):
99
    def test_info_standalone(self):
73
88
        transport = self.get_transport()
100
        transport = self.get_transport()
74
89
101
Reviewer	Review Type	Date Requested	Status
Martin Packman		2018-11-28	Approve on 2018-12-09
Review via email: mp+359663@code.launchpad.net