Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Actually, I think I have to take it back, that script /does/ work, at least if you specify a directory to be substituted for %1. But not globs. And for Windows of course you'll need to get some of the grep, cut, xargs, etc tools from the gnu guys (can't remember the url, but you can easily google and find the binaries for them) -dave > -Original Message- > From: fossil-users-boun...@lists.fossil-scm.org > [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of dave > Sent: Thursday, September 25, 2014 9:57 PM > To: 'Fossil SCM user's discussion' > Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress > unchanged files? > > > FYI I did try on a lark: > > fossil changes %1 | grep EDITED | cut -c12- - | xargs fossil gdiff > > Which almost did it. Except for the fact that 'fossil > changes' does not > support specifying a directory (or whether to recurse, or > not), so this was > ultimately was the same as a 'fossil gdiff', haha, just more > circumlocutory. > But... Maybe someone smarter than me can think of a filter before the > 'xargs' that further reduces the file list to just the ones > in the intended > directory, and then you'd have it, I think. > > -dave > > > -Original Message- > > From: dave [mailto:d...@ziggurat29.com] > > Sent: Thursday, September 25, 2014 8:37 AM > > To: 'Fossil SCM user's discussion' > > Subject: RE: [fossil-users] gdiff/opendiff on os x: suppress > > unchanged files? > > > > > > Yep, now I understand and agree with you all. I guess you > > could call it supporting globbing, or scoped gdiff. I don't > > know if the present case is because globbing on the command > > line is expanded by the shell to a mondo list of files before > > fossil.exe gets them, in which case perhaps it needs a switch > > like --ignore-unchanged, or maybe changes it's behaviour to > > that automatically in the more-that-one-file case. Or maybe > > it always ignores unchanged files, but at least emits a > > message to stdout that it is skipping an unchangd file, so > > you don't think something is broken. > > > > I wonder if in the meantime a script could be created to take > > the output of fossil changes and concoct a file list of just > > the changed files, and then invoke fossil gdiff with that? > > > > OK, now I'm really going to duck out of the conversation. Haha. > > > > -dave > > > > > -Original Message- > > > Of Dömötör Gulyás > > ... > > > Yes, that's exactly my use case, exacerbated by the fact that > > > FileMerge/opendiff are real slow when used from fossil/git/bzr per > > > file, taking on the order of seconds for every file it > has to show, > > ... > > > > > On 25 September 2014 08:50, Tony Papadimitriou > > wrote: > > > > Well, it may not seem like a problem if you compare a > > > single file that you > > > > know has no differences, but imagine youre checking a > > > specific directory > > > > with hundreds of files, only one or two of which have > > > changed. Fossil will > > ... > > > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
FYI I did try on a lark: fossil changes %1 | grep EDITED | cut -c12- - | xargs fossil gdiff Which almost did it. Except for the fact that 'fossil changes' does not support specifying a directory (or whether to recurse, or not), so this was ultimately was the same as a 'fossil gdiff', haha, just more circumlocutory. But... Maybe someone smarter than me can think of a filter before the 'xargs' that further reduces the file list to just the ones in the intended directory, and then you'd have it, I think. -dave > -Original Message- > From: dave [mailto:d...@ziggurat29.com] > Sent: Thursday, September 25, 2014 8:37 AM > To: 'Fossil SCM user's discussion' > Subject: RE: [fossil-users] gdiff/opendiff on os x: suppress > unchanged files? > > > Yep, now I understand and agree with you all. I guess you > could call it supporting globbing, or scoped gdiff. I don't > know if the present case is because globbing on the command > line is expanded by the shell to a mondo list of files before > fossil.exe gets them, in which case perhaps it needs a switch > like --ignore-unchanged, or maybe changes it's behaviour to > that automatically in the more-that-one-file case. Or maybe > it always ignores unchanged files, but at least emits a > message to stdout that it is skipping an unchangd file, so > you don't think something is broken. > > I wonder if in the meantime a script could be created to take > the output of fossil changes and concoct a file list of just > the changed files, and then invoke fossil gdiff with that? > > OK, now I'm really going to duck out of the conversation. Haha. > > -dave > > > -Original Message- > > Of Dömötör Gulyás > ... > > Yes, that's exactly my use case, exacerbated by the fact that > > FileMerge/opendiff are real slow when used from fossil/git/bzr per > > file, taking on the order of seconds for every file it has to show, > ... > > > On 25 September 2014 08:50, Tony Papadimitriou > wrote: > > > Well, it may not seem like a problem if you compare a > > single file that you > > > know has no differences, but imagine youre checking a > > specific directory > > > with hundreds of files, only one or two of which have > > changed. Fossil will > ... > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Yep, now I understand and agree with you all. I guess you could call it supporting globbing, or scoped gdiff. I don't know if the present case is because globbing on the command line is expanded by the shell to a mondo list of files before fossil.exe gets them, in which case perhaps it needs a switch like --ignore-unchanged, or maybe changes it's behaviour to that automatically in the more-that-one-file case. Or maybe it always ignores unchanged files, but at least emits a message to stdout that it is skipping an unchangd file, so you don't think something is broken. I wonder if in the meantime a script could be created to take the output of fossil changes and concoct a file list of just the changed files, and then invoke fossil gdiff with that? OK, now I'm really going to duck out of the conversation. Haha. -dave > -Original Message- > Of Dömötör Gulyás ... > Yes, that's exactly my use case, exacerbated by the fact that > FileMerge/opendiff are real slow when used from fossil/git/bzr per > file, taking on the order of seconds for every file it has to show, ... > On 25 September 2014 08:50, Tony Papadimitriou wrote: > > Well, it may not seem like a problem if you compare a > single file that you > > know has no differences, but imagine youre checking a > specific directory > > with hundreds of files, only one or two of which have > changed. Fossil will ... ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Yes, that's exactly my use case, exacerbated by the fact that FileMerge/opendiff are real slow when used from fossil/git/bzr per file, taking on the order of seconds for every file it has to show, which doesn't happen when used from the GUI (radr #16400583 in bugreport.apple.com). Additionally opendiff CAN diff an entire directory, which would be the vastly preferrable use, offering the best interface, without the aforementioned per-file delay. Is gdiffing an entire directory something that could/should be added to fossil? I know at least one other gdiff tool that can do directories, though the name escapes me right now. On 25 September 2014 08:50, Tony Papadimitriou wrote: > Well, it may not seem like a problem if you compare a single file that you > know has no differences, but imagine you’re checking a specific directory > with hundreds of files, only one or two of which have changed. Fossil will > invoke WinDiff and have you look at every single file in that directory, > instead of the one or two that actually have changed. So, it IS kind of a > problem, unless you avoid using WinDiff and use –tk option. > > From: dave > Sent: Thursday, September 25, 2014 12:07 AM > To: 'Fossil SCM user's discussion' > Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged > files? > > Oh, OK. Well, if I do, say > > C:\Experiments\libfossil>fossil gdiff configure > > in my environment, I do indeed get a WinDiff on that file showing no > changes, but isnt' that what I asked it to do, rather than not pop up > WinDiff at all and make me think something is wrong? > > Oh, well, I guess I don't understand the particualr use-case, and probably > I'm just adding noise to the conversation at this point, so I'll duck out. > At least in the scenarios I described below, it seems to be working right to > my sensibilities in at least version 1.29. > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
MessageWell, it may not seem like a problem if you compare a single file that you know has no differences, but imagine you’re checking a specific directory with hundreds of files, only one or two of which have changed. Fossil will invoke WinDiff and have you look at every single file in that directory, instead of the one or two that actually have changed. So, it IS kind of a problem, unless you avoid using WinDiff and use –tk option. From: dave Sent: Thursday, September 25, 2014 12:07 AM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Oh, OK. Well, if I do, say C:\Experiments\libfossil>fossil gdiff configure in my environment, I do indeed get a WinDiff on that file showing no changes, but isnt' that what I asked it to do, rather than not pop up WinDiff at all and make me think something is wrong? Oh, well, I guess I don't understand the particualr use-case, and probably I'm just adding noise to the conversation at this point, so I'll duck out. At least in the scenarios I described below, it seems to be working right to my sensibilities in at least version 1.29.___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Aha, so for me also on 1.29, if i specify "src/*", it shows all files, but just gdiff with no paths shows the changes only. Now, the problem is I can't tell fossil to "fossil gdiff src/", it insists on "fossil gdiff src/*", so it explicitly loads up all the files. Any suggestions? My workflow is such that I often want to see only the changes in the source code, but a gdiff without a path would show a lot of changed stuff in resources, docs, etc, that I don't want. On 24 September 2014 22:02, wrote: > Wait a moment, did you specify a path/file with the GDIFF command, or was it > a show-me-all case, i.e., no files given? > > Because the latter will correctly go only through the files that have > changed. > > The problem appears when you specify a set of files (even a single one). > Then, all specified files are shown whether they have differences or not, > whereas with the simple DIFF command nothing is shown. > > -Original Message- > From: dave > Sent: Wednesday, September 24, 2014 10:14 PM > To: 'Fossil SCM user's discussion' > Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged > files? > > Interestingly, this does /not/ happen for me on Windows with WinDiff. (I > had occaision to do this just yesterday, and it only presented sequentially > the three files that had actual changes). Don't know if version is related; > I am using the 1.29 version that came out in June. Or maybe it's a setting > in my windiff (or can windiff settings have an opportunity to affect this > behavior). > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Oh, OK. Well, if I do, say C:\Experiments\libfossil>fossil gdiff configure in my environment, I do indeed get a WinDiff on that file showing no changes, but isnt' that what I asked it to do, rather than not pop up WinDiff at all and make me think something is wrong? Oh, well, I guess I don't understand the particualr use-case, and probably I'm just adding noise to the conversation at this point, so I'll duck out. At least in the scenarios I described below, it seems to be working right to my sensibilities in at least version 1.29. -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of to...@acm.org Sent: Wednesday, September 24, 2014 3:24 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? OK, but still you need to try with a file that has NOT changed. It should show nothing, but you will see the file, instead. From: dave <mailto:d...@ziggurat29.com> Sent: Wednesday, September 24, 2014 11:17 PM To: 'Fossil SCM user's <mailto:fossil-users@lists.fossil-scm.org> discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? gotcha. Yes, I think it was the 'show-me-all' case of fossil gdiff let me see if I can rdp into that box and try it out now OK, still works for me. More scoop, my checkout state: C:\Experiments\libfossil>fossil changes EDITED include/fossil-scm/fossil-config.h EDITED src/fsl_buffer.c EDITED src/fsl_cli.c EDITED src/fsl_md5.c EDITED src/fsl_utf8.c and doing it the 'show-me-all' way C:\Experiments\libfossil>fossil gdiff gives me five seqential WinDiff presentations. And doing it the 'explicit' way: C:\Experiments\libfossil>fossil gdiff include\fossil-scm\fossil-config.h gives me one and only one WinDiff presentation. which version of fossil are you using? I'm on 1.29 -dave -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of to...@acm.org Sent: Wednesday, September 24, 2014 3:02 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Wait a moment, did you specify a path/file with the GDIFF command, or was it a show-me-all case, i.e., no files given? Because the latter will correctly go only through the files that have changed. The problem appears when you specify a set of files (even a single one). Then, all specified files are shown whether they have differences or not, whereas with the simple DIFF command nothing is shown. -Original Message- From: dave Sent: Wednesday, September 24, 2014 10:14 PM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Interestingly, this does /not/ happen for me on Windows with WinDiff. (I had occaision to do this just yesterday, and it only presented sequentially the three files that had actual changes). Don't know if version is related; I am using the 1.29 version that came out in June. Or maybe it's a setting in my windiff (or can windiff settings have an opportunity to affect this behavior). _ ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
MessageOK, but still you need to try with a file that has NOT changed. It should show nothing, but you will see the file, instead. From: dave Sent: Wednesday, September 24, 2014 11:17 PM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? gotcha. Yes, I think it was the 'show-me-all' case of fossil gdiff let me see if I can rdp into that box and try it out now OK, still works for me. More scoop, my checkout state: C:\Experiments\libfossil>fossil changes EDITED include/fossil-scm/fossil-config.h EDITED src/fsl_buffer.c EDITED src/fsl_cli.c EDITED src/fsl_md5.c EDITED src/fsl_utf8.c and doing it the 'show-me-all' way C:\Experiments\libfossil>fossil gdiff gives me five seqential WinDiff presentations. And doing it the 'explicit' way: C:\Experiments\libfossil>fossil gdiff include\fossil-scm\fossil-config.h gives me one and only one WinDiff presentation. which version of fossil are you using? I'm on 1.29 -dave -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of to...@acm.org Sent: Wednesday, September 24, 2014 3:02 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Wait a moment, did you specify a path/file with the GDIFF command, or was it a show-me-all case, i.e., no files given? Because the latter will correctly go only through the files that have changed. The problem appears when you specify a set of files (even a single one). Then, all specified files are shown whether they have differences or not, whereas with the simple DIFF command nothing is shown. -Original Message- From: dave Sent: Wednesday, September 24, 2014 10:14 PM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Interestingly, this does /not/ happen for me on Windows with WinDiff. (I had occaision to do this just yesterday, and it only presented sequentially the three files that had actual changes). Don't know if version is related; I am using the 1.29 version that came out in June. Or maybe it's a setting in my windiff (or can windiff settings have an opportunity to affect this behavior). ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
gotcha. Yes, I think it was the 'show-me-all' case of fossil gdiff let me see if I can rdp into that box and try it out now OK, still works for me. More scoop, my checkout state: C:\Experiments\libfossil>fossil changes EDITED include/fossil-scm/fossil-config.h EDITED src/fsl_buffer.c EDITED src/fsl_cli.c EDITED src/fsl_md5.c EDITED src/fsl_utf8.c and doing it the 'show-me-all' way C:\Experiments\libfossil>fossil gdiff gives me five seqential WinDiff presentations. And doing it the 'explicit' way: C:\Experiments\libfossil>fossil gdiff include\fossil-scm\fossil-config.h gives me one and only one WinDiff presentation. which version of fossil are you using? I'm on 1.29 -dave -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of to...@acm.org Sent: Wednesday, September 24, 2014 3:02 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Wait a moment, did you specify a path/file with the GDIFF command, or was it a show-me-all case, i.e., no files given? Because the latter will correctly go only through the files that have changed. The problem appears when you specify a set of files (even a single one). Then, all specified files are shown whether they have differences or not, whereas with the simple DIFF command nothing is shown. -Original Message- From: dave Sent: Wednesday, September 24, 2014 10:14 PM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Interestingly, this does /not/ happen for me on Windows with WinDiff. (I had occaision to do this just yesterday, and it only presented sequentially the three files that had actual changes). Don't know if version is related; I am using the 1.29 version that came out in June. Or maybe it's a setting in my windiff (or can windiff settings have an opportunity to affect this behavior). ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Wait a moment, did you specify a path/file with the GDIFF command, or was it a show-me-all case, i.e., no files given? Because the latter will correctly go only through the files that have changed. The problem appears when you specify a set of files (even a single one). Then, all specified files are shown whether they have differences or not, whereas with the simple DIFF command nothing is shown. -Original Message- From: dave Sent: Wednesday, September 24, 2014 10:14 PM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Interestingly, this does /not/ happen for me on Windows with WinDiff. (I had occaision to do this just yesterday, and it only presented sequentially the three files that had actual changes). Don't know if version is related; I am using the 1.29 version that came out in June. Or maybe it's a setting in my windiff (or can windiff settings have an opportunity to affect this behavior). ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
There is a "Show Identical Files" option in WinDiff but changing only affects whether the contents of the files are shown, or a blank screen is shown. The problem is still that the WinDiff application is invoked even though there is no difference in the files. -Original Message- From: dave Sent: Wednesday, September 24, 2014 10:14 PM To: 'Fossil SCM user's discussion' Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Interestingly, this does /not/ happen for me on Windows with WinDiff. (I had occaision to do this just yesterday, and it only presented sequentially the three files that had actual changes). Don't know if version is related; I am using the 1.29 version that came out in June. Or maybe it's a setting in my windiff (or can windiff settings have an opportunity to affect this behavior). -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of to...@acm.org Sent: Wednesday, September 24, 2014 1:02 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? If it's any consolation, the same problem exists under Windows with WinDiff (default GDIFF program). I suppose the reason for this is the screening of which files to show is done by the application, and not fossil. And, WinDiff, in my case has no problem showing a comparison between two equal files. If only the actual changed files would be passed to the GDIFF app, then this issue wouldn't exist. But I could be guessing wrong. -Original Message- From: Dömötör Gulyás Sent: Wednesday, September 24, 2014 8:54 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Thanks, "fossil diff --tk" works for the interim, but the diffs provided by FileMerge/opendiff I would prefer. Isn't opendiff the default gdiff on OS X (or did I just already have it my settings?)? If it is, i reckon it oughta work :) ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Interestingly, this does /not/ happen for me on Windows with WinDiff. (I had occaision to do this just yesterday, and it only presented sequentially the three files that had actual changes). Don't know if version is related; I am using the 1.29 version that came out in June. Or maybe it's a setting in my windiff (or can windiff settings have an opportunity to affect this behavior). > -Original Message- > From: fossil-users-boun...@lists.fossil-scm.org > [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf > Of to...@acm.org > Sent: Wednesday, September 24, 2014 1:02 PM > To: Fossil SCM user's discussion > Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress > unchanged files? > > > If it's any consolation, the same problem exists under > Windows with WinDiff > (default GDIFF program). > > I suppose the reason for this is the screening of which files > to show is > done by the application, and not fossil. And, WinDiff, in my > case has no > problem showing a comparison between two equal files. > If only the actual changed files would be passed to the GDIFF > app, then this > issue wouldn't exist. But I could be guessing wrong. > > -Original Message- > From: Dömötör Gulyás > Sent: Wednesday, September 24, 2014 8:54 PM > To: Fossil SCM user's discussion > Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress > unchanged > files? > > Thanks, "fossil diff --tk" works for the interim, but the diffs > provided by FileMerge/opendiff I would prefer. Isn't opendiff the > default gdiff on OS X (or did I just already have it my settings?)? If > it is, i reckon it oughta work :) > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
On Wed, Sep 24, 2014 at 8:39 PM, Andy Bradford wrote: > Thus said Stephan Beal on Wed, 24 Sep 2014 20:16:13 +0200: > > > This behaviour is just plain weird. On Linux i can't reproduce it with > > either 'meld' or 'kompare': > > I'm not sure if this is the same behavior that is being discussed, but > try this with the Fossil repo: > > fossil up 2d75e87b76 > fossil mer b2a4b66f4b > fossil diff -r b2a4b66f4b > > It will show a bunch of files that apparently have no changes. Is this > what is happening for others? Here is the top part of the output: > This i can reproduce. It lists the unchanged files, but doesn't show any diff content. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
On Wed, Sep 24, 2014 at 8:47 PM, wrote: > Here’s a very easy way to verify the problem (at least on a Win > machine): > > (F = FOSSIL) > (This is fossil version 1.30 [ee46563cbd] 2014-08-15 12:46:27 UTC) > > 1. f g --from prev any_unchanged_file_path > That works as expected for me with both meld and kompare: "the files are identical" This is fossil version 1.30 [4fcbd9b09f] 2014-09-20 14:49:35 UTC If i update to the current trunk... This is fossil version 1.30 [35bf217336] 2014-09-24 09:01:03 UTC Same thing. :-? -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Here’s a very easy way to verify the problem (at least on a Win machine): (F = FOSSIL) (This is fossil version 1.30 [ee46563cbd] 2014-08-15 12:46:27 UTC) 1. f g --from prev any_unchanged_file_path 2. f diff --tk --from any_unchanged_file_path [1] will show the files but without any differences. [2] will show a popup saying “Fossil Diff – No Changes” any_unchanged_file_path is the path/name of any file you choose that is known not to have changed from the previous version.___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Thus said Stephan Beal on Wed, 24 Sep 2014 20:16:13 +0200: > This behaviour is just plain weird. On Linux i can't reproduce it with > either 'meld' or 'kompare': I'm not sure if this is the same behavior that is being discussed, but try this with the Fossil repo: fossil up 2d75e87b76 fossil mer b2a4b66f4b fossil diff -r b2a4b66f4b It will show a bunch of files that apparently have no changes. Is this what is happening for others? Here is the top part of the output: Index: auto.def == Index: src/add.c == Index: src/attach.c == Index: src/blob.c == --- src/blob.c +++ src/blob.c ... Andy -- TAI64 timestamp: 40005423101e ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
if it's of any interest to you: at least with source gear's `DiffMerge' and fossil settings gdiff-command(global) diffmerge.sh gmerge-command (global) diffmerge.sh "%original" "%baseline" "%merge" --result="%output" (where `diffmerge.sh' is the provided shell wrapper) everything works just fine. personally, I find it even nicer than `opendiff' and it's most useful for 'graphical merge' actions. joerg On Wed, 24 Sep 2014 19:54:38 +0200, Dömötör Gulyás wrote: Thanks, "fossil diff --tk" works for the interim, but the diffs provided by FileMerge/opendiff I would prefer. Isn't opendiff the default gdiff on OS X (or did I just already have it my settings?)? If it is, i reckon it oughta work :) On 24 September 2014 19:08, Richard Hipp wrote: On Wed, Sep 24, 2014 at 12:35 PM, Dömötör Gulyás wrote: When using fossil gdiff on OS X, with opendiff as the gdiff command, diffs for all files are shown, even if there are no changes. This contrasts with behavior of opendiff with git/bzr, etc, which only show the changed files, which is preferrable. Is there a known workaround for this? Out of the box, gdiff on OS X with opendiff is pretty unusable. I'm not familiar with opendiff. Have you tried instead "fossil diff --tk"? Does that work for you? -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Using Opera's revolutionary email client: http://www.opera.com/mail/ ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
On Wed, Sep 24, 2014 at 8:02 PM, wrote: > If it's any consolation, the same problem exists under Windows with > WinDiff (default GDIFF program). > > I suppose the reason for this is the screening of which files to show is > done by the application, and not fossil. And, WinDiff, in my case has no > problem showing a comparison between two equal files. > If only the actual changed files would be passed to the GDIFF app, then > this issue wouldn't exist. But I could be guessing wrong. > This behaviour is just plain weird. On Linux i can't reproduce it with either 'meld' or 'kompare': [stephan@host:~/cvs/fossil/cwal]$ echo '# gdiff test' >> Makefile [stephan@host:~/cvs/fossil/cwal]$ f gdiff that shows (as expected) only the current changes. [stephan@host:~/cvs/fossil/cwal]$ f set gdiff cat [stephan@host:~/cvs/fossil/cwal]$ f gdiff Index: Makefile == ... spits out only the first (unmodified) file, but that's also a misuse of 'cat'. In any case, it showing _all_ files in the repo is "highly peculiar." -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
If it's any consolation, the same problem exists under Windows with WinDiff (default GDIFF program). I suppose the reason for this is the screening of which files to show is done by the application, and not fossil. And, WinDiff, in my case has no problem showing a comparison between two equal files. If only the actual changed files would be passed to the GDIFF app, then this issue wouldn't exist. But I could be guessing wrong. -Original Message- From: Dömötör Gulyás Sent: Wednesday, September 24, 2014 8:54 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files? Thanks, "fossil diff --tk" works for the interim, but the diffs provided by FileMerge/opendiff I would prefer. Isn't opendiff the default gdiff on OS X (or did I just already have it my settings?)? If it is, i reckon it oughta work :) ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
Thanks, "fossil diff --tk" works for the interim, but the diffs provided by FileMerge/opendiff I would prefer. Isn't opendiff the default gdiff on OS X (or did I just already have it my settings?)? If it is, i reckon it oughta work :) On 24 September 2014 19:08, Richard Hipp wrote: > > > On Wed, Sep 24, 2014 at 12:35 PM, Dömötör Gulyás > wrote: >> >> When using fossil gdiff on OS X, with opendiff as the gdiff command, >> diffs for all files are shown, even if there are no changes. This >> contrasts with behavior of opendiff with git/bzr, etc, which only show >> the changed files, which is preferrable. >> >> Is there a known workaround for this? Out of the box, gdiff on OS X >> with opendiff is pretty unusable. > > > I'm not familiar with opendiff. Have you tried instead "fossil diff --tk"? > Does that work for you? > > -- > D. Richard Hipp > d...@sqlite.org > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] gdiff/opendiff on os x: suppress unchanged files?
On Wed, Sep 24, 2014 at 12:35 PM, Dömötör Gulyás wrote: > When using fossil gdiff on OS X, with opendiff as the gdiff command, > diffs for all files are shown, even if there are no changes. This > contrasts with behavior of opendiff with git/bzr, etc, which only show > the changed files, which is preferrable. > > Is there a known workaround for this? Out of the box, gdiff on OS X > with opendiff is pretty unusable. > I'm not familiar with opendiff. Have you tried instead "fossil diff --tk"? Does that work for you? -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] gdiff/opendiff on os x: suppress unchanged files?
When using fossil gdiff on OS X, with opendiff as the gdiff command, diffs for all files are shown, even if there are no changes. This contrasts with behavior of opendiff with git/bzr, etc, which only show the changed files, which is preferrable. Is there a known workaround for this? Out of the box, gdiff on OS X with opendiff is pretty unusable. Cheers ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
