← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2005-09-01 02:34:38 UTC
  • Revision ID: mbp@sourcefrog.net-20050901023437-bf791a0ef5edae8d
- old docs: clarify that this is not mainly descended from arch anymore

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
 
from bzrlib.osutils import is_inside_any
19
 
from bzrlib.delta import compare_trees
20
 
from bzrlib.log import line_log
21
 
from bzrlib.errors import NoSuchRevision
22
17
 
23
18
 
24
19
def show_status(branch, show_unchanged=False,
25
20
                specific_files=None,
26
21
                show_ids=False,
27
 
                to_file=None,
28
 
                show_pending=True,
29
 
                revision=None):
30
 
    """Display status for non-ignored working files.
 
22
                to_file=None):
 
23
    """Display single-line status for non-ignored working files.
31
24
 
32
 
    show_unchanged
33
 
        If set, includes unchanged files.
 
25
    show_all
 
26
        If true, show unmodified files too.
34
27
 
35
28
    specific_files
36
29
        If set, only show the status of files in this list.
37
30
 
38
 
    show_ids
39
 
        If set, includes each file's id.
40
 
 
41
31
    to_file
42
32
        If set, write to this file (default stdout.)
43
 
 
44
 
    show_pending
45
 
        If set, write pending merges.
46
 
 
47
 
    revision
48
 
        If None the compare latest revision with working tree
49
 
        If one revision show compared it with working tree.
50
 
        If two revisions show status between first and second.
51
33
    """
 
34
    import sys
 
35
    from bzrlib.delta import compare_trees
 
36
 
52
37
    if to_file == None:
53
38
        to_file = sys.stdout
54
39
    
55
40
    branch.lock_read()
56
41
    try:
57
 
        new_is_working_tree = True
58
 
        if revision is None:
59
 
            old = branch.basis_tree()
60
 
            new = branch.working_tree()
61
 
        elif len(revision) > 0:
62
 
            try:
63
 
                rev_id = revision[0].in_history(branch).rev_id
64
 
                old = branch.revision_tree(rev_id)
65
 
            except NoSuchRevision, e:
66
 
                raise BzrCommandError(str(e))
67
 
            if len(revision) > 1:
68
 
                try:
69
 
                    rev_id = revision[1].in_history(branch).rev_id
70
 
                    new = branch.revision_tree(rev_id)
71
 
                    new_is_working_tree = False
72
 
                except NoSuchRevision, e:
73
 
                    raise BzrCommandError(str(e))
74
 
            else:
75
 
                new = branch.working_tree()
76
 
                
 
42
 
 
43
        old = branch.basis_tree()
 
44
        new = branch.working_tree()
77
45
 
78
46
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
79
47
                              specific_files=specific_files)
82
50
                   show_ids=show_ids,
83
51
                   show_unchanged=show_unchanged)
84
52
 
85
 
        if new_is_working_tree:
86
 
            conflicts = new.iter_conflicts()
87
 
            unknowns = new.unknowns()
88
 
            list_paths('unknown', unknowns, specific_files, to_file)
89
 
            list_paths('conflicts', conflicts, specific_files, to_file)
90
 
            if show_pending and len(branch.pending_merges()) > 0:
91
 
                print >>to_file, 'pending merges:'
92
 
                last_revision = branch.last_revision()
93
 
                if last_revision is not None:
94
 
                    ignore = set(branch.get_ancestry(last_revision))
95
 
                else:
96
 
                    ignore = set()
97
 
                for merge in branch.pending_merges():
98
 
                    ignore.add(merge)
99
 
                    try:
100
 
                        m_revision = branch.get_revision(merge)
101
 
                        print >> to_file, ' ', line_log(m_revision, 77)
102
 
                        inner_merges = branch.get_ancestry(merge)
103
 
                        inner_merges.reverse()
104
 
                        for mmerge in inner_merges:
105
 
                            if mmerge in ignore:
106
 
                                continue
107
 
                            mm_revision = branch.get_revision(mmerge)
108
 
                            print >> to_file, '   ', line_log(mm_revision, 75)
109
 
                            ignore.add(mmerge)
110
 
                            
111
 
                    except NoSuchRevision:
112
 
                        print >> to_file, ' ', merge 
113
 
                        
 
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
114
65
    finally:
115
66
        branch.unlock()
116
67
        
117
 
def list_paths(header, paths, specific_files, to_file):
118
 
    done_header = False
119
 
    for path in paths:
120
 
        if specific_files and not is_inside_any(specific_files, path):
121
 
            continue
122
 
        if not done_header:
123
 
            print >>to_file, '%s:' % header
124
 
            done_header = True
125
 
        print >>to_file, ' ', path