← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 17:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160121174807-g4ybpaij9ln5wj6a
https://launchpad.net/bugs/106898
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.

There was a mix of AssertionError or UnicodeEncodeError.

Also deleted test_put_file_unicode() which was bogus, files contain bytes not unicode strings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/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
21
from cStringIO import StringIO
22
24
 
23
25
from bzrlib import (
24
26
    bzrdir,
 
27
    controldir,
25
28
    errors,
26
29
    hooks as _mod_hooks,
27
30
    osutils,
76
79
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
77
80
 
78
81
 
79
 
def gather_location_info(repository, branch=None, working=None):
 
82
def gather_location_info(repository=None, branch=None, working=None,
 
83
        control=None):
80
84
    locs = {}
81
 
    repository_path = repository.user_url
82
85
    if branch is not None:
83
86
        branch_path = branch.user_url
84
87
        master_path = branch.get_bound_location()
87
90
    else:
88
91
        branch_path = None
89
92
        master_path = None
 
93
        try:
 
94
            if control is not None and control.get_branch_reference():
 
95
                locs['checkout of branch'] = control.get_branch_reference()
 
96
        except NotBranchError:
 
97
            pass
90
98
    if working:
91
99
        working_path = working.user_url
92
100
        if working_path != branch_path:
105
113
            locs['branch root'] = branch_path
106
114
    else:
107
115
        working_path = None
108
 
        if repository.is_shared():
 
116
        if repository is not None and repository.is_shared():
109
117
            # lightweight checkout of branch in shared repository
110
118
            if branch_path is not None:
111
119
                locs['repository branch'] = branch_path
112
120
        elif branch_path is not None:
113
121
            # standalone
114
122
            locs['branch root'] = branch_path
115
 
            if master_path != branch_path:
116
 
                locs['bound to branch'] = master_path
 
123
        elif repository is not None:
 
124
            locs['repository'] = repository.user_url
 
125
        elif control is not None:
 
126
            locs['control directory'] = control.user_url
117
127
        else:
118
 
            locs['repository'] = repository_path
119
 
    if repository.is_shared():
 
128
            # Really, at least a control directory should be
 
129
            # passed in for this method to be useful.
 
130
            pass
 
131
        if master_path != branch_path:
 
132
            locs['bound to branch'] = master_path
 
133
    if repository is not None and repository.is_shared():
120
134
        # 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',
 
135
        locs['shared repository'] = repository.user_url
 
136
    order = ['control directory', 'light checkout root',
 
137
             'repository checkout root', 'checkout root',
 
138
             'checkout of branch', 'shared repository',
124
139
             'repository', 'repository branch', 'branch root',
125
140
             'bound to branch']
126
141
    return [(n, locs[n]) for n in order if n in locs]
158
173
        outfile.writelines(locs.get_lines())
159
174
 
160
175
 
 
176
def _show_control_dir_info(control, outfile):
 
177
    """Show control dir information."""
 
178
    if control._format.colocated_branches:
 
179
        outfile.write('\n')
 
180
        outfile.write('Control directory:\n')
 
181
        outfile.write('         %d branches\n' % len(control.list_branches()))
 
182
 
 
183
 
161
184
def _show_format_info(control=None, repository=None, branch=None,
162
185
                      working=None, outfile=None):
163
186
    """Show known formats for control, working, branch and repository."""
177
200
            repository._format.get_format_description())
178
201
 
179
202
 
180
 
def _show_locking_info(repository, branch=None, working=None, outfile=None):
 
203
def _show_locking_info(repository=None, branch=None, working=None,
 
204
        outfile=None):
181
205
    """Show locking status of working, branch and repository."""
182
 
    if (repository.get_physical_lock_status() or
 
206
    if (repository and repository.get_physical_lock_status() or
183
207
        (branch and branch.get_physical_lock_status()) or
184
208
        (working and working.get_physical_lock_status())):
185
209
        outfile.write('\n')
221
245
    """Show missing revisions in working tree."""
222
246
    branch = working.branch
223
247
    basis = working.basis_tree()
224
 
    branch_revno, branch_last_revision = branch.last_revision_info()
 
248
    try:
 
249
        branch_revno, branch_last_revision = branch.last_revision_info()
 
250
    except errors.UnsupportedOperation:
 
251
        return
225
252
    try:
226
253
        tree_last_id = working.get_parent_ids()[0]
227
254
    except IndexError:
268
295
 
269
296
def _show_branch_stats(branch, verbose, outfile):
270
297
    """Show statistics about a branch."""
271
 
    revno, head = branch.last_revision_info()
 
298
    try:
 
299
        revno, head = branch.last_revision_info()
 
300
    except errors.UnsupportedOperation:
 
301
        return {}
272
302
    outfile.write('\n')
273
303
    outfile.write('Branch history:\n')
274
304
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
320
350
    try:
321
351
        tree = a_bzrdir.open_workingtree(
322
352
            recommend_upgrade=False)
323
 
    except (NoWorkingTree, NotLocalUrl):
 
353
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
324
354
        tree = None
325
355
        try:
326
 
            branch = a_bzrdir.open_branch()
 
356
            branch = a_bzrdir.open_branch(name="")
327
357
        except NotBranchError:
328
358
            branch = None
329
359
            try:
330
360
                repository = a_bzrdir.open_repository()
331
361
            except NoRepositoryPresent:
332
 
                # Return silently; cmd_info already returned NotBranchError
333
 
                # if no bzrdir could be opened.
334
 
                return
 
362
                lockable = None
 
363
                repository = None
335
364
            else:
336
365
                lockable = repository
337
366
        else:
342
371
        repository = branch.repository
343
372
        lockable = tree
344
373
 
345
 
    lockable.lock_read()
 
374
    if lockable is not None:
 
375
        lockable.lock_read()
346
376
    try:
347
377
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
348
378
                            outfile)
