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

  • Committer: Martin Pool
  • Date: 2007-09-14 06:31:28 UTC
  • mfrom: (2822 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2823.
  • Revision ID: mbp@sourcefrog.net-20070914063128-0p7mh6zfb4pzdg9p
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
25
25
from bzrlib.log import line_log
26
26
from bzrlib.osutils import is_inside_any
27
27
from bzrlib.symbol_versioning import (deprecated_function,
28
 
        zero_eight,
29
28
        )
30
29
from bzrlib.trace import warning
31
30
 
33
32
# if known, but only if really going to the terminal (not into a file)
34
33
 
35
34
 
36
 
@deprecated_function(zero_eight)
37
 
def show_status(branch, show_unchanged=None,
38
 
                specific_files=None,
39
 
                show_ids=False,
40
 
                to_file=None,
41
 
                show_pending=True,
42
 
                revision=None):
43
 
    """Display summary of changes.
44
 
 
45
 
    Please use show_tree_status instead.
46
 
 
47
 
    By default this compares the working tree to a previous revision. 
48
 
    If the revision argument is given, summarizes changes between the 
49
 
    working tree and another, or between two revisions.
50
 
 
51
 
    The result is written out as Unicode and to_file should be able 
52
 
    to encode that.
53
 
 
54
 
    show_unchanged
55
 
        If set, includes unchanged files.
56
 
 
57
 
    specific_files
58
 
        If set, only show the status of files in this list.
59
 
 
60
 
    show_ids
61
 
        If set, includes each file's id.
62
 
 
63
 
    to_file
64
 
        If set, write to this file (default stdout.)
65
 
 
66
 
    show_pending
67
 
        If set, write pending merges.
68
 
 
69
 
    revision
70
 
        If None the compare latest revision with working tree
71
 
        If one revision show compared it with working tree.
72
 
        If two revisions show status between first and second.
73
 
    """
74
 
    show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged, 
75
 
                     specific_files, show_ids, to_file, show_pending, revision)
76
 
 
77
 
 
78
35
def show_tree_status(wt, show_unchanged=None,
79
36
                     specific_files=None,
80
37
                     show_ids=False,
163
120
                           show_ids=show_ids,
164
121
                           show_unchanged=show_unchanged,
165
122
                           short_status=False)
166
 
            conflict_title = False
167
 
            # show the new conflicts only for now. XXX: get them from the delta.
168
 
            for conflict in new.conflicts():
169
 
                if not short and conflict_title is False:
170
 
                    print >> to_file, "conflicts:"
171
 
                    conflict_title = True
 
123
            # show the new conflicts only for now. XXX: get them from the
 
124
            # delta.
 
125
            conflicts = new.conflicts()
 
126
            if specific_files is not None:
 
127
                conflicts = conflicts.select_conflicts(new, specific_files,
 
128
                    ignore_misses=True, recurse=True)[1]
 
129
            if len(conflicts) > 0 and not short:
 
130
                print >> to_file, "conflicts:"
 
131
            for conflict in conflicts:
172
132
                if short:
173
133
                    prefix = 'C  '
174
134
                else: