← 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-09-29 02:01:49 UTC
  • Revision ID: robertc@robertcollins.net-20050929020149-1ff16722c6a01b2c
reenable remotebranch tests

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
17
 
21
18
 
22
19
def show_status(branch, show_unchanged=False,
41
38
 
42
39
    show_pending
43
40
        If set, write pending merges.
44
 
 
45
41
    revision
46
42
        If None the compare latest revision with working tree
47
43
        If one revision show compared it with working tree.
48
44
        If two revisions show status between first and second.
49
45
    """
 
46
    import sys
 
47
    from bzrlib.delta import compare_trees
 
48
 
50
49
    if to_file == None:
51
50
        to_file = sys.stdout
52
51
    
81
80
                   show_unchanged=show_unchanged)
82
81
 
83
82
        if new_is_working_tree:
84
 
            conflicts = new.iter_conflicts()
85
83
            unknowns = new.unknowns()
86
 
            list_paths('unknown', unknowns, specific_files, to_file)
87
 
            list_paths('conflicts', conflicts, specific_files, to_file)
 
84
            done_header = False
 
85
            for path in unknowns:
 
86
                # FIXME: Should also match if the unknown file is within a
 
87
                # specified directory.
 
88
                if specific_files:
 
89
                    if path not in specific_files:
 
90
                        continue
 
91
                if not done_header:
 
92
                    print >>to_file, 'unknown:'
 
93
                    done_header = True
 
94
                print >>to_file, ' ', path
88
95
            if show_pending and len(branch.pending_merges()) > 0:
89
96
                print >>to_file, 'pending merges:'
90
97
                for merge in branch.pending_merges():
92
99
    finally:
93
100
        branch.unlock()
94
101
        
95
 
def list_paths(header, paths, specific_files, to_file):
96
 
    done_header = False
97
 
    for path in paths:
98
 
        if specific_files and not is_inside_any(specific_files, path):
99
 
            continue
100
 
        if not done_header:
101
 
            print >>to_file, '%s:' % header
102
 
            done_header = True
103
 
        print >>to_file, ' ', path