← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-05 19:39:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2614.
  • Revision ID: john@arbash-meinel.com-20070705193928-xtm8nh4ucc8qosdn
Add direct tests of how we handle incomplete/'broken' lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
16
16
 
17
17
__all__ = ['show_bzrdir_info']
18
18
 
19
 
import os
20
19
import time
21
 
import sys
 
20
 
22
21
 
23
22
from bzrlib import (
24
23
    bzrdir,
25
24
    diff,
26
 
    errors,
27
25
    osutils,
28
26
    urlutils,
29
27
    )
31
29
                           NoRepositoryPresent, NotLocalUrl)
32
30
from bzrlib.missing import find_unmerged
33
31
from bzrlib.symbol_versioning import (deprecated_function,
34
 
        zero_eighteen)
 
32
        zero_eight, zero_eighteen)
35
33
 
36
34
 
37
35
def plural(n, base='', pl=None):
43
41
        return 's'
44
42
 
45
43
 
46
 
class LocationList(object):
47
 
 
48
 
    def __init__(self, base_path):
49
 
        self.locs = []
50
 
        self.base_path = base_path
51
 
 
52
 
    def add_url(self, label, url):
53
 
        """Add a URL to the list, converting it to a path if possible"""
54
 
        if url is None:
55
 
            return
56
 
        try:
57
 
            path = urlutils.local_path_from_url(url)
58
 
        except errors.InvalidURL:
59
 
            self.locs.append((label, url))
60
 
        else:
61
 
            self.add_path(label, path)
 
44
def _repo_rel_url(repo_url, inner_url):
 
45
    """Return path with common prefix of repository path removed.
 
46
 
 
47
    If path is not part of the repository, the original path is returned.
 
48
    If path is equal to the repository, the current directory marker '.' is
 
49
    returned.
 
50
    Otherwise, a relative path is returned, with trailing '/' stripped.
 
51
    """
 
52
    inner_url = urlutils.normalize_url(inner_url)
 
53
    repo_url = urlutils.normalize_url(repo_url)
 
54
    if inner_url == repo_url:
 
55
        return '.'
 
56
    result = urlutils.relative_url(repo_url, inner_url)
 
57
    if result != inner_url:
 
58
        result = result.rstrip('/')
 
59
    return result
 
60
 
 
61
class _UrlList(object):
 
62
 
 
63
    def __init__(self):
 
64
        self.urls = []
 
65
 
 
66
    def add_url(self, label, url):
 
67
        self.add_path(label, urlutils.unescape_for_display(url, 'ascii'))
 
68
 
 
69
    def add_url(self, label, url):
 
70
        self.add_path(label, url)
62
71
 
63
72
    def add_path(self, label, path):
64
 
        """Add a path, converting it to a relative path if possible"""
65
 
        try:
66
 
            path = osutils.relpath(self.base_path, path)
67
 
        except errors.PathNotChild:
68
 
            pass
69
 
        else:
70
 
            if path == '':
71
 
                path = '.'
72
 
        if path != '/':
73
 
            path = path.rstrip('/')
74
 
        self.locs.append((label, path))
 
73
        self.urls.append((label, path))
75
74
 
76
 
    def get_lines(self):
77
 
        max_len = max(len(l) for l, u in self.locs)
78
 
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
 
75
    def print_lines(self):
 
76
        max_len = max(len(l) for l, u in self.urls)
 
77
        for label, url in self.urls:
 
78
            print "  %*s: %s" % (max_len, label, url)
79
79
 
80
80
 
81
81
def gather_location_info(repository, branch=None, working=None):
101
101
        if working_path != master_path:
102
102
            locs['checkout of branch'] = master_path
103
103
        elif repository.is_shared():
104
 
            locs['repository branch'] = branch_path
 
104
            locs['repository branch'] = _repo_rel_url(repository_path,
 
105
                branch_path)
105
106
        elif branch_path is not None:
106
107
            # standalone
107
108
            locs['branch root'] = branch_path
110
111
        if repository.is_shared():
111
112
            # lightweight checkout of branch in shared repository
