WinMerge 2011 is now at Bitbucket

Open discussion about WinMerge.

WinMerge 2011 is now at Bitbucket

Postby jtuc » Tue Aug 30, 2011 5:52 am

WinMerge 2011 is a fork of WinMerge that compiles without MFC.

The primary source code repository is located at
https://bitbucket.org/jtuc/winmerge2011

A nightly build created from latest sources is usually available at
http://www.geocities.co.jp/SiliconValley-SanJose/8165/unofficial_winmerge_nightly_builds.html

Please report bugs to the issue tracker at
https://bitbucket.org/jtuc/winmerge2011/issues

For compiling the ShellExtensionX64 with Visual C++ 2008 Express Edition, refer to
http://jenshuebel.wordpress.com/2009/02/12/visual-c-2008-express-edition-and-64-bit-targets

Big thanks to Jens for sharing his insights.

WinMerge 2011 includes approximately the features from WinMerge mainstream trunk.
A significant exception are plugins, which were ruled out due to unfortunate design flaws,
but added support for scriptlet based file transforms compensates well for that.

Share and enjoy.

Regards,
Jochen
Last edited by jtuc on Sun Oct 21, 2012 5:07 pm, edited 6 times in total.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: WinMerge 2011 Alpha Release

Postby kimmov » Tue Aug 30, 2011 6:29 am

Very interesting! It is cool to see somebody is still working hard with WinMerge! :)

I don't want to sound blunt but where are the sources? Can you upload them to BitBucket or GitHub (my own preferences, of course I'm happy with other services too!).

Considering that WinMerge 3 effort has been just some discussion and a bit of proof-of-concept code maybe this would be a good refresh for the project...

jtuc wrote:The most remarkable fact is that it compiles without MFC.

What UI toolkit it uses then? I'm very happy to hear this as this has been the major thing preventing lots of people contributing to the project and really refreshing the GUI.

jtuc wrote:The CRT is linked in statically, so end of redist annoyances.

I'm not sure this is a good idea after all. There's been some CRT updates because of vulnerabilities. And I think the CRT installing problem is now solved with the MSI installer. The annoying problem with the MSI installer was the size caused by MFC DLLs. But as MFC is now removed that is not problem.
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: WinMerge 2011 Alpha Release

Postby jtuc » Tue Aug 30, 2011 8:24 am

kimmov wrote:where are the sources?


Look for sources.7z inside archive.

Regarding UI, things of particular interest are H2O, which makes OS handles appear as if they were pointers to objects, and H2O2, which adds subclassing and methods to mimic MFC dialog data exchange. H2O and H2O2 share a set of decorator templates to implement most of the methods.

So none of the bloatworks which instantly come to mind, and which are no doubt beneficial when it comes to justifying designs to decision makers.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Updated Changelog

Postby jtuc » Sun Sep 04, 2011 10:31 am

0.2011.002.145 experimental
Changes since preceding release (not necessarily complete):
• Issue #4 Option to ignore folder structure when comparing recursively
http://winmerge.org/support/3405956 Support partial line filters
• Fix ClearCase issue with "Allow only one instance to run" option disabled
• Make FilterCommentsSet::FindCommentMarker() aware of escaped backslashes
• Make Tools > Filters command accessible through toolbar
• Fix issues as per http://winmerge.org/support/3512218

2011.002.117
Changes since preceding release (not necessarily complete):
• Deletions involving ghost lines could cause crash or improper undo
• Fix improper en/disabling of Save/Cut/Copy
• Leave the view open when the user VK_ESCAPEs from renaming an item
• Issue #15 Assume unicode if IsTextUnicode() returns TRUE regardless of flags
• A few more places to hide \\?\ and \\?\UNC\ prefixes from user interface
• Since 2011.002.027, empty files were unintentionally considered binary

2011.002.047
Changes since preceding release (not necessarily complete):
• Fix menu text formatting when applying a patch targeted at multiple files
• Issue #9 Drag and drop files\folders always overwrites Left selection
• Issue #8 Portuguese (pt-PT) translation update by David Cunha
• Issue #7 Multipe file compare windows option not working as designed
• Work around heksedit not repainting its sibling after deletions
• Fix numbers in status bar when stepping into archives from non-recursive view

