Diffuse Activity
Status: Beta
Brought to you by:
dtmoser
Activity for Diffuse
-
fitz posted a comment on discussion Help
Edge case, I know, but I have an application that started life in RCS, and migrated to Git. Long enough ago that I had forgotten that the RCS directory was there. I just recently started using diffuse, and tried a 'diffuse -m', and it found the old RCS version to compare against. I spent quite some time trying to figure out where version 1.17 came from... I think it would be nice if it was possible to specify the order that diffuse uses to select which version control system it tries first. That...
-
pum created ticket #64
Wrap
-
Daniel Kolar posted a comment on ticket #63
color contrast seems better IRRC, should be by default for everyone
-
Derrick Moser posted a comment on ticket #63
You can customise the colours using a resource file. Resources are described in chapter 4 of the manual: http://diffuse.sourceforge.net/manual.html To quickly try it out, create a ~/.config/diffuse/diffuserc file (or %HOME%.config\diffuse\diffuserc on Microsoft Windows) with the following contents then restart Diffuse (of course, you will likely wish to choose some more pleasing colours): color difference_1 1.0 0.0 0.0 float line_difference_alpha 0.5
-
Differences highlighting needs more contrast, so it is easier to spot
-
Craig created ticket #62
Option to automatically refresh changed files would be nice
-
suwoong.lee posted a comment on discussion Open Discussion
Hi could you help to use on Win10x64 to use full resource, I thinks "32bit code" limits the funtionality of this tool. hope that conversion to 64bit on Win10 also. Thanks a lot for share.
-
Aaron Peromsik posted a comment on discussion Open Discussion
I was sade to note that diffuse was removed from Ubuntu 20.04. Ubuntu normally just follows Debian, and Debian seems to have removed it due to the dependency on PyGTK. Has anyone evaluated how much work it would be to move to PyGObject? Or do I have to get used to Meld? I much prefer the way Diffuse handles aligning non-different regions, keyboard shortcuts, and probably other features I haven't yet noticed lacking in Meld.
-
Hakon created ticket #15
Diff between commit and staging
-
Michael Harvey posted a comment on ticket #29
diffuse -m still does not work. I have a patch that enables it to recurse git submodules with the -m option
-
I have created a patch that will do this for the text editor (but not for the GTK frame widgets)
-
kdraeder modified a comment on discussion Help
I've looked extensively for this feature, but haven't found it yet. It's different from Feature Request #20, but related to it. Please point me to it, if I missed it. Sometimes I have 2 files with the same line structure, but different contents. I want to compare files line to line, with no gaps inserted to line up similar lines. That way I can see how the corresponding content compares. As an example, if file1 is abc 123 ABC and file2 is 123 456 CDF I want it to align file1:abc with file2:123 file1:123...
-
I've looked extensively for this feature, but haven't found it yet. It's different from Feature Request #20, but related to it. Please point me to it, if I missed it. Sometimes I have 2 files with the same line structure, but different contents. I want to compare files line to line, with no gaps inserted to line up similar lines. That way I can see how the corresponding content compares. As an example, if file1 is abc 123 ABC and file2 is 123 456 CDF I want it to align file1:abc with file2:123 file1:123...
-
Chalda Pnuzig created ticket #61
Copy to all panel
-
Sam created ticket #60
Dark Theme?
-
ansa211 posted a comment on ticket #29
This issue actually seems to be solved in diffuse installed from source (I was using version 0.4.8-3 that came with my fresh kubuntu distribution, and there it is not fixed). I described the steps to install from source in https://sourceforge.net/p/diffuse/feature-requests/54/
-
A pane already exists for closing panes: https://sourceforge.net/p/diffuse/patches/13/ How to install diffuse from source, including the patch: First uninstall any existing diffuse installation (to make sure there are no collisions). svn checkout https://svn.code.sf.net/p/diffuse/code/trunk diffuse cd diffuse wget https://sourceforge.net/p/diffuse/patches/13/attachment/diffuse.patch patch -p0 diffuse.patch the patching program complains that some of the corrections in the patch have already been...
-
Thank you very much, this is great!
-
This issue is related to issue #1 diffuse don't honnor GIT_DIR in that git rev-parse --git-dir --is-inside-git-dir --is-inside-work-tree could be helpful here as well.
-
Dennis Miller posted a comment on ticket #30
Looks like you have done something to make Python 3 the default on your system or you are directly invoking it with Python 3, since this is Python 2 code. If you are using Python 3 in an active virtual environment, then you will get this error since the virtual environment sittings will override the Python 2 system default with Python 3. Mint 19.1 uses Python 2 as default so it should work fine. You will have to find out what you have done to cause it to be run under Python 3. In the meantime you...
-
KillerBeer created ticket #59
Enhances Selection Copy
-
Moisés Bites created ticket #30
Diffuse don't start in Linuxmint 19.1
-
diffuse cannot access history of a git submodule
-
Same experience here, would be nice if it worked like diffuse -m.
-
Added Pedro Albuquerque's Portuguese translation.
-
Pedro posted a comment on ticket #58
Here they are, thank you.
-
The file can be found here: https://sourceforge.net/p/diffuse/code/HEAD/tree/trunk/windows-installer/en.isl
-
Sure, no problem, just send me the file and I'll do it. Or let me know where I can find it.
-
Thank you for translating Diffuse into Portuguese! Could you also create a pt_PT.isl file? I can help create the file if you could provide Portuguese translations for the six strings found in "windows-installer/en.isl".
-
Bob Hepple modified a comment on ticket #57
Here's another diff for the 'src' VCS which also implements basic 'src' usage but adds support for diffuse -c 4 todo.org diffuse -m Again, this is against diffuse-0.4.8-7.fc28.noarch.
-
Here's another diff which also implements basic 'src' usage but adds support for diffuse -c 4 todo.org diffuse -m for the 'src' VCS. Again, this is against diffuse-0.4.8-7.fc28.noarch.
-
Here's another diff which also implements basic 'src' usage but also supports for 'diffuse -c 4 todo.org' and 'diffuse -m' with the 'src' VCS. Again, this is against diffuse-0.4.8-7.fc28.noarch.
-
pt_PT translation
-
Here's a diff which implements basic 'src' usage - it's a brute copy & edit of the 'svn' code against diffuse-0.4.8-7.fc28.noarch. The getCommitTemplate() function is perhaps bogus for 'src' but a simple 'diffuse -r 9 foo.org' works fine!!
-
Here's a diff which implements basic 'src' usage - it's a brute copy & edit of the 'svn' code against diffuse-0.4.8-7.fc28.noarch. The getCommitTemplate() function is perhaps bogus for 'src' but a simple 'diffuse -r 9 foo.org' works fine!! 0 16:53 Sync/ $ diff -u /usr/bin/diffuse ~/diffuse --- /usr/bin/diffuse 2018-02-07 16:54:02.000000000 +1000 +++ /home/bhepple/diffuse 2018-11-12 16:54:17.790789053 +1000 @@ -881,6 +881,7 @@ ('hg', 'Mercurial', 'hg'), ('mtn', 'Monotone', 'mtn'), ('rcs', 'RCS', None),...
-
Please add support for the 'src' VCS.
-
Thanks for offering to contribute a French translation! The code uses the standard gettext mechanism for localisation (i.e. po/mo files). Some instructions can be found in the "translations/README" file from the source code. There are two additional files that need localisation: a "fr.isl" file and an updated "diffuse.desktop" file (I can help create these if you can provide translations for the strings).
-
andré posted a comment on a wiki page
I'd like to contribute a french translation, but I don't know what tools are used. Since there are already some translations, I assume the code is internationalised. Is po/mo format used ? (What I've used most for translations)
-
InfoLibre created ticket #56
GTK 3 and Python 3 version
-
Improved performance of shlex.split replacement.
-
Fails with syntax error
-
eson modified a comment on ticket #14
Thanks! You're probably right. When I first removed existing mo file and then placed another copy into locale direction, translation worked just fine. Very strange bug I think. It was repeated severel times. I use Linux Mint 18.3 (ubuntu 16.04) and have never experienced this before.
-
Thanks! You're probably right. When I first removed existing mo file and then placed another copy into locale direction, translation worked just fine. Very strange bug I think. I use Linux Mint 18.3 (ubuntu 16.04) and have never experienced this before.
-
Åke, I just tried your changes and the translations for "Soft tab width" and "Tab width" both display correctly for me under Ubuntu 16.04 and Windows. I suspect you may have generated a diffuse.mo file while still working on your translations and that file was not overwritten when you completed your translations. Cheers,Derrick On Tuesday, January 2, 2018, 12:30:02 AM EST, eson eson57@users.sf.net wrote: Hi, Yes, I've found where those strings are used. What I ment was that they do not translate...
-
Diffuse no longer uses the Python's shlex module as it does not support
-
Added Åke Engelbrektson's Swedish translations.
-
Hi, Yes, I've found where those strings are used. What I ment was that they do not translate into swedish (see screens attached). Here's also the requested installer translations. It's perfectly allright to leave out the word "sammanfogningsverktyg" if translation strings are to long. Can't do it shorter. "Diffuse Merge Tool" "Diffuse sammanfogningsverktyg" "Uninstall Diffuse Merge Tool" "Avinstallera Diffuse sammanfogningsverktyg" "Open With Diffuse Merge Tool" "Öppna med Diffuse sammanfogningsverktyg"...
-
Hi, Yes, I've found where those strings are used. What I ment was that they do not translate into swedish (see screens attached). Here's also the requested installer translations. It's perfectly allright to leave out the word "sammanfogningsverktyg" if translation strings are to long. Can't do it shorter. "Diffuse Merge Tool" "Diffuse sammanfogningsverktyg" "Uninstall Diffuse Merge Tool" "Avinstallera Diffuse sammanfogningsverktyg" "Open With Diffuse Merge Tool" "Öppna med Diffuse sammanfogningsverktyg"...
-
Hi, Yes, I've found where those strings are used. What I ment was that they do not translate into swedish (see screens attached). Here's also the requested installer translations. It's perfectly allright to leave out the word "sammanfogningsverktyg" if translation strings are to long. Can't do it shorter. "Diffuse Merge Tool" "Diffuse sammanfogningsverktyg" "Uninstall Diffuse Merge Tool" "Avinstallera Diffuse sammanfogningsverktyg" "Open With Diffuse Merge Tool" "Öppna med Diffuse sammanfogningsverktyg"...
-
Åke, Thank you creating Swedish localisations for Diffuse. "Soft tab width" and "Tab width" are used in the preferences dialog (in the "Editor" and "Display" tabs respectively). Could I trouble you for a few other strings to be translated into Swedish? The Windows installer has six additional strings that should be translated, they are: "Diffuse Merge Tool""Uninstall Diffuse Merge Tool" "Open With Diffuse Merge Tool" "Main Files" "Windows Shell Integration" "Add the installation path to the search...
-
Swedish translation
-
Mircea Hossu posted a comment on ticket #1
I like this program but I miss this feature a lot. The program Meld has implemented a natural and efficient line-wrap editing behavior which could possibly serve as an example to follow. In case someone would like to attempt to implement this functionality, would it be possible to know some of the more difficult areas, to get an idea how big the task is? Thank you!
-
Jeff, The font size used by Diffuse can be changed via the preferences dialog (select the "Edit -> Preferences" menu item). The first item in the "Display" section is labeled "Font". This item lets you change the font (including the font's size). Diffuse will re-render the panes with the new font once you press the "OK" button on the preferences dialog to accept the changes. Cheers,Derrick
-
Jeff Vallis created ticket #55
Font size
-
use `python2` in shebang line
-
These should now be fixed.
-
This should now be fixed.
-
Corrected spelling error.
-
This should now be fixed.
-
Fixed some typos in comments and variable names.
-
Fixed typo in German description.
-
Corrected some copy-paste errors in translation comments.
-
philipp created ticket #27
Wrong comments in translations
-
Typo in German translations
-
Undefined variables in exception handlers
-
Spaiuc Dan Beespeed created ticket #13
Add close button on each pane.
-
Fixes for Python 2.7.13 & PyGTK 2.24.2
-
reorder, open and close panes
-
Dealing with long lines is the biggest problem I'd like to address. Unfortunately, I also need to migrate off of Python 2 and the deprecated PyGTK bindings so it will take some time before I reach a point where I can address the long line issues.
-
Dan Dascalescu posted a comment on discussion Open Discussion
While Sourceforge has been a good host for many open source projects, the vast majority of developers are on GitHub today. Google Code and Microsoft's Codeplex have both shut down and moved their projects to GitHub. This week I looked into the state of diff tools on Linux. Turns out there's no clear winner, but Diffuse is closest to that position. It needs more developers though, and GitHub can offer that much needed exposure.
-
GabF posted a comment on ticket #46
This feature is critical Agree, especially with a multi-comparison software like this where you can have ten files compared at the same time (and then 20 characters are enough to qualify a line as "long"). Unfortunately I fear this project is not going any farther.
-
This feature is critical! Diffuse doesn't support word wrapping, or splitting the view horizontally. Without a line vs. line diff, it's impossible to use for files with long lines. I've attached a screenshot of how CompareIt! does this.
-
This feature is critical! Diffuse doesn't support word wrapping, or splitting the view horizontally. Without a line vs. line diff, it's impossible to use for files with long lines. I've attached a screenshot of how CompareIt! does this.
-
Nicer "moved line" bubbles, a la Meld
-
Show only whitespace, but not newlines
-
The giraffe is a bit weird, but it's the only app I've ever used that has a photo of an animal as an icon, so it's distringuishable enough.
-
Rory Hewitt created ticket #51
Ignore certain differences
-
Fixed typo in command line argument.
-
The file path displayed above each pane is now ...
-
Specify python2 in #! line as scripts do not ye...
-
Specify python2 in #! line as Diffuse does not ...
-
naught101 created ticket #24
use `python2` in shebang line
-
joe created ticket #50
Alignment
-
Added Guillaume Hoffmann's Darcs support improv...
-
Added power of two support for literals.
-
Updated C++ syntax highlighting to terminate st...
-
Made Diffuse's resource file parsing robust aga...
-
Gur Stavi posted a comment on ticket #49
Development version works fine with git submodules. Thanks, Gur
-
I am not very familiar with Git submodules but I have committed an update to improve...
-
Added support for Git submodules.
-
Diffuse fail with git modules because .git is a file and not a directory
-
I agree with GabF, with one exception: when diffing very long files, the summary...
-
vim mode
-
I agree.
-
Leo modified a comment on discussion Open Discussion
Here is a quick patch, that adds a --recursive <directory> option. Usage: diffuse...
-
Here is a quick patch, that adds a --recursive <directory> option. Usage: diffuse...
-
Here is a quick patch, that adds a --recursive <directory> option. Usage: diffuse...
-
Here is a quick patch, that adds a --recursive <directory> option. Usage: diffuse...
-
workaround for git: .gitconfig [diff] tool = diffuse [difftool "diffuse"] cmd = <installationdir>/Diffuse/diffusew.exe...
-
workaround for git: .gitconfig [diff] tool = diffuse [difftool "diffuse"] cmd = <installationdir>/Diffuse/diffusew.exe...
1 >
