search

MightyCreak / diffuse

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
http://mightycreak.github.io/diffuse/
GNU General Public License v2.0
260 stars 46 forks source link

Port of Diffuse to macOS #165

Closed hugoholgersson closed 1 year ago

hugoholgersson commented 1 year ago

Hello there!

I understand this it the most up-to-date repo of Diffuse. It's nice to see that you have taken ownership and made it run with Python 3.

I have been using the tool since 2012, but on Linux. These days I often use macOS at work where I was missing Diffuse as my diff tool for git.

This is my basic port of Diffuse to macOS. Please take a look and accept.

/ Hugo

hugoholgersson commented 1 year ago

@chenrui333, would you like to review this PR?

I ask you because I saw your brew formula in https://github.com/MightyCreak/diffuse/pull/145. It would be awesome to have Diffuse added to brew. I hope these build changes will make it a little easier.

This PR also gives Diffuse more native-macOS feel, including a Dock icon and keyboard shortcuts. Next step could be to port Diffuse to Gtk4 which seems to have better support for the macOS menubar, and other things.

MightyCreak commented 1 year ago

Ok! I'm taking a look (at last! :sweat_smile: )

MightyCreak commented 1 year ago

I rebased your branch on master

chenrui333 commented 1 year ago

With this PR, the diffuse should be better put into homebrew-cask rather than homebrew-core.