ScriptUO

Scripting Resources & Utilities => ScriptUO Application => Screen images => Topic started by: TrailMyx on November 07, 2008, 03:46:58 PM

Title: Integrated DIFF
Post by: TrailMyx on November 07, 2008, 03:46:58 PM
I'm a big fan of source control programs.  For Windows, I love TortoiseSVN.  So I integrated TortoiseMerge:

(http://img267.imageshack.us/img267/7802/suodiffxp4.jpg)

Now there's a new menu where you can choose between files in memory, or files from disk (note you are still checking files from disk, so you'll need to save your work before DIFFing).

(http://img407.imageshack.us/img407/9193/suodiffpanelim8.jpg)

After that, you'll get a TortoiseMerge report that graphically represents your differences.

(http://img339.imageshack.us/img339/186/suodiffmergexy0.jpg)

In order to use this feature, you'll need to have TortoiseSVN (http://tortoisesvn.net/downloads) installed.

Oh and Cerveza, you're welcome.... :P

Title: Re: Integrated DIFF
Post by: Cerveza on November 08, 2008, 03:24:57 AM
Cool feature, I like a simpler compare, but TortoiseSVN will work.
Title: Re: Integrated DIFF
Post by: TrailMyx on November 08, 2008, 03:30:39 AM
You'll find that you can compare in different directories now with the interface I implemented.  I use DIFF all the time, especially before releasing a script to be sure I've removed any test code.  Really is an indispensable tool.

Like just about every feature in this thing so far, it's been one of those "man, wouldn't that be cool?"  At least I don't have to leave SUO to do it now..  heh
Title: Re: Integrated DIFF
Post by: 12TimesOver on November 10, 2008, 04:42:12 AM
Loving that you're adding so many cool features in SUO TM. It's getting more and more justifiable for me to be on scriptuo.com from work!!  :P

XII
Title: Re: Integrated DIFF
Post by: TrailMyx on November 10, 2008, 08:19:40 AM
Loving that you're adding so many cool features in SUO TM. It's getting more and more justifiable for me to be on scriptuo.com from work!!  :P

XII

Well you should have access to the beta so give it a test and see what you think.

Heh, yeh, with linux, VM and SouthPark discussions going on, how could your IT department cut the cord???
Title: Re: Integrated DIFF
Post by: Xclio on November 10, 2008, 08:22:37 AM
Wow, I missed this!  This will definitally rock especially when I am trying to figure out what I changed from version to version lol.
Title: Re: Integrated DIFF
Post by: TrailMyx on November 10, 2008, 08:25:28 AM
Wow, I missed this!  This will definitally rock especially when I am trying to figure out what I changed from version to version lol.

I'm working on integrating the full-blown SVN management capability of TortoiseSVN.  However, since it installs as a Windows service, you pretty much have SVN access wherever you right-click.  Plus Subversion can be a little bit confusing for the general scripting noobs out there.  :)
Title: Re: Integrated DIFF
Post by: Xclio on November 10, 2008, 08:33:19 AM
But we aren't noobs lol.  Subversion FTW!!!
Title: Re: Integrated DIFF
Post by: TrailMyx on November 10, 2008, 10:25:23 AM
But we aren't noobs lol.  Subversion FTW!!!

When I think back on all the time I wasted doing zip backups of software projects only to still screw something up, I get kinda sick.  I started using SourceSafe many moons ago, and have been sold on version control programs ever since.

Funny thing is many of the platfrom uber-expensive ones like TruTrack/TruChange are lame in comparison to the free ones like CVS or SVN.  I've been meaning to try out Git (http://git.or.cz/)
Title: Re: Integrated DIFF
Post by: Xclio on November 10, 2008, 10:44:29 AM
We use subversion here at work and it is so nice for keeping track of stuff everything.  We have alot of people doing development on the same things simultaniously so the ability to check in/check out documents really makes it nice so we don't end up with 8 different copies of the same version lol.  Version control is soo necessary but also one of the first to be overlooked.
Title: Re: Integrated DIFF
Post by: mosimo on January 19, 2009, 06:33:58 AM
This will be very handy for me. I do scripting at home and at work.
Title: Re: Integrated DIFF
Post by: TrailMyx on January 19, 2009, 11:53:32 PM
Having the diff integrated takes a step out for me since it will scan the scripts you have open within SUO.  TSVN installs as a windows service, so it's always available as a context selection when you Right-Click on the windows desktop, but then you have to make two selections and that's hard do do when those selections are in different directories.  Using SUO to make the selections for you makes it easier.
Title: Re: Integrated DIFF
Post by: TrailMyx on January 20, 2009, 12:03:49 AM
@12X:

I really think that McAfee is BONING you regarding this function.  I just installed TSVN using my newly installed Windows 7 beta VM and it works fine.  Not that I'm surprised that McAfee is screwing you....  I can't/won't/don't ask install McAfee to test this theory; I don't want it to hijack my computer (although it's not as bad as Norton...)
Title: Re: Integrated DIFF
Post by: 12TimesOver on January 20, 2009, 02:44:23 AM
I'll test today with McAfee disabled and see if it makes a difference. THen I'll test with a VM that has never had McAfee installed.

Title: Re: Integrated DIFF
Post by: TrailMyx on January 20, 2009, 08:36:00 AM
I'll test today with McAfee disabled and see if it makes a difference. THen I'll test with a VM that has never had McAfee installed.



I'm just jazzed to be able to use the word "BONING" in a sentence.  It's such a rarity!  :)

Good luck with that.
Title: Re: Integrated DIFF
Post by: 12TimesOver on January 20, 2009, 09:02:10 AM
I'll test today with McAfee disabled and see if it makes a difference. THen I'll test with a VM that has never had McAfee installed.



I'm just jazzed to be able to use the word "BONING" in a sentence.  It's such a rarity!  :)

Good luck with that.
Yes, I did catch that. Very nicely done there and congratulations! :P
Title: Re: Integrated DIFF
Post by: cgeorgemo on October 08, 2009, 05:07:04 PM
Plus Subversion can be a little bit confusing for the general scripting noobs out there.  :)
There he goes again......talking about me.
Title: Re: Integrated DIFF
Post by: Scrripty on October 09, 2009, 12:49:54 PM
I'm just jazzed to be able to use the word "BONING" in a sentence.  It's such a rarity!  :)

Good luck with that.

I don't want a McAffee boning either.  But I'd love to be in the SCRIPTUO BETA.... :)
Title: Re: Integrated DIFF
Post by: TrailMyx on October 09, 2009, 12:51:11 PM
You are in the beta...  Just nothing to BETA.  lol