# HG changeset patch # User Benoit Boissinot # Date 1131751988 28800 # Node ID c13fce7167c2f0639d9dbe73e11bab38738ff60d # Parent c230939283c3494c4c22681d49bee726d4f4e5cd don't print anything about file of unsupported type unless the file was specified on the command line diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -241,7 +241,7 @@ class dirstate: 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 @@ class dirstate: 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 diff --git a/tests/test-symlinks b/tests/test-symlinks --- a/tests/test-symlinks +++ b/tests/test-symlinks @@ -39,3 +39,4 @@ ln -sf nonexist dir/b.o mkfifo a.c # it should show a.c, dir/a.o and dir/b.o removed hg status +hg status a.c diff --git a/tests/test-symlinks.out b/tests/test-symlinks.out --- a/tests/test-symlinks.out +++ b/tests/test-symlinks.out @@ -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