TSE: Git: Diff

[knud van eeden]

Hello,

FYIO:

Here a proof of concept (=POC):

There was here a wish of comparing a file (e.g. PickDir.s) in my Subversion repository.

So I adapted this TSE macro svn.s to have that functionality

This by using my TSE macro I created:

 compblct.s 

(created in cooperation with Larry Hayes Smith)

which runs optionally between 1 and about 10 different diff executables).

That worked out great.

But this svn.s program is a great and especially a simple program,

so I wanted to have the same simple functionality as in it also for GIT.

So I asked ChatGPT to

> Create The Semware Editor Professional SAL program like this program for Subversion, but now equivalently for GIT

And already in the first iteration it supplied a working TSE program

which I named

 

 gitsvn.s

---

Workflow:

Note: The file svn.s has been attached FYIO.

Note: If you have used svn.s with SubVersion then this works about exactly the same but now in GIT:

1. You have a working directory for GIT with your files.

2. You have a GIT installation (E.g. I use CygWin git.exe)

3. Once you should have some diff programs installed (e.g. BeyondCompare, Total Commander, ...), (you have to adapt the path to these in compblct.s)

then compile once compblct.s

3. Compile and run the TSE program

    gitsvn.s

4. Supply the path to your working directory

    E.g. C:\TEMP\DDD01\

5. Supply the path to your executable

    E.g.

     G:\CYGWIN\bin\git.exe

6. That will automatically show a list of all your files in that GIT working directory

7. Scroll to the filename of interest

    E.g.

     foobar

8. Press <F5> to see its history

9. Select the version of interest

10. Press <Enter> to select the file

11. Say no to running the diff executables

12. Now run gitsvn.s again and select the same file again, it will show the versions again, select the 2nd version for the diff and press <Enter>

13. Now agree to running the diff executables

     1. Select and mark the whole first file and press <CtrlShift 1> when finished

     2. Navigate in TSE to the other file to diff

 

     3. Select and mark that whole file and press <CtrlShift 2> when finished

     4. It will then ask if you want to run that diff executable(s)

with friendly greetings

Knud van Eeden

repeat this and select the 2 files and run e.g. BeyondCompare