112
113
            if branch_path is not None:
113
 
                locs['repository branch'] = branch_path
 
114
                locs['repository branch'] = _repo_rel_url(repository_path,
 
115
                                                          branch_path)
114
116
        elif branch_path is not None:
115
117
            # standalone
116
118
            locs['branch root'] = branch_path
128
130
    return [(n, locs[n]) for n in order if n in locs]
129
131
 
130
132
 
131
 
def _show_location_info(locs, outfile):
 
133
def _show_location_info(locs):
132
134
    """Show known locations for working, branch and repository."""
133
 
    outfile.write('Location:\n')
134
 
    path_list = LocationList(osutils.getcwd())
 
135
    print 'Location:'
 
136
    path_list = _UrlList()
135
137
    for name, loc in locs:
136
138
        path_list.add_url(name, loc)
137
 
    outfile.writelines(path_list.get_lines())
138
 
 
139
 
 
140
 
def _gather_related_branches(branch):
141
 
    locs = LocationList(osutils.getcwd())
142
 
    locs.add_url('public branch', branch.get_public_branch())
143
 
    locs.add_url('push branch', branch.get_push_location())
144
 
    locs.add_url('parent branch', branch.get_parent())
145
 
    locs.add_url('submit branch', branch.get_submit_branch())
146
 
    return locs
147
 
 
148
 
 
149
 
def _show_related_info(branch, outfile):
 
139
    path_list.print_lines()
 
140
 
 
141
 
 
142
def _show_related_info(branch):
150
143
    """Show parent and push location of branch."""
151
 
    locs = _gather_related_branches(branch)
152
 
    if len(locs.locs) > 0:
153
 
        outfile.write('\n')
154
 
        outfile.write('Related branches:\n')
155
 
        outfile.writelines(locs.get_lines())
156
 
 
157
 
 
158
 
def _show_format_info(control=None, repository=None, branch=None,
159
 
                      working=None, outfile=None):
 
144
    if branch.get_parent() or branch.get_push_location():
 
145
        print
 
146
        print 'Related branches:'
 
147
        if branch.get_parent():
 
148
            if branch.get_push_location():
 
149
                print '      parent branch: %s' % branch.get_parent()
 
150
            else:
 
151
                print '  parent branch: %s' % branch.get_parent()
 
152
        if branch.get_push_location():
 
153
            print '  publish to branch: %s' % branch.get_push_location()
 
154
 
 
155
 
 
156
def _show_format_info(control=None, repository=None, branch=None, working=None):
160
157
    """Show known formats for control, working, branch and repository."""
161
 
    outfile.write('\n')
162
 
    outfile.write('Format:\n')
 
158
    print
 
159
    print 'Format:'
163
160
    if control:
164
 
        outfile.write('       control: %s\n' %
165
 
            control._format.get_format_description())
 
161
        print '       control: %s' % control._format.get_format_description()
166
162
    if working:
167
 
        outfile.write('  working tree: %s\n' %
168
 
            working._format.get_format_description())
 
163
        print '  working tree: %s' % working._format.get_format_description()
169
164
    if branch:
170
 
        outfile.write('        branch: %s\n' %
171
 
            branch._format.get_format_description())
 
165
        print '        branch: %s' % branch._format.get_format_description()
172
166
    if repository:
173
 
        outfile.write('    repository: %s\n' %
174
 
            repository._format.get_format_description())
175
 
 
176
 
 
177
 
def _show_locking_info(repository, branch=None, working=None, outfile=None):
 
167
        print '    repository: %s' % repository._format.get_format_description()
 
168
 
 
169
 
 
170
def _show_locking_info(repository, branch=None, working=None):
178
171
    """Show locking status of working, branch and repository."""
179
172
    if (repository.get_physical_lock_status() or
180
173
        (branch and branch.get_physical_lock_status()) or
181
174
        (working and working.get_physical_lock_status())):
182
 
        outfile.write('\n')
183
 
        outfile.write('Lock status:\n')
 
175
        print
 
176
        print 'Lock status:'
