Make sure that the output of "stg status" is sorted
[stgit] / stgit / commands / status.py
CommitLineData
fcee87cf
CM
1
2__copyright__ = """
3Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
4
5This program is free software; you can redistribute it and/or modify
6it under the terms of the GNU General Public License version 2 as
7published by the Free Software Foundation.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program; if not, write to the Free Software
16Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17"""
18
19import sys, os
20from optparse import OptionParser, make_option
21
22from stgit.commands.common import *
23from stgit.utils import *
24from stgit import stack, git
25
26
27help = 'show the tree status'
26aab5b0
CM
28usage = """%prog [options] [<files...>]
29
30Show the status of the whole working copy or the given files. The
31command also shows the files in the current directory which are not
32under 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
40A 'refresh' command clears the status of the modified, new and deleted
41files."""
fcee87cf
CM
42
43options = [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',
4d4c0e3a
PBG
57 action = 'store_true'),
58 make_option('-x', '--noexclude',
59 help = 'do not exclude any files from listing',
94227db3 60 action = 'store_true'),
2ace36ab
YD
61 make_option('-O', '--diff-opts',
62 help = 'options to pass to git-diff'),
94227db3
CM
63 make_option('--reset',
64 help = 'reset the current tree changes',
fcee87cf
CM
65 action = 'store_true')]
66
67
4361d795
DK
68def 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
cbd2f5f3
KH
94 output = []
95 for st, fn in cache_files:
96 assert files == None or fn in files
97 if filtered:
98 output.append(fn)
4361d795 99 else:
cbd2f5f3
KH
100 output.append('%s %s' % (st, fn))
101 for o in sorted(output):
102 out.stdout(o)
4361d795 103
fcee87cf
CM
104def func(parser, options, args):
105 """Show the tree status
106 """
94227db3 107 if options.reset:
49e316b9
CM
108 if args:
109 for f in args:
110 resolved(f)
111 git.reset(args)
112 else:
113 resolved_all()
114 git.reset()
94227db3 115 else:
2ace36ab
YD
116 if options.diff_opts:
117 diff_flags = options.diff_opts.split()
118 else:
119 diff_flags = []
120
70028538
DK
121 # No args means all files
122 if not args:
123 args = None
4361d795
DK
124 status(args, options.modified, options.new, options.deleted,
125 options.conflict, options.unknown, options.noexclude,
126 diff_flags = diff_flags)