Make sure that the output of "stg status" is sorted
[stgit] / stgit / commands / status.py
1
2 __copyright__ = """
3 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License version 2 as
7 published by the Free Software Foundation.
8
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
13
14 You should have received a copy of the GNU General Public License
15 along with this program; if not, write to the Free Software
16 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 """
18
19 import sys, os
20 from optparse import OptionParser, make_option
21
22 from stgit.commands.common import *
23 from stgit.utils import *
24 from stgit import stack, git
25
26
27 help = 'show the tree status'
28 usage = """%prog [options] [<files...>]
29
30 Show the status of the whole working copy or the given files. The
31 command also shows the files in the current directory which are not
32 under revision control. The files are prefixed as follows:
33
34 M - locally modified
35 N - newly added to the repository
36 D - deleted from the repository
37 C - conflict
38 ? - unknown
39
40 A 'refresh' command clears the status of the modified, new and deleted
41 files."""
42
43 options = [make_option('-m', '--modified',
44 help = 'show modified files only',
45 action = 'store_true'),
46 make_option('-n', '--new',
47 help = 'show new files only',
48 action = 'store_true'),
49 make_option('-d', '--deleted',
50 help = 'show deleted files only',
51 action = 'store_true'),
52 make_option('-c', '--conflict',
53 help = 'show conflict files only',
54 action = 'store_true'),
55 make_option('-u', '--unknown',
56 help = 'show unknown files only',
57 action = 'store_true'),
58 make_option('-x', '--noexclude',
59 help = 'do not exclude any files from listing',
60 action = 'store_true'),
61 make_option('-O', '--diff-opts',
62 help = 'options to pass to git-diff'),
63 make_option('--reset',
64 help = 'reset the current tree changes',
65 action = 'store_true')]
66
67
68 def status(files = None, modified = False, new = False, deleted = False,
69 conflict = False, unknown = False, noexclude = False,
70 diff_flags = []):
71 """Show the tree status
72 """
73 cache_files = git.tree_status(files,
74 unknown = (files == None),
75 noexclude = noexclude,
76 diff_flags = diff_flags)
77 filtered = (modified or new or deleted or conflict or unknown)
78
79 if filtered:
80 filestat = []
81 if modified:
82 filestat.append('M')
83 if new:
84 filestat.append('A')
85 filestat.append('N')
86 if deleted:
87 filestat.append('D')
88 if conflict:
89 filestat.append('C')
90 if unknown:
91 filestat.append('?')
92 cache_files = [x for x in cache_files if x[0] in filestat]
93
94 output = []
95 for st, fn in cache_files:
96 assert files == None or fn in files
97 if filtered:
98 output.append(fn)
99 else:
100 output.append('%s %s' % (st, fn))
101 for o in sorted(output):
102 out.stdout(o)
103
104 def func(parser, options, args):
105 """Show the tree status
106 """
107 if options.reset:
108 if args:
109 for f in args:
110 resolved(f)
111 git.reset(args)
112 else:
113 resolved_all()
114 git.reset()
115 else:
116 if options.diff_opts:
117 diff_flags = options.diff_opts.split()
118 else:
119 diff_flags = []
120
121 # No args means all files
122 if not args:
123 args = None
124 status(args, options.modified, options.new, options.deleted,
125 options.conflict, options.unknown, options.noexclude,
126 diff_flags = diff_flags)