← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Robert Collins
  • Date: 2006-02-13 21:52:05 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060213215205-cb3bacc87092a639
Update per review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
1
1
# (C) 2005 Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
import sys
 
18
 
 
19
from bzrlib.delta import compare_trees
 
20
from bzrlib.errors import NoSuchRevision
 
21
from bzrlib.log import line_log
 
22
from bzrlib.osutils import is_inside_any
 
23
 
 
24
# TODO: when showing single-line logs, truncate to the width of the terminal
 
25
# if known, but only if really going to the terminal (not into a file)
17
26
 
18
27
 
19
28
def show_status(branch, show_unchanged=False,
20
29
                specific_files=None,
21
30
                show_ids=False,
22
 
                to_file=None):
23
 
    """Display single-line status for non-ignored working files.
24
 
 
25
 
    show_all
26
 
        If true, show unmodified files too.
 
31
                to_file=None,
 
32
                show_pending=True,
 
33
                revision=None):
 
34
    """Display summary of changes.
 
35
 
 
36
    By default this compares the working tree to a previous revision. 
 
37
    If the revision argument is given, summarizes changes between the 
 
38
    working tree and another, or between two revisions.
 
39
 
 
40
    The result is written out as Unicode and to_file should be able 
 
41
    to encode that.
 
42
 
 
43
    show_unchanged
 
44
        If set, includes unchanged files.
27
45
 
28
46
    specific_files
29
47
        If set, only show the status of files in this list.
30
48
 
 
49
    show_ids
 
50
        If set, includes each file's id.
 
51
 
31
52
    to_file
32
53
        If set, write to this file (default stdout.)
 
54
 
 
55
    show_pending
 
56
        If set, write pending merges.
 
57
 
 
58
    revision
 
59
        If None the compare latest revision with working tree
 
60
        If one revision show compared it with working tree.
 
61
        If two revisions show status between first and second.
33
62
    """
34
 
    import sys
35
 
    from bzrlib.delta import compare_trees
36
 
 
37
63
    if to_file == None:
38
64
        to_file = sys.stdout
39
65
    
40
66
    branch.lock_read()
41
67
    try:
42
 
 
43
 
        old = branch.basis_tree()
44
 
        new = branch.working_tree()
45
 
 
 
68
        new_is_working_tree = True
 
69
        if revision is None:
 
70
            new = branch.bzrdir.open_workingtree()
 
71
            old = new.basis_tree()
 
72
        elif len(revision) > 0:
 
73
            try:
 
74
                rev_id = revision[0].in_history(branch).rev_id
 
75
                old = branch.repository.revision_tree(rev_id)
 
76
            except NoSuchRevision, e:
 
77
                raise BzrCommandError(str(e))
 
78
            if len(revision) > 1:
 
79
                try:
 
80
                    rev_id = revision[1].in_history(branch).rev_id
 
81
                    new = branch.repository.revision_tree(rev_id)
 
82
                    new_is_working_tree = False
 
83
                except NoSuchRevision, e:
 
84
                    raise BzrCommandError(str(e))
 
85
            else:
 
86
                new = branch.bzrdir.open_workingtree()
 
87
                
46
88
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
47
89
                              specific_files=specific_files)
48
 
 
49
90
        delta.show(to_file,
50
91
                   show_ids=show_ids,
51
92
                   show_unchanged=show_unchanged)
52
93
 
53
 
        unknowns = new.unknowns()
54
 
        done_header = False
55
 
        for path in unknowns:
56
 
            # FIXME: Should also match if the unknown file is within a
57
 
            # specified directory.
58
 
            if specific_files:
59
 
                if path not in specific_files:
60
 
                    continue
61
 
            if not done_header:
62
 
                print >>to_file, 'unknown:'
63
 
                done_header = True
64
 
            print >>to_file, ' ', path
 
94
        if new_is_working_tree:
 
95
            list_paths('unknown', new.unknowns(), specific_files, to_file)
 
96
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
 
97
        if new_is_working_tree and show_pending:
 
98
            show_pending_merges(new, to_file)
65
99
    finally:
66
100
        branch.unlock()
 
101
 
 
102
def show_pending_merges(new, to_file):
 
103
    """Write out a display of pending merges in a working tree."""
 
104
    pending = new.pending_merges()
 
105
    branch = new.branch
 
106
    if len(pending) == 0:
 
107
        return
 
108
    print >>to_file, 'pending merges:'
 
109
    last_revision = branch.last_revision()
 
110
    if last_revision is not None:
 
111
        ignore = set(branch.repository.get_ancestry(last_revision))
 
112
    else:
 
113
        ignore = set()
 
114
    for merge in new.pending_merges():
 
115
        ignore.add(merge)
 
116
        try:
 
117
            m_revision = branch.repository.get_revision(merge)
 
118
            print >> to_file, ' ', line_log(m_revision, 77)
 
119
            inner_merges = branch.repository.get_ancestry(merge)
 
120
            inner_merges.reverse()
 
121
            for mmerge in inner_merges:
 
122
                if mmerge in ignore:
 
123
                    continue
 
124
                mm_revision = branch.repository.get_revision(mmerge)
 
125
                print >> to_file, '   ', line_log(mm_revision, 75)
 
126
                ignore.add(mmerge)
 
127
        except NoSuchRevision:
 
128
            print >> to_file, ' ', merge 
67
129
        
 
130
def list_paths(header, paths, specific_files, to_file):
 
131
    done_header = False
 
132
    for path in paths:
 
133
        if specific_files and not is_inside_any(specific_files, path):
 
134
            continue
 
135
        if not done_header:
 
136
            print >>to_file, '%s:' % header
 
137
            done_header = True
 
138
        print >>to_file, ' ', path