← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Olaf Conradi
  • Date: 2006-03-28 23:30:02 UTC
  • mto: (1661.1.1 bzr.mbp.remember)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: olaf@conradi.org-20060328233002-f6262df0e19c1963
Added testcases for using pull with --remember. Moved remember code to
beginning of cmd_pull. This remembers the location in case of a failure
during pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import sys
18
 
from bzrlib.osutils import is_inside_any
 
18
 
19
19
from bzrlib.delta import compare_trees
 
20
from bzrlib.errors import NoSuchRevision
20
21
from bzrlib.log import line_log
21
 
from bzrlib.errors import NoSuchRevision
22
 
 
23
 
 
 
22
from bzrlib.osutils import is_inside_any
 
23
from bzrlib.symbol_versioning import *
 
24
 
 
25
# TODO: when showing single-line logs, truncate to the width of the terminal
 
26
# if known, but only if really going to the terminal (not into a file)
 
27
 
 
28
 
 
29
@deprecated_function(zero_eight)
24
30
def show_status(branch, show_unchanged=False,
25
31
                specific_files=None,
26
32
                show_ids=False,
27
33
                to_file=None,
28
34
                show_pending=True,
29
35
                revision=None):
30
 
    """Display status for non-ignored working files.
 
36
    """Display summary of changes.
 
37
 
 
38
    Please use show_tree_status instead.
 
39
 
 
40
    By default this compares the working tree to a previous revision. 
 
41
    If the revision argument is given, summarizes changes between the 
 
42
    working tree and another, or between two revisions.
 
43
 
 
44
    The result is written out as Unicode and to_file should be able 
 
45
    to encode that.
 
46
 
 
47
    show_unchanged
 
48
        If set, includes unchanged files.
 
49
 
 
50
    specific_files
 
51
        If set, only show the status of files in this list.
 
52
 
 
53
    show_ids
 
54
        If set, includes each file's id.
 
55
 
 
56
    to_file
 
57
        If set, write to this file (default stdout.)
 
58
 
 
59
    show_pending
 
60
        If set, write pending merges.
 
61
 
 
62
    revision
 
63
        If None the compare latest revision with working tree
 
64
        If one revision show compared it with working tree.
 
65
        If two revisions show status between first and second.
 
66
    """
 
67
    show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged, 
 
68
                     specific_files, show_ids, to_file, show_pending, revision)
 
69
 
 
70
 
 
71
def show_tree_status(wt, show_unchanged=False,
 
72
                     specific_files=None,
 
73
                     show_ids=False,
 
74
                     to_file=None,
 
75
                     show_pending=True,
 
76
                     revision=None):
 
77
    """Display summary of changes.
 
78
 
 
79
    By default this compares the working tree to a previous revision. 
 
80
    If the revision argument is given, summarizes changes between the 
 
81
    working tree and another, or between two revisions.
 
82
 
 
83
    The result is written out as Unicode and to_file should be able 
 
84
    to encode that.
31
85
 
32
86
    show_unchanged
33
87
        If set, includes unchanged files.
52
106
    if to_file == None:
53
107
        to_file = sys.stdout
54
108
    
55
 
    branch.lock_read()
 
109
    wt.lock_read()
56
110
    try:
57
111
        new_is_working_tree = True
58
112
        if revision is None:
59
 
            old = branch.basis_tree()
60
 
            new = branch.working_tree()
 
113
            new = wt
 
114
            old = new.basis_tree()
61
115
        elif len(revision) > 0:
62
116
            try:
63
 
                rev_id = revision[0].in_history(branch).rev_id
64
 
                old = branch.revision_tree(rev_id)
 
117
                rev_id = revision[0].in_history(wt.branch).rev_id
 
118
                old = wt.branch.repository.revision_tree(rev_id)
65
119
            except NoSuchRevision, e:
66
120
                raise BzrCommandError(str(e))
67
 
            if len(revision) > 1:
 
121
            if (len(revision) > 1) and (revision[1].spec is not None):
68
122
                try:
69
 
                    rev_id = revision[1].in_history(branch).rev_id
70
 
                    new = branch.revision_tree(rev_id)
 
123
                    rev_id = revision[1].in_history(wt.branch).rev_id
 
124
                    new = wt.branch.repository.revision_tree(rev_id)
71
125
                    new_is_working_tree = False
72
126
                except NoSuchRevision, e:
73
127
                    raise BzrCommandError(str(e))
74
128
            else:
75
 
                new = branch.working_tree()
 
129
                new = wt
76
130
                
77
 
 
78
131
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
79
132
                              specific_files=specific_files)
80
 
 
81
133
        delta.show(to_file,
82
134
                   show_ids=show_ids,
83
135
                   show_unchanged=show_unchanged)
84
136
 
85
137
        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
 
                for merge in branch.pending_merges():
93
 
                    try:
94
 
                        m_revision = branch.get_revision(merge)
95
 
                        print >> to_file, ' ', line_log(m_revision, 77)
96
 
                    except NoSuchRevision:
97
 
                        print >> to_file, ' ', merge 
98
 
                        
 
138
            list_paths('unknown', new.unknowns(), specific_files, to_file)
 
139
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
 
140
        if new_is_working_tree and show_pending:
 
141
            show_pending_merges(new, to_file)
99
142
    finally:
100
 
        branch.unlock()
 
143
        wt.unlock()
 
144
 
 
145
def show_pending_merges(new, to_file):
 
146
    """Write out a display of pending merges in a working tree."""
 
147
    pending = new.pending_merges()
 
148
    branch = new.branch
 
149
    if len(pending) == 0:
 
150
        return
 
151
    print >>to_file, 'pending merges:'
 
152
    last_revision = branch.last_revision()
 
153
    if last_revision is not None:
 
154
        ignore = set(branch.repository.get_ancestry(last_revision))
 
155
    else:
 
156
        ignore = set()
 
157
    for merge in new.pending_merges():
 
158
        ignore.add(merge)
 
159
        try:
 
160
            m_revision = branch.repository.get_revision(merge)
 
161
            print >> to_file, ' ', line_log(m_revision, 77)
 
162
            inner_merges = branch.repository.get_ancestry(merge)
 
163
            inner_merges.reverse()
 
164
            for mmerge in inner_merges:
 
165
                if mmerge in ignore:
 
166
                    continue
 
167
                mm_revision = branch.repository.get_revision(mmerge)
 
168
                print >> to_file, '   ', line_log(mm_revision, 75)
 
169
                ignore.add(mmerge)
 
170
        except NoSuchRevision:
 
171
            print >> to_file, ' ', merge 
101
172
        
102
173
def list_paths(header, paths, specific_files, to_file):
103
174
    done_header = False