Mercurial > hg
changeset 1527:c13fce7167c2
don't print anything about file of unsupported type unless
the file was specified on the command line
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 11 Nov 2005 15:33:08 -0800 |
| parents | c230939283c3 |
| children | c9f33196805b |
| files | mercurial/dirstate.py tests/test-symlinks tests/test-symlinks.out |
| diffstat | 3 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Fri Nov 11 15:32:28 2005 -0800 +++ b/mercurial/dirstate.py Fri Nov 11 15:33:08 2005 -0800 @@ -241,7 +241,7 @@ bs += 1 return ret - def supported_type(self, f, st, verbose=True): + def supported_type(self, f, st, verbose=False): if stat.S_ISREG(st.st_mode): return True if verbose: @@ -352,7 +352,7 @@ continue self.blockignore = True if statmatch(ff, st): - if self.supported_type(ff, st): + if self.supported_type(ff, st, verbose=True): yield 'f', ff, st elif ff in dc: yield 'm', ff, st
--- a/tests/test-symlinks Fri Nov 11 15:32:28 2005 -0800 +++ b/tests/test-symlinks Fri Nov 11 15:33:08 2005 -0800 @@ -39,3 +39,4 @@ mkfifo a.c # it should show a.c, dir/a.o and dir/b.o removed hg status +hg status a.c
--- a/tests/test-symlinks.out Fri Nov 11 15:32:28 2005 -0800 +++ b/tests/test-symlinks.out Fri Nov 11 15:33:08 2005 -0800 @@ -1,15 +1,11 @@ -bar: unsupported file type (type is symbolic link) adding foo -bar: unsupported file type (type is symbolic link) -bar: unsupported file type (type is symbolic link) adding bomb -bar: unsupported file type (type is symbolic link) adding a.c adding dir/a.o adding dir/b.o -a.c: unsupported file type (type is fifo) -dir/b.o: unsupported file type (type is symbolic link) R a.c R dir/a.o R dir/b.o ? .hgignore +a.c: unsupported file type (type is fifo) +R a.c