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

  • Committer: Aaron Bentley
  • Date: 2007-01-17 15:39:21 UTC
  • mfrom: (1551.9.35 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2239.
  • Revision ID: abentley@panoramicfeedback.com-20070117153921-6pp9ssa2r8n5izoo
Merge bzr.ab, to avoid conflicts submitting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
1
 
# Copyright (C) 2004, 2005 by Martin Pool
2
 
# Copyright (C) 2005 by Canonical Ltd
3
 
 
4
 
 
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
# 
5
3
# This program is free software; you can redistribute it and/or modify
6
4
# it under the terms of the GNU General Public License as published by
7
5
# the Free Software Foundation; either version 2 of the License, or
8
6
# (at your option) any later version.
9
 
 
 
7
#
10
8
# This program is distributed in the hope that it will be useful,
11
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
11
# GNU General Public License for more details.
14
 
 
 
12
#
15
13
# You should have received a copy of the GNU General Public License
16
14
# along with this program; if not, write to the Free Software
17
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
19
import time
22
20
 
23
21
 
24
 
import bzrlib.diff as diff
 
22
from bzrlib import (
 
23
    diff,
 
24
    osutils,
 
25
    urlutils,
 
26
    )
25
27
from bzrlib.errors import (NoWorkingTree, NotBranchError,
26
28
                           NoRepositoryPresent, NotLocalUrl)
27
29
from bzrlib.missing import find_unmerged
28
 
from bzrlib.osutils import format_date
29
 
from bzrlib.symbol_versioning import *
30
 
 
31
 
 
32
 
def _countiter(it):
33
 
    # surely there's a builtin for this?
34
 
    i = 0
35
 
    for j in it:
36
 
        i += 1
37
 
    return i        
 
30
from bzrlib.symbol_versioning import (deprecated_function, 
 
31
        zero_eight)
38
32
 
39
33
 
40
34
def plural(n, base='', pl=None):
41
35
    if n == 1:
42
36
        return base
43
 
    elif pl != None:
 
37
    elif pl is not None:
44
38
        return pl
45
39
    else:
46
40
        return 's'
47
41
 
48
42
 
49
 
def _show_location_info(repository=None, branch=None, working=None):
 
43
def _repo_rel_url(repo_url, inner_url):
 
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.
 
49
    Otherwise, a relative path is returned, with trailing '/' stripped.
 
50
    """
 
51
    inner_url = urlutils.normalize_url(inner_url)
 
52
    repo_url = urlutils.normalize_url(repo_url)
 
53
    if inner_url == repo_url:
 
54
        return '.'
 
55
    result = urlutils.relative_url(repo_url, inner_url)
 
56
    if result != inner_url:
 
57
        result = result.rstrip('/')
 
58
    return result
 
59
 
 
60
 
 
61
def _show_location_info(repository, branch=None, working=None):
50
62
    """Show known locations for working, branch and repository."""
 
63
    repository_path = repository.bzrdir.root_transport.base
51
64
    print 'Location:'
52
 
    if working and branch and working.bzrdir != branch.bzrdir:
53
 
        # Lightweight checkout
54
 
        print '       checkout root: %s' % (
55
 
            working.bzrdir.root_transport.base)
56
 
        print '  checkout of branch: %s' % (
57
 
            branch.bzrdir.root_transport.base)
 
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
 
70
            print ' light checkout root: %s' % working_path
 
71
            if repository.is_shared():
 
72
                # lightweight checkout of branch in shared repository
 
73
                print '   shared repository: %s' % repository_path
 
74
                print '   repository branch: %s' % (
 
75
                    _repo_rel_url(repository_path, branch_path))
 
76
            else:
 
77
                # lightweight checkout of standalone branch
 
78
                print '  checkout of branch: %s' % branch_path
 
79
        elif repository.is_shared():
 
80
            # branch with tree inside shared repository
 
81
            print '    shared repository: %s' % repository_path
 
82
            print '  repository checkout: %s' % (
 
83
                _repo_rel_url(repository_path, branch_path))
 
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
58
91
    elif branch:
59
 
        # Standalone or bound branch (normal checkout)
60
 
        print '         branch root: %s' % (
61
 
            branch.bzrdir.root_transport.base)
62
 
        if branch.get_bound_location():
63
 
            print '     bound to branch: %s' % branch.get_bound_location()
64
 
 
65
 
    if repository and (not branch or repository.bzrdir != branch.bzrdir):
 
92
        branch_path = branch.bzrdir.root_transport.base
66
93
        if repository.is_shared():
67
 
            print '   shared repository: %s' % (
68
 
                repository.bzrdir.root_transport.base)
 
94
            # branch is part of shared repository
 
95
            print '  shared repository: %s' % repository_path
 
96
            print '  repository branch: %s' % (
 
97
                _repo_rel_url(repository_path, branch_path))
69
98
        else:
70
 
            print '          repository: %s' % (
71
 
                repository.bzrdir.root_transport.base)
72
 
 
73
 
    if branch:
 
99
            # standalone branch
 
100
            print '  branch root: %s' % branch_path
 
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:'
74
112
        if branch.get_parent():
75
 
            print '       parent branch: %s' % branch.get_parent()
 
113
            if branch.get_push_location():
 
114
                print '      parent branch: %s' % branch.get_parent()
 
115
            else:
 
116
                print '  parent branch: %s' % branch.get_parent()
76
117
        if branch.get_push_location():
77
 
            print '      push to branch: %s' % branch.get_push_location()
 
118
            print '  publish to branch: %s' % branch.get_push_location()
78
119
 
79
120
 
80
121
def _show_format_info(control=None, repository=None, branch=None, working=None):
91
132
        print '    repository: %s' % repository._format.get_format_description()
92
133
 
93
134
 
 
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
 
94
162
def _show_missing_revisions_branch(branch):
95
163
    """Show missing master revisions in branch."""
96
164
    # Try with inaccessible branch ?
108
176
    branch = working.branch
109
177
    basis = working.basis_tree()
110
178
    work_inv = working.inventory
111
 
    delta = diff.compare_trees(basis, working, want_unchanged=True)
112
179
    history = branch.revision_history()
113
 
    tree_last_id = working.last_revision()
 
180
    try:
 
181
        tree_last_id = working.get_parent_ids()[0]
 
182
    except IndexError:
 
183
        tree_last_id = None
114
184
 
115
185
    if len(history) and tree_last_id != history[-1]:
116
186
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)
124
194
    """Show statistics about a working tree."""
125
195
    basis = working.basis_tree()
126
196
    work_inv = working.inventory
127
 
    delta = diff.compare_trees(basis, working, want_unchanged=True)
 
197
    delta = working.changes_from(basis, want_unchanged=True)
128
198
 
129
199
    print
130
200
    print 'In the working tree:'
145
215
 
146
216
    dir_cnt = 0
147
217
    for file_id in work_inv:
148
 
        if work_inv.get_file_kind(file_id) == 'directory':
 
218
        if (work_inv.get_file_kind(file_id) == 'directory' and 
 
219
            not work_inv.is_root(file_id)):
149
220
            dir_cnt += 1
150
221
    print '  %8d versioned %s' \
151
222
          % (dir_cnt,
170
241
        firstrev = repository.get_revision(history[0])
171
242
        age = int((time.time() - firstrev.timestamp) / 3600 / 24)
172
243
        print '  %8d day%s old' % (age, plural(age))
173
 
        print '   first revision: %s' % format_date(firstrev.timestamp,
174
 
                                                    firstrev.timezone)
 
244
        print '   first revision: %s' % osutils.format_date(firstrev.timestamp,
 
245
                                                            firstrev.timezone)
175
246
 
176
247
        lastrev = repository.get_revision(history[-1])
177
 
        print '  latest revision: %s' % format_date(lastrev.timestamp,
178
 
                                                    lastrev.timezone)
 
248
        print '  latest revision: %s' % osutils.format_date(lastrev.timestamp,
 
249
                                                            lastrev.timezone)
179
250
 
180
251
#     print
181
252
#     print 'Text store:'
248
319
    except NoRepositoryPresent:
249
320
        pass
250
321
 
251
 
    # Return silently, cmd_info returns NotBranchError if no bzrdir
 
322
    # Return silently, cmd_info already returned NotBranchError if no bzrdir
252
323
    # could be opened.
253
324
 
254
325
 
259
330
    control = working.bzrdir
260
331
 
261
332
    _show_location_info(repository, branch, working)
 
333
    _show_related_info(branch)
262
334
    _show_format_info(control, repository, branch, working)
 
335
    _show_locking_info(repository, branch, working)
263
336
    _show_missing_revisions_branch(branch)
264
337
    _show_missing_revisions_working(working)
265
338
    _show_working_stats(working)
273
346
    control = branch.bzrdir
274
347
 
275
348
    _show_location_info(repository, branch)
 
349
    _show_related_info(branch)
276
350
    _show_format_info(control, repository, branch)
 
351
    _show_locking_info(repository, branch)
277
352
    _show_missing_revisions_branch(branch)
278
353
    _show_branch_stats(branch, verbose)
279
354
    _show_repository_stats(repository)
280
355
 
281
356
 
282
357
def show_repository_info(repository, verbose):
283
 
    """Output to stdout the 'info' for branch."""
 
358
    """Output to stdout the 'info' for repository."""
284
359
    control = repository.bzrdir
285
360
 
286
361
    _show_location_info(repository)
287
362
    _show_format_info(control, repository)
 
363
    _show_locking_info(repository)
288
364
    _show_repository_info(repository)
289
365
    _show_repository_stats(repository)