184
177
        if working:
185
178
            if working.get_physical_lock_status():
186
179
                status = 'locked'
187
180
            else:
188
181
                status = 'unlocked'
189
 
            outfile.write('  working tree: %s\n' % status)
 
182
            print '  working tree: %s' % status
190
183
        if branch:
191
184
            if branch.get_physical_lock_status():
192
185
                status = 'locked'
193
186
            else:
194
187
                status = 'unlocked'
195
 
            outfile.write('        branch: %s\n' % status)
 
188
            print '        branch: %s' % status
196
189
        if repository:
197
190
            if repository.get_physical_lock_status():
198
191
                status = 'locked'
199
192
            else:
200
193
                status = 'unlocked'
201
 
            outfile.write('    repository: %s\n' % status)
202
 
 
203
 
 
204
 
def _show_missing_revisions_branch(branch, outfile):
 
194
            print '    repository: %s' % status
 
195
 
 
196
 
 
197
def _show_missing_revisions_branch(branch):
205
198
    """Show missing master revisions in branch."""
206
199
    # Try with inaccessible branch ?
207
200
    master = branch.get_master_branch()
208
201
    if master:
209
202
        local_extra, remote_extra = find_unmerged(branch, master)
210
203
        if remote_extra:
211
 
            outfile.write('\n')
212
 
            outfile.write(('Branch is out of date: missing %d '
213
 
                'revision%s.\n') % (len(remote_extra),
214
 
                plural(len(remote_extra))))
215
 
 
216
 
 
217
 
def _show_missing_revisions_working(working, outfile):
 
204
            print
 
205
            print 'Branch is out of date: missing %d revision%s.' % (
 
206
                len(remote_extra), plural(len(remote_extra)))
 
207
 
 
208
 
 
209
def _show_missing_revisions_working(working):
218
210
    """Show missing revisions in working tree."""
219
211
    branch = working.branch
220
212
    basis = working.basis_tree()
228
220
    if branch_revno and tree_last_id != branch_last_revision:
229
221
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)
230
222
        missing_count = branch_revno - tree_last_revno
231
 
        outfile.write('\n')
232
 
        outfile.write(('Working tree is out of date: missing %d '
233
 
            'revision%s.\n') % (missing_count, plural(missing_count)))
234
 
 
235
 
 
236
 
def _show_working_stats(working, outfile):
 
223
        print
 
224
        print 'Working tree is out of date: missing %d revision%s.' % (
 
225
            missing_count, plural(missing_count))
 
226
 
 
227
 
 
228
def _show_working_stats(working):
237
229
    """Show statistics about a working tree."""
238
230
    basis = working.basis_tree()
239
231
    work_inv = working.inventory
240
232
    delta = working.changes_from(basis, want_unchanged=True)
241
233
 
242
 
    outfile.write('\n')
243
 
    outfile.write('In the working tree:\n')
244
 
    outfile.write('  %8s unchanged\n' % len(delta.unchanged))
245
 
    outfile.write('  %8d modified\n' % len(delta.modified))
246
 
    outfile.write('  %8d added\n' % len(delta.added))
247
 
    outfile.write('  %8d removed\n' % len(delta.removed))
248
 
    outfile.write('  %8d renamed\n' % len(delta.renamed))
 
234
    print
 
235
    print 'In the working tree:'
 
236
    print '  %8s unchanged' % len(delta.unchanged)
 
237
    print '  %8d modified' % len(delta.modified)
 
238
    print '  %8d added' % len(delta.added)
 
239
    print '  %8d removed' % len(delta.removed)
 
240
    print '  %8d renamed' % len(delta.renamed)
249
241
 
250
242
    ignore_cnt = unknown_cnt = 0
251
243
    for path in working.extras():
253
245
            ignore_cnt += 1
254
246
        else:
255
247
            unknown_cnt += 1
256
 
    outfile.write('  %8d unknown\n' % unknown_cnt)
257
 
    outfile.write('  %8d ignored\n' % ignore_cnt)
 
