~jameinel/bzr/fix-push2

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005, 2006 Canonical Ltd
1685.1.60 by Martin Pool
[broken] NotBranchError should unescape the url if possible
2
# 
77 by mbp at sourcefrog
- split info command out into separate file
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.
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
7
#
77 by mbp at sourcefrog
- split info command out into separate file
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.
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
12
#
77 by mbp at sourcefrog
- split info command out into separate file
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
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
17
__all__ = ['show_bzrdir_info']
18
77 by mbp at sourcefrog
- split info command out into separate file
19
import time
20
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
21
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
22
from bzrlib import (
23
    diff,
24
    osutils,
25
    urlutils,
26
    )
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
27
from bzrlib.errors import (NoWorkingTree, NotBranchError,
28
                           NoRepositoryPresent, NotLocalUrl)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
29
from bzrlib.missing import find_unmerged
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
30
from bzrlib.symbol_versioning import (deprecated_function, 
31
        zero_eight)
77 by mbp at sourcefrog
- split info command out into separate file
32
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
33
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
34
def plural(n, base='', pl=None):
35
    if n == 1:
36
        return base
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
37
    elif pl is not None:
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
38
        return pl
39
    else:
40
        return 's'
41
42
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
43
def _repo_rel_url(repo_url, inner_url):
1694.2.6 by Martin Pool
[merge] bzr.dev
44
    """Return path with common prefix of repository path removed.
45
46
    If path is not part of the repository, the original path is returned.
47
    If path is equal to the repository, the current directory marker '.' is
48
    returned.
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
49
    Otherwise, a relative path is returned, with trailing '/' stripped.
1694.2.6 by Martin Pool
[merge] bzr.dev
50
    """
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
51
    inner_url = urlutils.normalize_url(inner_url)
52
    repo_url = urlutils.normalize_url(repo_url)
53
    if inner_url == repo_url:
1694.2.6 by Martin Pool
[merge] bzr.dev
54
        return '.'
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
55
    result = urlutils.relative_url(repo_url, inner_url)
56
    if result != inner_url:
1551.9.23 by Aaron Bentley
Use rstrip
57
        result = result.rstrip('/')
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
58
    return result
1694.2.6 by Martin Pool
[merge] bzr.dev
59
60
61
def _show_location_info(repository, branch=None, working=None):
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
62
    """Show known locations for working, branch and repository."""
1694.2.6 by Martin Pool
[merge] bzr.dev
63
    repository_path = repository.bzrdir.root_transport.base
1624.3.8 by Olaf Conradi
Adjust formatting. Start sections with a capital letter.
64
    print 'Location:'
1694.2.6 by Martin Pool
[merge] bzr.dev
65
    if working and branch:
66
        working_path = working.bzrdir.root_transport.base
67
        branch_path = branch.bzrdir.root_transport.base
68
        if working_path != branch_path:
69
            # lightweight checkout
1780.1.2 by Robert Collins
(robertc)Partial refactoring of info tests to be more robust to format changes.
70
            print ' light checkout root: %s' % working_path
1694.2.6 by Martin Pool
[merge] bzr.dev
71
            if repository.is_shared():
72
                # lightweight checkout of branch in shared repository
1780.1.2 by Robert Collins
(robertc)Partial refactoring of info tests to be more robust to format changes.
73
                print '   shared repository: %s' % repository_path
74
                print '   repository branch: %s' % (
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
75
                    _repo_rel_url(repository_path, branch_path))
1694.2.6 by Martin Pool
[merge] bzr.dev
76
            else:
77
                # lightweight checkout of standalone branch
1780.1.2 by Robert Collins
(robertc)Partial refactoring of info tests to be more robust to format changes.
78
                print '  checkout of branch: %s' % branch_path
1694.2.6 by Martin Pool
[merge] bzr.dev
79
        elif repository.is_shared():
80
            # branch with tree inside shared repository
81
            print '    shared repository: %s' % repository_path
82
            print '  repository checkout: %s' % (
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
83
                _repo_rel_url(repository_path, branch_path))
1694.2.6 by Martin Pool
[merge] bzr.dev
84
        elif branch.get_bound_location():
85
            # normal checkout
86
            print '       checkout root: %s' % working_path
87
            print '  checkout of branch: %s' % branch.get_bound_location()
88
        else:
89
            # standalone
90
            print '  branch root: %s' % working_path
1624.3.33 by Olaf Conradi
Simplified construct detection in location overview a lot.
91
    elif branch:
1694.2.6 by Martin Pool
[merge] bzr.dev
92
        branch_path = branch.bzrdir.root_transport.base
1624.3.48 by Olaf Conradi
Add info on standalone branches without a working tree.
93
        if repository.is_shared():
94
            # branch is part of shared repository
95
            print '  shared repository: %s' % repository_path
96
            print '  repository branch: %s' % (
1551.9.22 by Aaron Bentley
Use urlutils for info. Fixes bug #76229
97
                _repo_rel_url(repository_path, branch_path))
1624.3.48 by Olaf Conradi
Add info on standalone branches without a working tree.
98
        else:
99
            # standalone branch
100
            print '  branch root: %s' % branch_path
1694.2.6 by Martin Pool
[merge] bzr.dev
101
    else:
102
        # shared repository
103
        assert repository.is_shared()
104
        print '  shared repository: %s' % repository_path
105
106
107
def _show_related_info(branch):
108
    """Show parent and push location of branch."""
109
    if branch.get_parent() or branch.get_push_location():
110
        print
111
        print 'Related branches:'
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
112
        if branch.get_parent():
1694.2.6 by Martin Pool
[merge] bzr.dev
113
            if branch.get_push_location():
114
                print '      parent branch: %s' % branch.get_parent()
115
            else:
116
                print '  parent branch: %s' % branch.get_parent()
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
117
        if branch.get_push_location():
1694.2.6 by Martin Pool
[merge] bzr.dev
118
            print '  publish to branch: %s' % branch.get_push_location()
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
119
120
121
def _show_format_info(control=None, repository=None, branch=None, working=None):
122
    """Show known formats for control, working, branch and repository."""
1624.3.4 by Olaf Conradi
Simplify construct detection. Make terms in user interface consistent.
123
    print
1624.3.8 by Olaf Conradi
Adjust formatting. Start sections with a capital letter.
124
    print 'Format:'
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
125
    if control:
126
        print '       control: %s' % control._format.get_format_description()
127
    if working:
128
        print '  working tree: %s' % working._format.get_format_description()
129
    if branch:
130
        print '        branch: %s' % branch._format.get_format_description()
131
    if repository:
132
        print '    repository: %s' % repository._format.get_format_description()
133
134
1694.2.6 by Martin Pool
[merge] bzr.dev
135
def _show_locking_info(repository, branch=None, working=None):
136
    """Show locking status of working, branch and repository."""
137
    if (repository.get_physical_lock_status() or
138
        (branch and branch.get_physical_lock_status()) or
139
        (working and working.get_physical_lock_status())):
140
        print
141
        print 'Lock status:'
142
        if working:
143
            if working.get_physical_lock_status():
144
                status = 'locked'
145
            else:
146
                status = 'unlocked'
147
            print '  working tree: %s' % status
148
        if branch:
149
            if branch.get_physical_lock_status():
150
                status = 'locked'
151
            else:
152
                status = 'unlocked'
153
            print '        branch: %s' % status
154
        if repository:
155
            if repository.get_physical_lock_status():
156
                status = 'locked'
157
            else:
158
                status = 'unlocked'
159
            print '    repository: %s' % status
160
161
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
162
def _show_missing_revisions_branch(branch):
163
    """Show missing master revisions in branch."""
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
164
    # Try with inaccessible branch ?
1624.3.2 by Olaf Conradi
Implemented table of constructs from BzrInfo specification.
165
    master = branch.get_master_branch()
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
166
    if master:
1624.3.2 by Olaf Conradi
Implemented table of constructs from BzrInfo specification.
167
        local_extra, remote_extra = find_unmerged(branch, master)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
168
        if remote_extra:
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
169
            print
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
170
            print 'Branch is out of date: missing %d revision%s.' % (
171
                len(remote_extra), plural(len(remote_extra)))
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
172
173
174
def _show_missing_revisions_working(working):
175
    """Show missing revisions in working tree."""
176
    branch = working.branch
177
    basis = working.basis_tree()
178
    work_inv = working.inventory
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
179
    delta = working.changes_from(basis, want_unchanged=True)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
180
    history = branch.revision_history()
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
181
    try:
182
        tree_last_id = working.get_parent_ids()[0]
183
    except IndexError:
184
        tree_last_id = None
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
185
1624.3.11 by Olaf Conradi
Test cases exposed a bug in missing revisions count of working tree. It
186
    if len(history) and tree_last_id != history[-1]:
187
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)
188
        missing_count = len(history) - tree_last_revno
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
189
        print
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
190
        print 'Working tree is out of date: missing %d revision%s.' % (
191
            missing_count, plural(missing_count))
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
192
193
194
def _show_working_stats(working):
195
    """Show statistics about a working tree."""
196
    basis = working.basis_tree()
197
    work_inv = working.inventory
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
198
    delta = working.changes_from(basis, want_unchanged=True)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
199
200
    print
1624.3.8 by Olaf Conradi
Adjust formatting. Start sections with a capital letter.
201
    print 'In the working tree:'
463 by Martin Pool
- compare_trees() also reports unchanged files
202
    print '  %8s unchanged' % len(delta.unchanged)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
203
    print '  %8d modified' % len(delta.modified)
204
    print '  %8d added' % len(delta.added)
205
    print '  %8d removed' % len(delta.removed)
206
    print '  %8d renamed' % len(delta.renamed)
207
208
    ignore_cnt = unknown_cnt = 0
209
    for path in working.extras():
210
        if working.is_ignored(path):
211
            ignore_cnt += 1
212
        else:
213
            unknown_cnt += 1
214
    print '  %8d unknown' % unknown_cnt
215
    print '  %8d ignored' % ignore_cnt
216
217
    dir_cnt = 0
1731.1.39 by Aaron Bentley
Reject removing is_root
218
    for file_id in work_inv:
219
        if (work_inv.get_file_kind(file_id) == 'directory' and 
220
            not work_inv.is_root(file_id)):
221
            dir_cnt += 1
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
222
    print '  %8d versioned %s' \
223
          % (dir_cnt,
224
             plural(dir_cnt, 'subdirectory', 'subdirectories'))
77 by mbp at sourcefrog
- split info command out into separate file
225
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
226
227
def _show_branch_stats(branch, verbose):
228
    """Show statistics about a branch."""
229
    repository = branch.repository
230
    history = branch.revision_history()
231
77 by mbp at sourcefrog
- split info command out into separate file
232
    print
1624.3.8 by Olaf Conradi
Adjust formatting. Start sections with a capital letter.
233
    print 'Branch history:'
77 by mbp at sourcefrog
- split info command out into separate file
234
    revno = len(history)
111 by mbp at sourcefrog
Make fields wider in 'bzr info' output to accomodate big trees
235
    print '  %8d revision%s' % (revno, plural(revno))
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
236
    if verbose:
237
        committers = {}
238
        for rev in history:
239
            committers[repository.get_revision(rev).committer] = True
240
        print '  %8d committer%s' % (len(committers), plural(len(committers)))
77 by mbp at sourcefrog
- split info command out into separate file
241
    if revno > 0:
1624.3.17 by Olaf Conradi
Remove indirection in branch.repository as it is available as repository
242
        firstrev = repository.get_revision(history[0])
77 by mbp at sourcefrog
- split info command out into separate file
243
        age = int((time.time() - firstrev.timestamp) / 3600 / 24)
111 by mbp at sourcefrog
Make fields wider in 'bzr info' output to accomodate big trees
244
        print '  %8d day%s old' % (age, plural(age))
1694.2.6 by Martin Pool
[merge] bzr.dev
245
        print '   first revision: %s' % osutils.format_date(firstrev.timestamp,
246
                                                            firstrev.timezone)
77 by mbp at sourcefrog
- split info command out into separate file
247
1624.3.17 by Olaf Conradi
Remove indirection in branch.repository as it is available as repository
248
        lastrev = repository.get_revision(history[-1])
1694.2.6 by Martin Pool
[merge] bzr.dev
249
        print '  latest revision: %s' % osutils.format_date(lastrev.timestamp,
250
                                                            lastrev.timezone)
80 by mbp at sourcefrog
show_info: Show number of entries in the branch stores
251
1286 by Martin Pool
- stub out display of store size in info command
252
#     print
1624.3.8 by Olaf Conradi
Adjust formatting. Start sections with a capital letter.
253
#     print 'Text store:'
1624.3.2 by Olaf Conradi
Implemented table of constructs from BzrInfo specification.
254
#     c, t = branch.text_store.total_size()
1286 by Martin Pool
- stub out display of store size in info command
255
#     print '  %8d file texts' % c
1624.3.14 by Olaf Conradi
Move to using kibi for binary prefix as per standard IEEE 1541.
256
#     print '  %8d KiB' % (t/1024)
80 by mbp at sourcefrog
show_info: Show number of entries in the branch stores
257
1286 by Martin Pool
- stub out display of store size in info command
258
#     print
1624.3.8 by Olaf Conradi
Adjust formatting. Start sections with a capital letter.
259
#     print 'Inventory store:'
1624.3.2 by Olaf Conradi
Implemented table of constructs from BzrInfo specification.
260
#     c, t = branch.inventory_store.total_size()
1286 by Martin Pool
- stub out display of store size in info command
261
#     print '  %8d inventories' % c
1624.3.14 by Olaf Conradi
Move to using kibi for binary prefix as per standard IEEE 1541.
262
#     print '  %8d KiB' % (t/1024)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
263
264
265
def _show_repository_info(repository):
266
    """Show settings of a repository."""
