YoYoGames / GameMaker-Bugs

Public tracking for GameMaker bugs
26 stars 8 forks source link

External Diff Support in IDE outwith Source Control #2728

Open shdwcat opened 11 months ago

shdwcat commented 11 months ago

Is your feature request related to a problem?

If I want to diff two files, I have to navigate to the location of those files on disk (which is easiest via the IDE since the disk location doesn't match the folder structure) and then open my diffing program.

Describe the solution you'd like

Other tools often let you configure an external diffing tool and then provide a context menu option to invoke the diff. This works by providing control over command line parameters, with limited macro support. For example, here is the P4V (Perforce source control) section for setting up external diff: image In this example, %1 and %2 are macros for the two selected files

Ideally the solution also supports a Diff option for single files, as that can be used to do a diff in git for the current file changes against the committed version.

Describe alternatives you've considered

No response

Additional context

No response

stuckie commented 11 months ago

We have this in Preferences -> Plugins -> Source Control (Git) image

You can use it in the Source Control History window by double clicking the item you want to diff against the current version image

Or by going into the commit window and double clicking the item you want to check changes you've made image

And here is the manual page for setting it up: https://manual.gamemaker.io/monthly/en/#t=IDE_Tools%2FSource_Control%2FExternal_Merge_Diff_Tools.htm

Is there something else in particular that is missing?

stuckie commented 11 months ago

Closing as above. If there's something that we're missing, please describe what it is that you want.

shdwcat commented 11 months ago

That covers the second case (diffing against source control history), but not diffing two files against each other.

stuckie commented 11 months ago

Reopening as the original request is actually for Diff support outwith Source Control