349
379
    finally:
350
 
        lockable.unlock()
 
380
        if lockable is not None:
 
381
            lockable.unlock()
351
382
 
352
383
 
353
384
def show_component_info(control, repository, branch=None, working=None,
359
390
        verbose = 1
360
391
    if verbose is True:
361
392
        verbose = 2
362
 
    layout = describe_layout(repository, branch, working)
 
393
    layout = describe_layout(repository, branch, working, control)
363
394
    format = describe_format(control, repository, branch, working)
364
395
    outfile.write("%s (format: %s)\n" % (layout, format))
365
 
    _show_location_info(gather_location_info(repository, branch, working),
366
 
                        outfile)
 
396
    _show_location_info(
 
397
        gather_location_info(control=control, repository=repository,
 
398
            branch=branch, working=working),
 
399
        outfile)
367
400
    if branch is not None:
368
401
        _show_related_info(branch, outfile)
369
402
    if verbose == 0:
370
403
        return
371
404
    _show_format_info(control, repository, branch, working, outfile)
372
405
    _show_locking_info(repository, branch, working, outfile)
 
406
    _show_control_dir_info(control, outfile)
373
407
    if branch is not None:
374
408
        _show_missing_revisions_branch(branch, outfile)
375
409
    if working is not None:
380
414
    if branch is not None:
381
415
        show_committers = verbose >= 2
382
416
        stats = _show_branch_stats(branch, show_committers, outfile)
383
 
    else:
 
417
    elif repository is not None:
384
418
        stats = repository.gather_stats()
385
 
    if branch is None and working is None:
 
419
    if branch is None and working is None and repository is not None:
386
420
        _show_repository_info(repository, outfile)
387
 
    _show_repository_stats(repository, stats, outfile)
388
 
 
389
 
 
390
 
def describe_layout(repository=None, branch=None, tree=None):
 
421
    if repository is not None:
 
422
        _show_repository_stats(repository, stats, outfile)
 
423
 
 
424
 
 
425
def describe_layout(repository=None, branch=None, tree=None, control=None):
391
426
    """Convert a control directory layout into a user-understandable term
392
427
 
393
428
    Common outputs include "Standalone tree", "Repository branch" and
394
429
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
395
430
    and "Empty control directory"
396
431
    """
 
432
    if branch is None and control is not None:
 
433
        try:
 
434
            branch_reference = control.get_branch_reference()
 
435
        except NotBranchError:
 
436
            pass
 
437
        else:
 
438
            if branch_reference is not None:
 
439
                return "Dangling branch reference"
397
440
    if repository is None:
398
441
        return 'Empty control directory'
399
442
    if branch is None and tree is None:
401
444
            phrase = 'Shared repository'
402
445
        else:
403
446
            phrase = 'Unshared repository'
 
447
        extra = []
404
448
        if repository.make_working_trees():
405
 
            phrase += ' with trees'
 
449
            extra.append('trees')
 
450
        if len(control.get_branches()) > 0:
 
451
            extra.append('colocated branches')
 
452
        if extra:
 
453
            phrase += ' with ' + " and ".join(extra)
406
454
        return phrase
407
455
    else:
408
456
        if repository.is_shared():
445
493
        branch.user_url != tree.user_url):
446
494
        branch = None
447
495
        repository = None
448
 
    non_aliases = set(bzrdir.format_registry.keys())
449
 
    non_aliases.difference_update(bzrdir.format_registry.aliases())
 
496
    non_aliases = set(controldir.format_registry.keys())
 
497
    non_aliases.difference_update(controldir.format_registry.aliases())
450
498
    for key in non_aliases:
451
 
        format = bzrdir.format_registry.make_bzrdir(key)
 
499
        format = controldir.format_registry.make_bzrdir(key)
452
500
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
453
501
            if (tree and format.workingtree_format !=
454
502
                tree._format):
466
514
        return 'unnamed'
467
515
    candidates.sort()
468
516
    new_candidates = [c for c in candidates if not
469
 
        bzrdir.format_registry.get_info(c).hidden]
 
517
        controldir.format_registry.get_info(c).hidden]
470
518
    if len(new_candidates) > 0:
471
519
        # If there are any non-hidden formats that match, only return those to
472
520
        # avoid listing hidden formats except when only a hidden format will