P.Marek wrote: > On Saturday 13 February 2010 Gunnar Thielebein wrote: >> Author: tekknokrat >> Date: 2010-02-13 09:56:59-0800 >> New Revision: 2431 >> >> Modified: >> branches/fsvs-1.2.x/fsvs/src/status.c >> >> Log: >> - change behavior in stop_change, don't stop on parent nodes containing >> changed entries >> >> Modified: branches/fsvs-1.2.x/fsvs/src/status.c >> Url: >> http://fsvs.tigris.org/source/browse/fsvs/branches/fsvs-1.2.x/fsvs/src/sta >> tus.c?view=diff&pathrev=2431&r1=2430&r2=2431 >> ========================================================================== >> ==== --- branches/fsvs-1.2.x/fsvs/src/status.c (original) >> +++ branches/fsvs-1.2.x/fsvs/src/status.c 2010-02-13 09:56:59-0800 >> @@ -351,11 +351,8 @@ >> if (hlp__only_dir_mtime_changed(sts)) >> return status; >> >> - /* >> - * @todo: this still exit(1) for excluded dir, why? >> - */ >> - if (opt__get_int(OPT__STOP_ON_CHANGE) && >> - sts->entry_status) >> + if (opt__get_int(OPT__STOP_ON_CHANGE) && >> + sts->entry_status && (!(sts->entry_status & >> FS_CHILD_CHANGED))) >> /* Status is a read-only operation, so that works. */ >> exit(1); >> > I'm not fully sure that this is correct. > > What about directories with new/deleted entries in them, when the filter > doesn't include "new,deleted"? > > Hmmm ... if the filter says "new not wanted", should we stop if there's a > changed directory? Perhaps no, because that would defeat the filter > definition. > So your change might be correct. > > Did you verify the test status?
Hi Phil, The additional condition only applies to objects that contains changed files or further nodes not the changed files itself. I did some tests, also where parents *and* childs are changed and with the stop action no further unwanted output appeared. Also, I get the correct behaviour because the parent objects caused unwanted stop_change behaviour. What I see from the st -vv command is that fsvs iterates from the child objects to the parent. So if there are changes in child they will always cause a stop_change first. Best, Gunnar > > > Regards, > > Phil > > ------------------------------------------------------ http://fsvs.tigris.org/ds/viewMessage.do?dsForumId=3923&dsMessageId=2447329 To unsubscribe from this discussion, e-mail: [[email protected]].