248
    print '  %8d unknown' % unknown_cnt
 
249
    print '  %8d ignored' % ignore_cnt
258
250
 
259
251
    dir_cnt = 0
260
252
    for file_id in work_inv:
261
253
        if (work_inv.get_file_kind(file_id) == 'directory' and 
262
254
            not work_inv.is_root(file_id)):
263
255
            dir_cnt += 1
264
 
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
265
 
        plural(dir_cnt, 'subdirectory', 'subdirectories')))
266
 
 
267
 
 
268
 
def _show_branch_stats(branch, verbose, outfile):
 
256
    print '  %8d versioned %s' \
 
257
          % (dir_cnt,
 
258
             plural(dir_cnt, 'subdirectory', 'subdirectories'))
 
259
 
 
260
 
 
261
def _show_branch_stats(branch, verbose):
269
262
    """Show statistics about a branch."""
270
263
    revno, head = branch.last_revision_info()
271
 
    outfile.write('\n')
272
 
    outfile.write('Branch history:\n')
273
 
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
 
264
    print
 
265
    print 'Branch history:'
 
266
    print '  %8d revision%s' % (revno, plural(revno))
274
267
    stats = branch.repository.gather_stats(head, committers=verbose)
275
268
    if verbose:
276
269
        committers = stats['committers']
277
 
        outfile.write('  %8d committer%s\n' % (committers,
278
 
            plural(committers)))
 
270
        print '  %8d committer%s' % (committers, plural(committers))
279
271
    if revno:
280
272
        timestamp, timezone = stats['firstrev']
281
273
        age = int((time.time() - timestamp) / 3600 / 24)
282
 
        outfile.write('  %8d day%s old\n' % (age, plural(age)))
283
 
        outfile.write('   first revision: %s\n' %
284
 
            osutils.format_date(timestamp, timezone))
 
274
        print '  %8d day%s old' % (age, plural(age))
 
275
        print '   first revision: %s' % osutils.format_date(timestamp,
 
276
            timezone)
285
277
        timestamp, timezone = stats['latestrev']
286
 
        outfile.write('  latest revision: %s\n' %
287
 
            osutils.format_date(timestamp, timezone))
 
278
        print '  latest revision: %s' % osutils.format_date(timestamp,
 
279
            timezone)
288
280
    return stats
289
281
 
290
282
 
291
 
def _show_repository_info(repository, outfile):
 
283
def _show_repository_info(repository):
292
284
    """Show settings of a repository."""
293
285
    if repository.make_working_trees():
294
 
        outfile.write('\n')
295
 
        outfile.write('Create working tree for new branches inside '
296
 
            'the repository.\n')
297
 
 
298
 
 
299
 
def _show_repository_stats(stats, outfile):
 
286
        print
 
287
        print 'Create working tree for new branches inside the repository.'
 
288
 
 
289
 
 
290
def _show_repository_stats(stats):
300
291
    """Show statistics about a repository."""
301
292
    if 'revisions' in stats or 'size' in stats:
302
 
        outfile.write('\n')
303
 
        outfile.write('Repository:\n')
 
293
        print
 
294
        print 'Repository:'
304
295
    if 'revisions' in stats:
305
296
        revisions = stats['revisions']
306
 
        outfile.write('  %8d revision%s\n' % (revisions, plural(revisions)))
 
297
        print '  %8d revision%s' % (revisions, plural(revisions))
307
298
    if 'size' in stats:
308
 
        outfile.write('  %8d KiB\n' % (stats['size']/1024))
309
 
 
310
 
 
311
 
def show_bzrdir_info(a_bzrdir, verbose=False, outfile=None):
 
299
        print '  %8d KiB' % (stats['size']/1024)
 
300
 
 
301
def show_bzrdir_info(a_bzrdir, verbose=False):
312
302
    """Output to stdout the 'info' for a_bzrdir."""
313
 
    if outfile is None:
314
 
        outfile = sys.stdout
315
303
    try:
316
304
        tree = a_bzrdir.open_workingtree(
317
305
            recommend_upgrade=False)
339
327
 