267
    if repository.make_working_trees():
268
        print
269
        print 'Create working tree for new branches inside the repository.'
270
271
272
def _show_repository_stats(repository):
273
    """Show statistics about a repository."""
274
    if repository.bzrdir.root_transport.listable():
275
        print
276
        print 'Revision store:'
277
        c, t = repository._revision_store.total_size(repository.get_transaction())
278
        print '  %8d revision%s' % (c, plural(c))
279
        print '  %8d KiB' % (t/1024)
280
281
282
@deprecated_function(zero_eight)
283
def show_info(b):
284
    """Please see show_bzrdir_info."""
285
    return show_bzrdir_info(b.bzrdir)
286
287
288
def show_bzrdir_info(a_bzrdir, verbose=False):
289
    """Output to stdout the 'info' for a_bzrdir."""
290
    try:
291
        working = a_bzrdir.open_workingtree()
1624.3.35 by Olaf Conradi
Implemented locking status for formats using LockDir.
292
        working.lock_read()
293
        try:
294
            show_tree_info(working, verbose)
295
        finally:
296
            working.unlock()
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
297
        return
298
    except (NoWorkingTree, NotLocalUrl):
299
        pass
300
301
    try:
302
        branch = a_bzrdir.open_branch()
1624.3.35 by Olaf Conradi
Implemented locking status for formats using LockDir.
303
        branch.lock_read()
304
        try:
305
            show_branch_info(branch, verbose)
306
        finally:
307
            branch.unlock()
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
308
        return
309
    except NotBranchError:
310
        pass
311
312
    try:
313
        repository = a_bzrdir.open_repository()
1624.3.35 by Olaf Conradi
Implemented locking status for formats using LockDir.
314
        repository.lock_read()
315
        try:
316
            show_repository_info(repository, verbose)
317
        finally:
318
            repository.unlock()
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
319
        return
320
    except NoRepositoryPresent:
321
        pass
322
1694.2.6 by Martin Pool
[merge] bzr.dev
323
    # Return silently, cmd_info already returned NotBranchError if no bzrdir
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
324
    # could be opened.
325
326
327
def show_tree_info(working, verbose):
328
    """Output to stdout the 'info' for working."""
329
    branch = working.branch
330
    repository = branch.repository
331
    control = working.bzrdir
332
333
    _show_location_info(repository, branch, working)
1694.2.6 by Martin Pool
[merge] bzr.dev
334
    _show_related_info(branch)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
335
    _show_format_info(control, repository, branch, working)
1694.2.6 by Martin Pool
[merge] bzr.dev
336
    _show_locking_info(repository, branch, working)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
337
    _show_missing_revisions_branch(branch)
338
    _show_missing_revisions_working(working)
339
    _show_working_stats(working)
340
    _show_branch_stats(branch, verbose)
341
    _show_repository_stats(repository)
342
343
344
def show_branch_info(branch, verbose):
345
    """Output to stdout the 'info' for branch."""
346
    repository = branch.repository
347
    control = branch.bzrdir
348
349
    _show_location_info(repository, branch)
1694.2.6 by Martin Pool
[merge] bzr.dev
350
    _show_related_info(branch)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
351
    _show_format_info(control, repository, branch)
1694.2.6 by Martin Pool
[merge] bzr.dev
352
    _show_locking_info(repository, branch)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
353
    _show_missing_revisions_branch(branch)
354
    _show_branch_stats(branch, verbose)
355
    _show_repository_stats(repository)
356
357
358
def show_repository_info(repository, verbose):
1694.2.6 by Martin Pool
[merge] bzr.dev
359
    """Output to stdout the 'info' for repository."""
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
360
    control = repository.bzrdir
361
362
    _show_location_info(repository)
363
    _show_format_info(control, repository)
1694.2.6 by Martin Pool
[merge] bzr.dev
364
    _show_locking_info(repository)
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
365
    _show_repository_info(repository)
366
    _show_repository_stats(repository)