← 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: 2005-10-19 10:11:57 UTC
  • mfrom: (1185.16.78)
  • mto: This revision was merged to the branch mainline in revision 1470.
  • Revision ID: robertc@robertcollins.net-20051019101157-17438d311e746b4f
merge from upstream

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
17
22
 
18
23
 
19
24
def show_status(branch, show_unchanged=False,
44
49
        If one revision show compared it with working tree.
45
50
        If two revisions show status between first and second.
46
51
    """
47
 
    import sys
48
 
    from bzrlib.osutils import is_inside_any
49
 
    from bzrlib.delta import compare_trees
50
 
 
51
52
    if to_file == None:
52
53
        to_file = sys.stdout
53
54
    
82
83
                   show_unchanged=show_unchanged)
83
84
 
84
85
        if new_is_working_tree:
 
86
            conflicts = new.iter_conflicts()
85
87
            unknowns = new.unknowns()
86
 
            done_header = False
87
 
            for path in unknowns:
88
 
                if specific_files and not is_inside_any(specific_files, path):
89
 
                    continue
90
 
                if not done_header:
91
 
                    print >>to_file, 'unknown:'
92
 
                    done_header = True
93
 
                print >>to_file, ' ', path
 
88
            list_paths('unknown', unknowns, specific_files, to_file)
 
89
            list_paths('conflicts', conflicts, specific_files, to_file)
94
90
            if show_pending and len(branch.pending_merges()) > 0:
95
91
                print >>to_file, 'pending merges:'
96
92
                for merge in branch.pending_merges():
97
 
                    print >> to_file, ' ', merge
 
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
                        
98
99
    finally:
99
100
        branch.unlock()
100
101
        
 
102
def list_paths(header, paths, specific_files, to_file):
 
103
    done_header = False
 
104
    for path in paths:
 
105
        if specific_files and not is_inside_any(specific_files, path):
 
106
            continue
 
107
        if not done_header:
 
108
            print >>to_file, '%s:' % header
 
109
            done_header = True
 
110
        print >>to_file, ' ', path