340
328
    lockable.lock_read()
341
329
    try:
342
 
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
343
 
                            outfile)
 
330
        show_component_info(a_bzrdir, repository, branch, tree, verbose)
344
331
    finally:
345
332
        lockable.unlock()
346
333
 
347
334
 
348
335
def show_component_info(control, repository, branch=None, working=None,
349
 
    verbose=1, outfile=None):
 
336
    verbose=1):
350
337
    """Write info about all bzrdir components to stdout"""
351
 
    if outfile is None:
352
 
        outfile = sys.stdout
353
338
    if verbose is False:
354
339
        verbose = 1
355
340
    if verbose is True:
356
341
        verbose = 2
357
342
    layout = describe_layout(repository, branch, working)
358
343
    format = describe_format(control, repository, branch, working)
359
 
    outfile.write("%s (format: %s)\n" % (layout, format))
360
 
    _show_location_info(gather_location_info(repository, branch, working),
361
 
                        outfile)
362
 
    if branch is not None:
363
 
        _show_related_info(branch, outfile)
 
344
    print "%s (format: %s)" % (layout, format)
 
345
    _show_location_info(gather_location_info(repository, branch, working))
364
346
    if verbose == 0:
365
347
        return
366
 
    _show_format_info(control, repository, branch, working, outfile)
367
 
    _show_locking_info(repository, branch, working, outfile)
368
 
    if branch is not None:
369
 
        _show_missing_revisions_branch(branch, outfile)
 
348
    if branch is not None:
 
349
        _show_related_info(branch)
 
350
    _show_format_info(control, repository, branch, working)
 
351
    _show_locking_info(repository, branch, working)
 
352
    if branch is not None:
 
353
        _show_missing_revisions_branch(branch)
370
354
    if working is not None:
371
 
        _show_missing_revisions_working(working, outfile)
372
 
        _show_working_stats(working, outfile)
 
355
        _show_missing_revisions_working(working)
 
356
        _show_working_stats(working)
373
357
    elif branch is not None:
374
 
        _show_missing_revisions_branch(branch, outfile)
 
358
        _show_missing_revisions_branch(branch)
375
359
    if branch is not None:
376
 
        stats = _show_branch_stats(branch, verbose==2, outfile)
 
360
        stats = _show_branch_stats(branch, verbose==2)
377
361
    else:
378
362
        stats = repository.gather_stats()
379
363
    if branch is None and working is None:
380
 
        _show_repository_info(repository, outfile)
381
 
    _show_repository_stats(stats, outfile)
 
364
        _show_repository_info(repository)
 
365
    _show_repository_stats(stats)
382
366
 
383
367
 
384
368
def describe_layout(repository=None, branch=None, tree=None):
465
449
    if len(new_candidates) > 0:
466
450
        candidates = new_candidates
467
451
    return ' or '.join(candidates)
 
452
 
 
453
@deprecated_function(zero_eight)
 
454
def show_info(b):
 
455
    """Please see show_bzrdir_info."""
 
456
    return show_bzrdir_info(b.bzrdir)
 
457
 
 
458
 
 
459
@deprecated_function(zero_eighteen)
 
460
def show_tree_info(working, verbose):
 
461
    """Output to stdout the 'info' for working."""
 
462
    branch = working.branch
 
463
    repository = branch.repository
 
464
    control = working.bzrdir
 
465
    show_component_info(control, repository, branch, working, verbose)
 
466
 
 
467
 
 
468
@deprecated_function(zero_eighteen)
 
469
def show_branch_info(branch, verbose):
 
470
    """Output to stdout the 'info' for branch."""
 
471
    repository = branch.repository
 
472
    control = branch.bzrdir
 
473
    show_component_info(control, repository, branch, verbose=verbose)
 
474
 
 
475
 
 
476
@deprecated_function(zero_eighteen)
 
477
def show_repository_info(repository, verbose):
 
478
    """Output to stdout the 'info' for repository."""
 
479
    control = repository.bzrdir
 
480
    show_component_info(control, repository, verbose=verbose)