/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/info.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:26:22 UTC
  • mfrom: (7167.1.4 run-flake8)
  • Revision ID: breezy.the.bot@gmail.com-20181116182622-qw3gan3hz78a2imw
Add a flake8 test.

Merged from https://code.launchpad.net/~jelmer/brz/run-flake8/+merge/358902

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/info.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
__all__ = ['show_bzrdir_info']
18
20
 
19
 
from cStringIO import StringIO
 
21
from io import StringIO
20
22
import time
21
23
import sys
22
24
 
23
 
from bzrlib import (
24
 
    bzrdir,
 
25
from . import (
 
26
    branch as _mod_branch,
 
27
    controldir,
25
28
    errors,
26
29
    hooks as _mod_hooks,
27
30
    osutils,
28
31
    urlutils,
29
32
    )
30
 
from bzrlib.errors import (NoWorkingTree, NotBranchError,
 
33
from .bzr import (
 
34
    bzrdir,
 
35
    )
 
36
from .errors import (NoWorkingTree, NotBranchError,
31
37
                           NoRepositoryPresent, NotLocalUrl)
32
 
from bzrlib.missing import find_unmerged
33
 
 
34
 
 
35
 
def plural(n, base='', pl=None):
 
38
from .missing import find_unmerged
 
39
 
 
40
 
 
41
def plural(n, base=u'', pl=None):
36
42
    if n == 1:
37
43
        return base
38
44
    elif pl is not None:
39
45
        return pl
40
46
    else:
41
 
        return 's'
 
47
        return u's'
42
48
 
43
49
 
44
50
class LocationList(object):
53
59
            return
54
60
        try:
55
61
            path = urlutils.local_path_from_url(url)
56
 
        except errors.InvalidURL:
 
62
        except urlutils.InvalidURL:
57
63
            self.locs.append((label, url))
58
64
        else:
59
65
            self.add_path(label, path)
76
82
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
77
83
 
78
84
 
79
 
def gather_location_info(repository, branch=None, working=None):
 
85
def gather_location_info(repository=None, branch=None, working=None,
 
86
        control=None):
80
87
    locs = {}
81
 
    repository_path = repository.user_url
82
88
    if branch is not None:
83
89
        branch_path = branch.user_url
84
90
        master_path = branch.get_bound_location()
87
93
    else:
88
94
        branch_path = None
89
95
        master_path = None
 
96
        try:
 
97
            if control is not None and control.get_branch_reference():
 
98
                locs['checkout of branch'] = control.get_branch_reference()
 
99
        except NotBranchError:
 
100
            pass
90
101
    if working:
91
102
        working_path = working.user_url
92
103
        if working_path != branch_path:
105
116
            locs['branch root'] = branch_path
106
117
    else:
107
118
        working_path = None
108
 
        if repository.is_shared():
 
119
        if repository is not None and repository.is_shared():
109
120
            # lightweight checkout of branch in shared repository
110
121
            if branch_path is not None:
111
122
                locs['repository branch'] = branch_path
112
123
        elif branch_path is not None:
113
124
            # standalone
114
125
            locs['branch root'] = branch_path
115
 
            if master_path != branch_path:
116
 
                locs['bound to branch'] = master_path
 
126
        elif repository is not None:
 
127
            locs['repository'] = repository.user_url
 
128
        elif control is not None:
 
129
            locs['control directory'] = control.user_url
117
130
        else:
118
 
            locs['repository'] = repository_path
119
 
    if repository.is_shared():
 
131
            # Really, at least a control directory should be
 
132
            # passed in for this method to be useful.
 
133
            pass
 
134
        if master_path != branch_path:
 
135
            locs['bound to branch'] = master_path
 
136
    if repository is not None and repository.is_shared():
120
137
        # lightweight checkout of branch in shared repository
121
 
        locs['shared repository'] = repository_path
122
 
    order = ['light checkout root', 'repository checkout root',
123
 
             'checkout root', 'checkout of branch', 'shared repository',
 
138
        locs['shared repository'] = repository.user_url
 
139
    order = ['control directory', 'light checkout root',
 
140
             'repository checkout root', 'checkout root',
 
141
             'checkout of branch', 'shared repository',
124
142
             'repository', 'repository branch', 'branch root',
125
143
             'bound to branch']
126
144
    return [(n, locs[n]) for n in order if n in locs]
143
161
    locs.add_url('submit branch', branch.get_submit_branch())
144
162
    try:
145
163
        locs.add_url('stacked on', branch.get_stacked_on_url())
146
 
    except (errors.UnstackableBranchFormat, errors.UnstackableRepositoryFormat,
 
164
    except (_mod_branch.UnstackableBranchFormat, errors.UnstackableRepositoryFormat,
147
165
        errors.NotStacked):
148
166
        pass
149
167
    return locs
158
176
        outfile.writelines(locs.get_lines())
159
177
 
160
178
 
 
179
def _show_control_dir_info(control, outfile):
 
180
    """Show control dir information."""
 
181
    if control._format.colocated_branches:
 
182
        outfile.write('\n')
 
183
        outfile.write('Control directory:\n')
 
184
        outfile.write('         %d branches\n' % len(control.list_branches()))
 
185
 
 
186
 
161
187
def _show_format_info(control=None, repository=None, branch=None,
162
188
                      working=None, outfile=None):
163
189
    """Show known formats for control, working, branch and repository."""
177
203
            repository._format.get_format_description())
178
204
 
179
205
 
180
 
def _show_locking_info(repository, branch=None, working=None, outfile=None):
 
206
def _show_locking_info(repository=None, branch=None, working=None,
 
207
        outfile=None):
181
208
    """Show locking status of working, branch and repository."""
182
 
    if (repository.get_physical_lock_status() or
 
209
    if (repository and repository.get_physical_lock_status() or
183
210
        (branch and branch.get_physical_lock_status()) or
184
211
        (working and working.get_physical_lock_status())):
185
212
        outfile.write('\n')
221
248
    """Show missing revisions in working tree."""
222
249
    branch = working.branch
223
250
    basis = working.basis_tree()
224
 
    work_inv = working.inventory
225
 
    branch_revno, branch_last_revision = branch.last_revision_info()
 
251
    try:
 
252
        branch_revno, branch_last_revision = branch.last_revision_info()
 
253
    except errors.UnsupportedOperation:
 
254
        return
226
255
    try:
227
256
        tree_last_id = working.get_parent_ids()[0]
228
257
    except IndexError:
239
268
def _show_working_stats(working, outfile):
240
269
    """Show statistics about a working tree."""
241
270
    basis = working.basis_tree()
242
 
    work_inv = working.inventory
243
271
    delta = working.changes_from(basis, want_unchanged=True)
244
272
 
245
273
    outfile.write('\n')
260
288
    outfile.write('  %8d ignored\n' % ignore_cnt)
261
289
 
262
290
    dir_cnt = 0
263
 
    for file_id in work_inv:
264
 
        if (work_inv.get_file_kind(file_id) == 'directory' and
265
 
            not work_inv.is_root(file_id)):
 
291
    for path, entry in working.iter_entries_by_dir():
 
292
        if entry.kind == 'directory' and path != '':
266
293
            dir_cnt += 1
267
294
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
268
295
        plural(dir_cnt, 'subdirectory', 'subdirectories')))
270
297
 
271
298
def _show_branch_stats(branch, verbose, outfile):
272
299
    """Show statistics about a branch."""
273
 
    revno, head = branch.last_revision_info()
 
300
    try:
 
301
        revno, head = branch.last_revision_info()
 
302
    except errors.UnsupportedOperation:
 
303
        return {}
274
304
    outfile.write('\n')
275
305
    outfile.write('Branch history:\n')
276
306
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
315
345
        outfile.write(f.getvalue())
316
346
 
317
347
 
318
 
def show_bzrdir_info(a_bzrdir, verbose=False, outfile=None):
319
 
    """Output to stdout the 'info' for a_bzrdir."""
 
348
def show_bzrdir_info(a_controldir, verbose=False, outfile=None):
 
349
    """Output to stdout the 'info' for a_controldir."""
320
350
    if outfile is None:
321
351
        outfile = sys.stdout
322
352
    try:
323
 
        tree = a_bzrdir.open_workingtree(
 
353
        tree = a_controldir.open_workingtree(
324
354
            recommend_upgrade=False)
325
 
    except (NoWorkingTree, NotLocalUrl):
 
355
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
326
356
        tree = None
327
357
        try:
328
 
            branch = a_bzrdir.open_branch()
 
358
            branch = a_controldir.open_branch(name="")
329
359
        except NotBranchError:
330
360
            branch = None
331
361
            try:
332
 
                repository = a_bzrdir.open_repository()
 
362
                repository = a_controldir.open_repository()
333
363
            except NoRepositoryPresent:
334
 
                # Return silently; cmd_info already returned NotBranchError
335
 
                # if no bzrdir could be opened.
336
 
                return
 
364
                lockable = None
 
365
                repository = None
337
366
            else:
338
367
                lockable = repository
339
368
        else:
344
373
        repository = branch.repository
345
374
        lockable = tree
346
375
 
347
 
    lockable.lock_read()
 
376
    if lockable is not None:
 
377
        lockable.lock_read()
348
378
    try:
349
 
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
 
379
        show_component_info(a_controldir, repository, branch, tree, verbose,
350
380
                            outfile)
351
381
    finally:
352
 
        lockable.unlock()
 
382
        if lockable is not None:
 
383
            lockable.unlock()
353
384
 
354
385
 
355
386
def show_component_info(control, repository, branch=None, working=None,
361
392
        verbose = 1
362
393
    if verbose is True:
363
394
        verbose = 2
364
 
    layout = describe_layout(repository, branch, working)
 
395
    layout = describe_layout(repository, branch, working, control)
365
396
    format = describe_format(control, repository, branch, working)
366
397
    outfile.write("%s (format: %s)\n" % (layout, format))
367
 
    _show_location_info(gather_location_info(repository, branch, working),
368
 
                        outfile)
 
398
    _show_location_info(
 
399
        gather_location_info(control=control, repository=repository,
 
400
            branch=branch, working=working),
 
401
        outfile)
369
402
    if branch is not None:
370
403
        _show_related_info(branch, outfile)
371
404
    if verbose == 0:
372
405
        return
373
406
    _show_format_info(control, repository, branch, working, outfile)
374
407
    _show_locking_info(repository, branch, working, outfile)
 
408
    _show_control_dir_info(control, outfile)
375
409
    if branch is not None:
376
410
        _show_missing_revisions_branch(branch, outfile)
377
411
    if working is not None:
382
416
    if branch is not None:
383
417
        show_committers = verbose >= 2
384
418
        stats = _show_branch_stats(branch, show_committers, outfile)
385
 
    else:
 
419
    elif repository is not None:
386
420
        stats = repository.gather_stats()
387
 
    if branch is None and working is None:
 
421
    if branch is None and working is None and repository is not None:
388
422
        _show_repository_info(repository, outfile)
389
 
    _show_repository_stats(repository, stats, outfile)
390
 
 
391
 
 
392
 
def describe_layout(repository=None, branch=None, tree=None):
 
423
    if repository is not None:
 
424
        _show_repository_stats(repository, stats, outfile)
 
425
 
 
426
 
 
427
def describe_layout(repository=None, branch=None, tree=None, control=None):
393
428
    """Convert a control directory layout into a user-understandable term
394
429
 
395
430
    Common outputs include "Standalone tree", "Repository branch" and
396
431
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
397
432
    and "Empty control directory"
398
433
    """
 
434
    if branch is None and control is not None:
 
435
        try:
 
436
            branch_reference = control.get_branch_reference()
 
437
        except NotBranchError:
 
438
            pass
 
439
        else:
 
440
            if branch_reference is not None:
 
441
                return "Dangling branch reference"
399
442
    if repository is None:
400
443
        return 'Empty control directory'
401
444
    if branch is None and tree is None:
403
446
            phrase = 'Shared repository'
404
447
        else:
405
448
            phrase = 'Unshared repository'
 
449
        extra = []
406
450
        if repository.make_working_trees():
407
 
            phrase += ' with trees'
 
451
            extra.append('trees')
 
452
        if len(control.get_branches()) > 0:
 
453
            extra.append('colocated branches')
 
454
        if extra:
 
455
            phrase += ' with ' + " and ".join(extra)
408
456
        return phrase
409
457
    else:
410
458
        if repository.is_shared():
418
466
        if branch is None and tree is not None:
419
467
            phrase = "branchless tree"
420
468
        else:
421
 
            if (tree is not None and tree.user_url !=
422
 
                branch.user_url):
 
469
            if (tree is not None and tree.controldir.control_url !=
 
470
                branch.controldir.control_url):
423
471
                independence = ''
424
472
                phrase = "Lightweight checkout"
425
473
            elif branch.get_bound_location() is not None:
447
495
        branch.user_url != tree.user_url):
448
496
        branch = None
449
497
        repository = None
450
 
    non_aliases = set(bzrdir.format_registry.keys())
451
 
    non_aliases.difference_update(bzrdir.format_registry.aliases())
 
498
    non_aliases = set(controldir.format_registry.keys())
 
499
    non_aliases.difference_update(controldir.format_registry.aliases())
452
500
    for key in non_aliases:
453
 
        format = bzrdir.format_registry.make_bzrdir(key)
 
501
        format = controldir.format_registry.make_controldir(key)
454
502
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
455
503
            if (tree and format.workingtree_format !=
456
504
                tree._format):
468
516
        return 'unnamed'
469
517
    candidates.sort()
470
518
    new_candidates = [c for c in candidates if not
471
 
        bzrdir.format_registry.get_info(c).hidden]
 
519
        controldir.format_registry.get_info(c).hidden]
472
520
    if len(new_candidates) > 0:
473
521
        # If there are any non-hidden formats that match, only return those to
474
522
        # avoid listing hidden formats except when only a hidden format will
481
529
    """Hooks for the info command."""
482
530
 
483
531
    def __init__(self):
484
 
        super(InfoHooks, self).__init__()
485
 
        self.create_hook(_mod_hooks.HookPoint('repository',
 
532
        super(InfoHooks, self).__init__("breezy.info", "hooks")
 
533
        self.add_hook('repository',
486
534
            "Invoked when displaying the statistics for a repository. "
487
535
            "repository is called with a statistics dictionary as returned "
488
 
            "by the repository and a file-like object to write to.", (1, 15), 
489
 
            None))
 
536
            "by the repository and a file-like object to write to.", (1, 15))
490
537
 
491
538
 
492
539
hooks = InfoHooks()