2011.002.027
Changes since preceding release (not necessarily complete):
• If OS is 64-bit, register both 32-bit and 64-bit shell extensions (Issue #3)
• Merge https://bitbucket.org/sdottaka/winmerge ... e9539c763c
• Cosmetic: Rearrange Compare Statistics dialog for better comprehensibility
• Bypass UCS2 guesswork when there are no null bytes
• Issue #5 WM_MOUSEWHEEL caused crash when content was too small to scroll

2011.001.527
Changes since preceding release (not necessarily complete):
• Fix occasional out-of-bound array accesses after line deletions
• ShellExtension got easily confused by leftovers from previous invocation
• Fix F4 Navigation between line diffs for diff detail views
• File/folder selection controls were at times showing a wrong icon
• The menu bar was misaligning accelerator key underlines on Vista
• Number of replacements reported by replace dialog could be off by 1
• Fix issue #1: Can't expand Open File Dialog
• A space in the directory path was breaking the build process
• File transform scriptlet to add line numbers
• Fix issue #2: Scrolling by mouse wheel stops in middle of file
• Line revision numbers got lost when growing the undo stack
• Fix wrap at EOF logic for find/replace with an RE that matches BOL or EOL
• Undoing an insertion into a ghost line went wrong
• Fix enabling of Compare command when comparing a folder to itself
• LineDiffs logic was mistreating the line endings
• Fix MRU list issues
• Add a compiled help (CHM) file

0.2011.001.497 beta
Changes since preceding release (not necessarily complete):
• File transform scriptlet to drive xdoc2txt (http://shortlinks.de/4u23)
• Allow file transform scriptlets to show a config dialog prior to comparison
• Add icons to file/folder selection controls (adapted from Takashi's fork)
• Consolidate unicode detection in DetermineEncoding() (file unicoder.cpp)
• Fine-tune UCS-2 detection (in particular, don't assume UCS-2 from BOM only)
• Do text vs. binary classification uniformly for both quick and full compare
• Fix System32 build configuration for stack frames going beyond 4096 bytes
• Adjust width of some dropdown lists so as to prevent items from being clipped
• Make setup ARP aware, and offer removal of files from previous installation
• Feature Request #3422386 Allow editing path names when unknown
• Support archive vs. folder compare

0.2011.001.464 beta
Changes since preceding release (not necessarily complete):
• Make support for pathnames longer than 260 characters UNC-aware
• Hide \\?\ and \\?\UNC\ prefixes from user interface (work in progress)
• Remove an unwanted iframe border in printouts that has been noticed with IE8
• Make setup.wsf aware of Win64's Sysnative pseudo directory

0.2011.001.461 beta
Changes since preceding release (not necessarily complete):
• Compare As > Archive allows users to be more specific about how to open files
• Extensible "Compare As" menu to allow for script driven file transforms
• Make "Compare As" option available in Open dialog
• Simple UI to help tweak the ClearCase Type Manager map file
• Fix setup.hta for 64-bit (by disguising it as a .wsf)
• Patch #3065275 Detect UCS-2 (both endiannesses) without BOM
• Partial support for pathnames longer than 260 characters

0.2011.001.437 beta
Changes since preceding release (not necessarily complete):
• View > Context allows for limiting context above and below differences
• Tools > Compare Selection allows for comparing otherwise unaligned sections
• No longer duplicate the editor's undo/redo stack
• Fix broken repainting of editor margin area after invalidation
• Open print preview in an unadorned window to avoid "almost-maximizedness"
• Add file description to FileLocation structure to help fix side-effect coding
• Attempt to speed up print page preparation, albeit with no noticeable success
• Make WinMerge UI translation facility operable for print preview

0.2011.001.415 beta
Changes since preceding release (not necessarily complete):
• Applying of patches through drag & drop
• Dropping a single file onto the application window was causing a crash
• Print preview based on Internet Explorer backend with a custom print template
• Continued attempts to understand and fix comments filtering
• A DocFrame that was opened through ClearCase was not closing on Esc key press
• Handle absence of heksedit gracefully when user invokes Compare As > Binary

0.2011.001.371 beta
Changes since preceding release (not necessarily complete):
• Patch #3287270 Accepting command lines with quotes in the middle
• Patch #3066200 PatchDlg swap files (releated to bug #3043635)
• Bug #3348933 Search for string containing & goes wrong
• Continued attempts to understand and fix comments filtering
• Experimental System32 build configuration to share OS-provided MSVCRT.DLL
• Following mainstream code, DirView now shows local rather than UTC times
• Update PCRE to version 8.13
• Cleanups

0.2011.001.362 alpha
Shares most bugtures of mainstream code, except for (not necessarily complete):
• Support for plugins other than Merge7z and heksedit is discontinued
• A file with extension .flt~ no longer aborts scanning of Filters directory
• FileFilterMgr no longer disregards regexps which are not followed by ##
• DiffUtils and ByteCompare results are more consistent
• LineFilters no longer degrade folder compare performance
• Changing fonts for folder and file compare windows finally works as designed
• Some unstable aspects of unicode support start stabilizing
• Issue described in Patch #3281234 support of Alt+Down/Up in Diff Pane
• Bug #3108489 FolderCmp object instantiation degrades DirScan performance
• Bug #2010049 Memory leak from line filters (related to patch #3064882)
• Patch #3065283 "Swap Panes" (Ctrl+U)
• CMessageBoxDialog::CreateIconControl() was leaking bitmap handles
Last edited by jtuc on Sat Apr 07, 2012 7:46 pm, edited 22 times in total.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Updated list of download links

Postby jtuc » Sun Sep 04, 2011 10:36 am

Last edited by jtuc on Mon Sep 12, 2011 8:25 pm, edited 1 time in total.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: WinMerge 2011

Postby kimmov » Mon Sep 05, 2011 6:48 am

Can you tell me and others what are your plans with these versions? Are you going to keep developing it in private or synch to main repository later or what? Since you have basically rewritten the GUI code the sync to main repository would be quite a job.

I'm just wondering what we can do if we want to use your work in mainstream versions...
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: WinMerge 2011

Postby jtuc » Wed Sep 07, 2011 5:26 am

kimmov wrote:the sync to main repository would be quite a job.

What would be the point of such effort? Are you considering to restart maintenance of WinMerge 2?
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: WinMerge 2011

Postby kimmov » Wed Sep 07, 2011 5:59 am

jtuc wrote:
kimmov wrote:the sync to main repository would be quite a job.

What would be the point of such effort? Are you considering to restart maintenance of WinMerge 2?

No, I'm not.

But I'm wondering your current practices. There are free code hosting services but you still don't develop in open. And there are "real" download services but you upload to some rapidshare service... You have put serious amount of work to it but make it look like suspicious download at best. How many are ready to run executables they download from those services...
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: WinMerge 2011

Postby sdottaka » Thu Sep 08, 2011 2:49 pm

jtuc wrote:The alpha release of WinMerge 2011 is ready for download at
https://rapidshare.com/files/3188628739/WinMerge_0.2011.001.362_change_7z_to_exe_if_you_want_a_setup.7z.

The most remarkable fact is that it compiles without MFC.
The CRT is linked in statically, so end of redist annoyances.



Great!

kimmov wrote:There are free code hosting services but you still don't develop in open.


How about providing sf.net's SVN trunk or new branch for WinMerge 2011 development as WinMerge 2 series?
sf.net's repository isn't used for WinMerge 3 development .
sdottaka
 
Posts: 8
Joined: Tue Jan 13, 2009 3:41 am

Re: WinMerge 2011

Postby jameskosin » Fri Sep 09, 2011 4:21 am

Can't download... Someone wants my information to pay lots of money....
:oops:
jameskosin
 
Posts: 1
Joined: Fri Sep 09, 2011 4:20 am

Next

Return to Open Discussion

Who is online

Users browsing this forum: Bing [Bot] and 2 guests

cron