The git.status() was more of a command than a library function, and
was only used in one place.
Signed-off-by: David Kågedal <davidk@xxxxxxxxxxxxxx>
---
stgit/commands/status.py | 39 ++++++++++++++++++++++++++++++++++++---
stgit/git.py | 33 ---------------------------------
t/t0002-status.sh | 8 ++++++++
3 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index de88ba0..bbfb5df 100644
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -65,6 +65,39 @@ options = [make_option('-m', '--modified',
action = 'store_true')]
+def status(files = None, modified = False, new = False, deleted = False,
+ conflict = False, unknown = False, noexclude = False,
+ diff_flags = []):
+ """Show the tree status
+ """
+ cache_files = git.tree_status(files,
+ unknown = (files == None),
+ noexclude = noexclude,
+ diff_flags = diff_flags)
+ filtered = (modified or new or deleted or conflict or unknown)
+
+ if filtered:
+ filestat = []
+ if modified:
+ filestat.append('M')
+ if new:
+ filestat.append('A')
+ filestat.append('N')
+ if deleted:
+ filestat.append('D')
+ if conflict:
+ filestat.append('C')
+ if unknown:
+ filestat.append('?')
+ cache_files = [x for x in cache_files if x[0] in filestat]
+
+ for fs in cache_files:
+ assert files == None or fs[1] in files
+ if not filtered:
+ out.stdout('%s %s' % (fs[0], fs[1]))
+ else:
+ out.stdout('%s' % fs[1])
+
def func(parser, options, args):
"""Show the tree status
"""
@@ -85,6 +118,6 @@ def func(parser, options, args):
# No args means all files
if not args:
args = None
- git.status(args, options.modified, options.new, options.deleted,
- options.conflict, options.unknown, options.noexclude,
- diff_flags = diff_flags)
+ status(args, options.modified, options.new, options.deleted,
+ options.conflict, options.unknown, options.noexclude,
+ diff_flags = diff_flags)
diff --git a/stgit/git.py b/stgit/git.py
index 8dda1ed..b112787 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -711,39 +711,6 @@ def merge(base, head1, head2, recursive = False):
if errors:
raise GitException, 'GIT index merging failed (possible conflicts)'
-def status(files = None, modified = False, new = False, deleted = False,
- conflict = False, unknown = False, noexclude = False,
- diff_flags = []):
- """Show the tree status
- """
- cache_files = tree_status(files,
- unknown = (files == None),
- noexclude = noexclude,
- diff_flags = diff_flags)
- filtered = (modified or new or deleted or conflict or unknown)
-
- if filtered:
- filestat = []
- if modified:
- filestat.append('M')
- if new:
- filestat.append('A')
- filestat.append('N')
- if deleted:
- filestat.append('D')
- if conflict:
- filestat.append('C')
- if unknown:
- filestat.append('?')
- cache_files = [x for x in cache_files if x[0] in filestat]
-
- for fs in cache_files:
- assert files == None or fs[1] in files
- if not filtered:
- out.stdout('%s %s' % (fs[0], fs[1]))
- else:
- out.stdout('%s' % fs[1])
-
def diff(files = None, rev1 = 'HEAD', rev2 = None, diff_flags = []):
"""Show the diff between rev1 and rev2
"""
diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index 790b9fb..d0c31b2 100755
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -60,6 +60,14 @@ test_expect_success 'Status with an added file' '
'
cat > expected.txt <<EOF
+foo/bar
+EOF
+test_expect_success 'Status with an added file and -n option' '
+ stg status -n > output.txt &&
+ diff -u expected.txt output.txt
+'
+
+cat > expected.txt <<EOF
EOF
test_expect_success 'Status after refresh' '
stg new -m "first patch" &&
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
