regarding issue 1076,
the following shows what i take to be correct behavior (based on the
comments from Karl & Philip in IZ), please tell me if you disagree.
$ cd wc
$ touch foo
$ svn ps svn:ignore foo .
$ svn st
$ svn st --no-ignore
I foo
$ svn st foo
I foo
$ svn st nonexistent-file
if you are not in a working copy, you currently get this message,
which seems OK to me. is it?
$ cd /not/a/working/copy
$ svn st foo
subversion/libsvn_wc/lock.c:309: (apr_err=155007)
svn: Path is not a working copy directory
svn: '' is not a working copy
the following is not a complete patch, but seems to get the --no-ignore
case working. let me know if you think i'm on the wrong track; otherwise,
a more complete patch will be forthcoming in the next couple of days.
-brian
Index: subversion/include/svn_wc.h
===================================================================
--- subversion/include/svn_wc.h (revision 5283)
+++ subversion/include/svn_wc.h (working copy)
@@ -842,7 +842,10 @@
svn_wc_status_conflicted,
/** an unversioned resource is in the way of the versioned resource */
- svn_wc_status_obstructed
+ svn_wc_status_obstructed,
+
+ /** a resource marked as ignored */
+ svn_wc_status_ignored
};
/** Structure for holding the "status" of a working copy item.
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c (revision 5283)
+++ subversion/libsvn_wc/status.c (working copy)
@@ -156,7 +156,7 @@
if (path_kind != svn_node_none)
{
if (is_ignored)
- stat->text_status = svn_wc_status_none;
+ stat->text_status = svn_wc_status_ignored;
else
stat->text_status = svn_wc_status_unversioned;
}
Index: subversion/clients/cmdline/status.c
===================================================================
--- subversion/clients/cmdline/status.c (revision 5283)
+++ subversion/clients/cmdline/status.c (working copy)
@@ -45,6 +45,7 @@
case svn_wc_status_merged: return 'G';
case svn_wc_status_conflicted: return 'C';
case svn_wc_status_obstructed: return '~';
+ case svn_wc_status_ignored: return 'I';
case svn_wc_status_unversioned: return '?';
default: return '?';
}
Index: subversion/tests/clients/cmdline/stat_tests.py
===================================================================
--- subversion/tests/clients/cmdline/stat_tests.py (revision 5283)
+++ subversion/tests/clients/cmdline/stat_tests.py (working copy)
@@ -314,8 +314,8 @@
return 0
-def status_blank_for_unignored_file(sbox):
- "status blank for unignored file"
+def status_for_unignored_file(sbox):
+ "status for unignored file"
if sbox.build():
return 1
@@ -333,7 +333,7 @@
return 1
status = 1
for line in stat_output:
- if re.match(" +newfile", line):
+ if re.match("I +newfile", line):
status = 0
os.chdir(was_cwd)
@@ -486,7 +486,7 @@
status_type_change,
Skip(status_type_change_to_symlink, (os.name != 'posix')),
status_with_new_files_pending,
- status_blank_for_unignored_file,
+ status_for_unignored_file,
status_file_needs_update,
XFail(status_uninvited_parent_directory),
]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 13 18:01:38 2003