|
From: <sdo...@us...> - 2007-01-10 15:10:12
|
Revision: 4027
http://svn.sourceforge.net/winmerge/?rev=4027&view=rev
Author: sdottaka
Date: 2007-01-10 07:10:02 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
BUG: [ 1631613 ] WinMerge crashes when editing code files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaleditview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 14:18:48 UTC (rev 4026)
+++ trunk/Src/Changes.txt 2007-01-10 15:10:02 UTC (rev 4027)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2007-01-10 Takashi
+ BUG: [ 1631613 ] WinMerge crashes when editing code files
+ Src/editlib: ccrystaleditview.cpp
+
+2007-01-10 Takashi
BUG: [ 1630630 ] Unexpected selection of text after changing pane
Src: MergeEditView.cpp
Modified: trunk/Src/editlib/ccrystaleditview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaleditview.cpp 2007-01-10 14:18:48 UTC (rev 4026)
+++ trunk/Src/editlib/ccrystaleditview.cpp 2007-01-10 15:10:02 UTC (rev 4027)
@@ -1641,7 +1641,7 @@
{
int nTabSize = GetTabSize ();
int nChars = nTabSize - nPos % nTabSize;
- pszInsertStr = (TCHAR *) _alloca (sizeof (TCHAR) * (nPos + nChars));
+ pszInsertStr = (TCHAR *) _alloca (sizeof (TCHAR) * (nPos + nChars + 1));
_tcsncpy (pszInsertStr, pszLineChars, nPos);
while (nChars--)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-10 16:40:52
|
Revision: 4029
http://svn.sourceforge.net/winmerge/?rev=4029&view=rev
Author: kimmov
Date: 2007-01-10 08:40:49 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
PATCH: [ 1631796 ] Use PCRE for filemask filtering
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DirDoc.h
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/Merge.cpp
trunk/Src/Merge.dsp
trunk/Src/Ucs2Utf8.cpp
trunk/Src/Ucs2Utf8.h
Removed Paths:
-------------
trunk/Src/Common/RegExp.cpp
trunk/Src/Common/RegExp.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Changes.txt 2007-01-10 16:40:49 UTC (rev 4029)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-10 Kimmo
+ PATCH: [ 1631796 ] Use PCRE for filemask filtering
+ Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
+ Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
+ Src/Common removed files: Regexp.cpp RegExp.h
+
2007-01-10 Takashi
BUG: [ 1631613 ] WinMerge crashes when editing code files
Src/editlib: ccrystaleditview.cpp
Deleted: trunk/Src/Common/RegExp.cpp
===================================================================
--- trunk/Src/Common/RegExp.cpp 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Common/RegExp.cpp 2007-01-10 16:40:49 UTC (rev 4029)
@@ -1,952 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// RegExp.cpp
-////////////////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-#include "RegExp.h"
-
-
-// Stub out TRACE macros if not available
-// (They are available for MFC)
-static void donothing() { }
-#ifndef TRACE0
-#define TRACE0(qq) if (0) donothing()
-#endif
-#ifndef TRACE1
-#define TRACE1(qq, rr) if (0) donothing()
-#endif
-
-// definition number opnd? meaning
-#define END 0 // no End of program.
-#define BOL 1 // no Match beginning of line.
-#define EOL 2 // no Match end of line.
-#define ANY 3 // no Match any character.
-#define ANYOF 4 // str Match any of these.
-#define ANYBUT 5 // str Match any but one of these.
-#define BRANCH 6 // node Match this, or the next..\&.
-#define BACK 7 // no "next" ptr points backward.
-#define EXACTLY 8 // str Match this string.
-#define NOTHING 9 // no Match empty string.
-#define STAR 10 // node Match this 0 or more times.
-#define PLUS 11 // node Match this 1 or more times.
-#define OPEN 20 // no Sub-RE starts here.
- // OPEN+1 is number 1, etc.
-#define CLOSE 30 // no Analogous to OPEN.
-
-// Utility definitions.
-
-#define FAIL(m) { regerror(m); return(NULL); }
-#define ISREPN(c) ((c) == '*' || (c) == '+' || (c) == '?')
-#define META _T("^$.[()|?+*\\")
-
-// Flags to be passed up and down.
-
-#define HASWIDTH 01 // Known never to match null string.
-#define SIMPLE 02 // Simple enough to be STAR/PLUS operand.
-#define SPSTART 04 // Starts with * or +.
-#define WORST 0 // Worst case.
-
-
-CRegExp::CRegExp()
-{
- bCompiled = FALSE;
- program = NULL;
- sFoundText = NULL;
-
- for( int i = 0; i < NSUBEXP; i++ )
- {
- startp[i] = NULL;
- endp[i] = NULL;
- }
-}
-
-CRegExp::~CRegExp()
-{
- delete program;
- delete sFoundText;
-}
-
-
-CRegExp* CRegExp::RegComp(const TCHAR *exp)
-{
- TCHAR *scan;
- int flags;
-
- if (exp == NULL)
- return NULL;
-
- bCompiled = TRUE;
-
- // First pass: determine size, legality.
- bEmitCode = FALSE;
- regparse = (TCHAR *)exp;
- regnpar = 1;
- regsize = 0L;
- regdummy[0] = NOTHING;
- regdummy[1] = regdummy[2] = 0;
- regcode = regdummy;
- if (reg(0, &flags) == NULL)
- return(NULL);
-
- // Allocate space.
- delete program;
- program = new TCHAR[regsize];
- memset( program, 0, regsize * sizeof(TCHAR) );
-
- if (program == NULL)
- return NULL;
-
- // Second pass: emit code.
- bEmitCode = TRUE;
- regparse = (TCHAR *)exp;
- regnpar = 1;
- regcode = program;
- if (reg(0, &flags) == NULL)
- return NULL;
-
- // Dig out information for optimizations.
- regstart = '\0'; // Worst-case defaults.
- reganch = 0;
- regmust = NULL;
- regmlen = 0;
- scan = program; // First BRANCH.
- if (OP(regnext(scan)) == END)
- {
- // Only one top-level choice.
- scan = OPERAND(scan);
-
- // Starting-point info.
- if (OP(scan) == EXACTLY)
- regstart = *OPERAND(scan);
- else if (OP(scan) == BOL)
- reganch = 1;
-
- // If there's something expensive in the r.e., find the
- // longest literal string that must appear and make it the
- // regmust. Resolve ties in favor of later strings, since
- // the regstart check works with the beginning of the r.e.
- // and avoiding duplication strengthens checking. Not a
- // strong reason, but sufficient in the absence of others.
-
- if (flags&SPSTART)
- {
- LPTSTR longest = NULL;
- size_t len = 0;
-
- for (; scan != NULL; scan = regnext(scan))
- if (OP(scan) == EXACTLY && _tcslen(OPERAND(scan)) >= len)
- {
- longest = OPERAND(scan);
- len = _tcslen(OPERAND(scan));
- }
- regmust = longest;
- regmlen = (int)len;
- }
- }
-
- return this;
-}
-
-// reg - regular expression, i.e. main body or parenthesized thing
-//
-// Caller must absorb opening parenthesis.
-//
-// Combining parenthesis handling with the base level of regular expression
-// is a trifle forced, but the need to tie the tails of the branches to what
-// follows makes it hard to avoid.
-
-
-
-TCHAR *CRegExp::reg(int paren, int *flagp)
-{
- TCHAR *ret;
- TCHAR *br;
- TCHAR *ender;
- int parno;
- int flags;
-
- *flagp = HASWIDTH; // Tentatively.
-
- if (paren)
- {
- // Make an OPEN node.
- if (regnpar >= NSUBEXP)
- {
- TRACE1("Too many (). NSUBEXP is set to %d\n", NSUBEXP );
- return NULL;
- }
- parno = regnpar;
- regnpar++;
- ret = regnode((TCHAR)(OPEN+parno));
- }
-
- // Pick up the branches, linking them together.
- br = regbranch(&flags);
- if (br == NULL)
- return(NULL);
- if (paren)
- regtail(ret, br); // OPEN -> first.
- else
- ret = br;
- *flagp &= ~(~flags&HASWIDTH); // Clear bit if bit 0.
- *flagp |= flags&SPSTART;
- while (*regparse == '|') {
- regparse++;
- br = regbranch(&flags);
- if (br == NULL)
- return(NULL);
- regtail(ret, br); // BRANCH -> BRANCH.
- *flagp &= ~(~flags&HASWIDTH);
- *flagp |= flags&SPSTART;
- }
-
- // Make a closing node, and hook it on the end.
- ender = regnode((TCHAR)((paren) ? CLOSE+parno : END));
- regtail(ret, ender);
-
- // Hook the tails of the branches to the closing node.
- for (br = ret; br != NULL; br = regnext(br))
- regoptail(br, ender);
-
- // Check for proper termination.
- if (paren && *regparse++ != ')')
- {
- TRACE0("unterminated ()\n");
- return NULL;
- }
- else if (!paren && *regparse != '\0')
- {
- if (*regparse == ')')
- {
- TRACE0("unmatched ()\n");
- return NULL;
- }
- else
- {
- TRACE0("internal error: junk on end\n");
- return NULL;
- }
- // NOTREACHED
- }
-
- return(ret);
-}
-
-
-
-
-//
-// regbranch - one alternative of an | operator
-//
-// Implements the concatenation operator.
-
-TCHAR *CRegExp::regbranch(int *flagp)
-{
- TCHAR *ret;
- TCHAR *chain;
- TCHAR *latest;
- int flags;
- int c;
-
- *flagp = WORST; // Tentatively.
-
- ret = regnode(BRANCH);
- chain = NULL;
- while ((c = *regparse) != '\0' && c != '|' && c != ')') {
- latest = regpiece(&flags);
- if (latest == NULL)
- return(NULL);
- *flagp |= flags&HASWIDTH;
- if (chain == NULL) // First piece.
- *flagp |= flags&SPSTART;
- else
- regtail(chain, latest);
- chain = latest;
- }
- if (chain == NULL) // Loop ran zero times.
- (void) regnode(NOTHING);
-
- return(ret);
-}
-
-//
-// regpiece - something followed by possible [*+?]
-//
-// Note that the branching code sequences used for ? and the general cases
-// of * and + are somewhat optimized: they use the same NOTHING node as
-// both the endmarker for their branch list and the body of the last branch.
-// It might seem that this node could be dispensed with entirely, but the
-// endmarker role is not redundant.
-
-TCHAR *CRegExp::regpiece(int *flagp)
-{
- TCHAR *ret;
- TCHAR op;
- TCHAR *next;
- int flags;
-
- ret = regatom(&flags);
- if (ret == NULL)
- return(NULL);
-
- op = *regparse;
- if (!ISREPN(op)) {
- *flagp = flags;
- return(ret);
- }
-
- if (!(flags&HASWIDTH) && op != '?')
- {
- TRACE0("*+ operand could be empty\n");
- return NULL;
- }
-
- switch (op) {
- case '*': *flagp = WORST|SPSTART; break;
- case '+': *flagp = WORST|SPSTART|HASWIDTH; break;
- case '?': *flagp = WORST; break;
- }
-
- if (op == '*' && (flags&SIMPLE))
- reginsert(STAR, ret);
- else if (op == '*') {
- // Emit x* as (x&|), where & means "self".
- reginsert(BRANCH, ret); // Either x
- regoptail(ret, regnode(BACK)); // and loop
- regoptail(ret, ret); // back
- regtail(ret, regnode(BRANCH)); // or
- regtail(ret, regnode(NOTHING)); // null.
- } else if (op == '+' && (flags&SIMPLE))
- reginsert(PLUS, ret);
- else if (op == '+') {
- // Emit x+ as x(&|), where & means "self".
- next = regnode(BRANCH); // Either
- regtail(ret, next);
- regtail(regnode(BACK), ret); // loop back
- regtail(next, regnode(BRANCH)); // or
- regtail(ret, regnode(NOTHING)); // null.
- } else if (op == '?') {
- // Emit x? as (x|)
- reginsert(BRANCH, ret); // Either x
- regtail(ret, regnode(BRANCH)); // or
- next = regnode(NOTHING); // null.
- regtail(ret, next);
- regoptail(ret, next);
- }
- regparse++;
- if (ISREPN(*regparse))
- {
- TRACE0("nested *?+\n");
- return NULL;
- }
-
- return(ret);
-}
-
-//
-// regatom - the lowest level
-//
-// Optimization: gobbles an entire sequence of ordinary characters so that
-// it can turn them into a single node, which is smaller to store and
-// faster to run. Backslashed characters are exceptions, each becoming a
-// separate node; the code is simpler that way and it's not worth fixing.
-
-TCHAR *CRegExp::regatom(int *flagp)
-{
- TCHAR *ret;
- int flags;
-
- *flagp = WORST; // Tentatively.
-
- switch (*regparse++) {
- case '^':
- ret = regnode(BOL);
- break;
- case '$':
- ret = regnode(EOL);
- break;
- case '.':
- ret = regnode(ANY);
- *flagp |= HASWIDTH|SIMPLE;
- break;
- case '[': {
- int range;
- int rangeend;
- int c;
-
- if (*regparse == '^') { // Complement of range.
- ret = regnode(ANYBUT);
- regparse++;
- } else
- ret = regnode(ANYOF);
- if ((c = *regparse) == ']' || c == '-') {
- regc((TCHAR)c);
- regparse++;
- }
- while ((c = *regparse++) != '\0' && c != ']') {
- if (c != _T('-'))
- regc((TCHAR)c);
- else if ((c = *regparse) == ']' || c == '\0')
- regc(_T('-'));
- else
- {
- range = (unsigned) (TCHAR)*(regparse-2);
- rangeend = (unsigned) (TCHAR)c;
- if (range > rangeend)
- {
- TRACE0("invalid [] range\n");
- return NULL;
- }
- for (range++; range <= rangeend; range++)
- regc((TCHAR)range);
- regparse++;
- }
- }
- regc('\0');
- if (c != ']')
- {
- TRACE0("unmatched []\n");
- return NULL;
- }
- *flagp |= HASWIDTH|SIMPLE;
- break;
- }
- case '(':
- ret = reg(1, &flags);
- if (ret == NULL)
- return(NULL);
- *flagp |= flags&(HASWIDTH|SPSTART);
- break;
- case '\0':
- case '|':
- case ')':
- // supposed to be caught earlier
- TRACE0("internal error: \\0|) unexpected\n");
- return NULL;
- break;
- case '?':
- case '+':
- case '*':
- TRACE0("?+* follows nothing\n");
- return NULL;
- break;
- case '\\':
- if (*regparse == '\0')
- {
- TRACE0("trailing \\\n");
- return NULL;
- }
- ret = regnode(EXACTLY);
- regc(*regparse++);
- regc('\0');
- *flagp |= HASWIDTH|SIMPLE;
- break;
- default: {
- size_t len;
- TCHAR ender;
-
- regparse--;
- len = _tcscspn(regparse, META);
- if (len == 0)
- {
- TRACE0("internal error: strcspn 0\n");
- return NULL;
- }
- ender = *(regparse+len);
- if (len > 1 && ISREPN(ender))
- len--; // Back off clear of ?+* operand.
- *flagp |= HASWIDTH;
- if (len == 1)
- *flagp |= SIMPLE;
- ret = regnode(EXACTLY);
- for (; len > 0; len--)
- regc(*regparse++);
- regc('\0');
- break;
- }
- }
-
- return(ret);
-}
-
-
-
-// reginsert - insert an operator in front of already-emitted operand
-//
-// Means relocating the operand.
-// Adopted UNICODE fixes by Russell Moss
-
-void CRegExp::reginsert(TCHAR op, TCHAR *opnd)
-{
- TCHAR *place;
-
- if (!bEmitCode) {
- regsize += ( sizeof(short) + 2 - sizeof(TCHAR) ) ;
- return;
- }
-
- (void) memmove(opnd+( sizeof(short) + 2 - sizeof(TCHAR) ), opnd, (size_t)((regcode - opnd)*sizeof(TCHAR)));
- regcode += ( sizeof(short) + 2 - sizeof(TCHAR) ) ;
-
- place = opnd; // Op node, where operand used to be.
- *place++ = op;
- *place++ = '\0';
-#ifndef _UNICODE
- *place++ = '\0';
-#endif // _UNICODE
-}
-
-//
-// regtail - set the next-pointer at the end of a node chain
-
-void CRegExp::regtail(TCHAR *p, TCHAR *val)
-{
- TCHAR *scan;
- TCHAR *temp;
-// int offset;
-
- if (!bEmitCode)
- return;
-
- // Find last node.
- for (scan = p; (temp = regnext(scan)) != NULL; scan = temp)
- continue;
-
- *((short *)(scan+1)) = (short)((OP(scan) == BACK) ? scan - val : val - scan);
-}
-
-
-// regoptail - regtail on operand of first argument; nop if operandless
-
-void CRegExp::regoptail(TCHAR *p, TCHAR *val)
-{
- // "Operandless" and "op != BRANCH" are synonymous in practice.
- if (!bEmitCode || OP(p) != BRANCH)
- return;
- regtail(OPERAND(p), val);
-}
-
-
-// RegFind - match a regexp against a string
-// Returns - Returns position of regexp or -1
-// if regular expression not found
-// Note - The regular expression should have been
-// previously compiled using RegComp
-int CRegExp::RegFind(const TCHAR *str)
-{
- TCHAR *string = (TCHAR *)str; // avert const poisoning
- TCHAR *s;
-
- // Delete any previously stored found string
- delete sFoundText;
- sFoundText = NULL;
-
- // Be paranoid.
- if(string == NULL)
- {
- TRACE0("NULL argument to regexec\n");
- return(-1);
- }
-
- // Check validity of regex
- if (!bCompiled)
- {
- TRACE0("No regular expression provided yet.\n");
- return(-1);
- }
-
- // If there is a "must appear" string, look for it.
- if (regmust != NULL && _tcsstr(string, regmust) == NULL)
- return(-1);
-
- // Mark beginning of line for ^
- regbol = string;
-
- // Simplest case: anchored match need be tried only once.
- if (reganch)
- {
- if( regtry(string) )
- {
- // Save the found substring in case we need it
- sFoundText = new TCHAR[GetFindLen()+1];
- sFoundText[GetFindLen()] = '\0';
- _tcsncpy(sFoundText, string, GetFindLen() );
-
- return 0;
- }
- //String not found
- return -1;
- }
-
- // Messy cases: unanchored match.
- if (regstart != '\0')
- {
- // We know what TCHAR it must start with.
- for (s = string; s != NULL; s = _tcschr(s+1, regstart))
- if (regtry(s))
- {
- int nPos = s-str;
-
- // Save the found substring in case we need it later
- sFoundText = new TCHAR[GetFindLen()+1];
- sFoundText[GetFindLen()] = '\0';
- _tcsncpy(sFoundText, s, GetFindLen() );
-
- return nPos;
- }
- return -1;
- }
- else
- {
- // We don't -- general case
- for (s = string; !regtry(s); s++)
- if (*s == '\0')
- return(-1);
-
- int nPos = s-str;
-
- // Save the found substring in case we need it later
- sFoundText = new TCHAR[GetFindLen()+1];
- sFoundText[GetFindLen()] = '\0';
- _tcsncpy(sFoundText, s, GetFindLen() );
-
- return nPos;
- }
- // NOTREACHED
-}
-
-
-// regtry - try match at specific point
-
-int CRegExp::regtry(TCHAR *string)
-{
- int i;
- TCHAR **stp;
- TCHAR **enp;
-
- reginput = string;
-
- stp = startp;
- enp = endp;
- for (i = NSUBEXP; i > 0; i--)
- {
- *stp++ = NULL;
- *enp++ = NULL;
- }
- if (regmatch(program))
- {
- startp[0] = string;
- endp[0] = reginput;
- return(1);
- }
- else
- return(0);
-}
-
-// regmatch - main matching routine
-//
-// Conceptually the strategy is simple: check to see whether the current
-// node matches, call self recursively to see whether the rest matches,
-// and then act accordingly. In practice we make some effort to avoid
-// recursion, in particular by going through "ordinary" nodes (that don't
-// need to know whether the rest of the match failed) by a loop instead of
-// by recursion.
-
-int CRegExp::regmatch(TCHAR *prog)
-{
- TCHAR *scan; // Current node.
- TCHAR *next; // Next node.
-
- for (scan = prog; scan != NULL; scan = next) {
- next = regnext(scan);
-
- switch (OP(scan)) {
- case BOL:
- if (reginput != regbol)
- return(0);
- break;
- case EOL:
- if (*reginput != '\0')
- return(0);
- break;
- case ANY:
- if (*reginput == '\0')
- return(0);
- reginput++;
- break;
- case EXACTLY: {
- size_t len;
- TCHAR *const opnd = OPERAND(scan);
-
- // Inline the first character, for speed.
- if (*opnd != *reginput)
- return(0);
- len = _tcslen(opnd);
- if (len > 1 && _tcsncmp(opnd, reginput, len) != 0)
- return(0);
- reginput += len;
- break;
- }
- case ANYOF:
- if (*reginput == '\0' ||
- _tcschr(OPERAND(scan), *reginput) == NULL)
- return(0);
- reginput++;
- break;
- case ANYBUT:
- if (*reginput == '\0' ||
- _tcschr(OPERAND(scan), *reginput) != NULL)
- return(0);
- reginput++;
- break;
- case NOTHING:
- break;
- case BACK:
- break;
- case OPEN+1: case OPEN+2: case OPEN+3:
- case OPEN+4: case OPEN+5: case OPEN+6:
- case OPEN+7: case OPEN+8: case OPEN+9: {
- const int no = OP(scan) - OPEN;
- TCHAR *const input = reginput;
-
- if (regmatch(next)) {
- // Don't set startp if some later
- // invocation of the same parentheses
- // already has.
-
- if (startp[no] == NULL)
- startp[no] = input;
- return(1);
- } else
- return(0);
- break;
- }
- case CLOSE+1: case CLOSE+2: case CLOSE+3:
- case CLOSE+4: case CLOSE+5: case CLOSE+6:
- case CLOSE+7: case CLOSE+8: case CLOSE+9: {
- const int no = OP(scan) - CLOSE;
- TCHAR *const input = reginput;
-
- if (regmatch(next)) {
- // Don't set endp if some later
- // invocation of the same parentheses
- // already has.
-
- if (endp[no] == NULL)
- endp[no] = input;
- return(1);
- } else
- return(0);
- break;
- }
- case BRANCH: {
- TCHAR *const save = reginput;
-
- if (OP(next) != BRANCH) // No choice.
- next = OPERAND(scan); // Avoid recursion.
- else {
- while (OP(scan) == BRANCH) {
- if (regmatch(OPERAND(scan)))
- return(1);
- reginput = save;
- scan = regnext(scan);
- }
- return(0);
- // NOTREACHED
- }
- break;
- }
- case STAR:
- case PLUS: {
- const TCHAR nextch =
- (OP(next) == EXACTLY) ? *OPERAND(next) : '\0';
- size_t no;
- TCHAR *const save = reginput;
- const size_t min = (OP(scan) == STAR) ? 0 : 1;
-
- for (no = regrepeat(OPERAND(scan)) + 1; no > min; no--) {
- reginput = save + no - 1;
- // If it could work, try it.
- if (nextch == '\0' || *reginput == nextch)
- if (regmatch(next))
- return(1);
- }
- return(0);
- break;
- }
- case END:
- return(1); // Success!
- break;
- default:
- TRACE0("regexp corruption\n");
- return(0);
- break;
- }
- }
-
- // We get here only if there's trouble -- normally "case END" is
- // the terminating point.
-
- TRACE0("corrupted pointers\n");
- return(0);
-}
-
-
-// regrepeat - report how many times something simple would match
-
-size_t CRegExp::regrepeat(TCHAR *node)
-{
- size_t count;
- TCHAR *scan;
- TCHAR ch;
-
- switch (OP(node))
- {
- case ANY:
- return(_tcslen(reginput));
- break;
- case EXACTLY:
- ch = *OPERAND(node);
- count = 0;
- for (scan = reginput; *scan == ch; scan++)
- count++;
- return(count);
- break;
- case ANYOF:
- return(_tcsspn(reginput, OPERAND(node)));
- break;
- case ANYBUT:
- return(_tcscspn(reginput, OPERAND(node)));
- break;
- default: // Oh dear. Called inappropriately.
- TRACE0("internal error: bad call of regrepeat\n");
- return(0); // Best compromise.
- break;
- }
- // NOTREACHED
-}
-
-// regnext - dig the "next" pointer out of a node
-
-TCHAR *CRegExp::regnext(TCHAR *p)
-{
- const short &offset = *((short*)(p+1));
-
- if (offset == 0)
- return(NULL);
-
- return((OP(p) == BACK) ? p-offset : p+offset);
-}
-
-// GetReplaceString - Converts a replace expression to a string
-// Returns - Pointer to newly allocated string
-// Caller is responsible for deleting it
-TCHAR* CRegExp::GetReplaceString( const TCHAR* sReplaceExp )
-{
- TCHAR *src = (TCHAR *)sReplaceExp;
- TCHAR *buf;
- TCHAR c;
- int no;
- size_t len;
-
- if( sReplaceExp == NULL || sFoundText == NULL )
- return NULL;
-
-
- // First compute the length of the string
- int replacelen = 0;
- while ((c = *src++) != '\0')
- {
- if (c == '&')
- no = 0;
- else if (c == '\\' && _istdigit(*src))
- no = *src++ - '0';
- else
- no = -1;
-
- if (no < 0)
- {
- // Ordinary character.
- if (c == '\\' && (*src == '\\' || *src == '&'))
- c = *src++;
- replacelen++;
- }
- else if (startp[no] != NULL && endp[no] != NULL &&
- endp[no] > startp[no])
- {
- // Get tagged expression
- len = endp[no] - startp[no];
- replacelen += len;
- }
- }
-
- // Now allocate buf
- buf = new TCHAR[replacelen+1];
- if( buf == NULL )
- return NULL;
-
- TCHAR* sReplaceStr = buf;
-
- // Add null termination
- buf[replacelen] = '\0';
-
- // Now we can create the string
- src = (TCHAR *)sReplaceExp;
- while ((c = *src++) != '\0')
- {
- if (c == '&')
- no = 0;
- else if (c == '\\' && _istdigit(*src))
- no = *src++ - '0';
- else
- no = -1;
-
- if (no < 0)
- {
- // Ordinary character.
- if (c == '\\' && (*src == '\\' || *src == '&'))
- c = *src++;
- *buf++ = c;
- }
- else if (startp[no] != NULL && endp[no] != NULL &&
- endp[no] > startp[no])
- {
- // Get tagged expression
- len = endp[no] - startp[no];
- int tagpos = startp[no] - startp[0];
-
- _tcsncpy(buf, sFoundText + tagpos, len);
- buf += len;
- }
- }
-
- return sReplaceStr;
-}
-
-//Here's a function that will do global search and replace using regular expressions. Note that the CStringEx class described in the earlier section is being used here. The main reason for using CStringEx is that it provides the Replace() function which makes our task easier.
-
-/*int RegSearchReplace( CStringEx& string, LPCTSTR sSearchExp,
- LPCTSTR sReplaceExp )
-{
- int nPos = 0;
- int nReplaced = 0;
- CRegExp r;
- LPTSTR str = (LPTSTR)(LPCTSTR)string;
-
- r.RegComp( sSearchExp );
- while( (nPos = r.RegFind((LPTSTR)str)) != -1 )
- {
- nReplaced++;
- TCHAR *pReplaceStr = r.GetReplaceString( sReplaceExp );
-
- int offset = str-(LPCTSTR)string+nPos;
- string.Replace( offset, r.GetFindLen(),
- pReplaceStr );
-
- // Replace might have caused a reallocation
- str = (LPTSTR)(LPCTSTR)string + offset + _tcslen(pReplaceStr);
- delete pReplaceStr;
- }
- return nReplaced;
-}*/
-
Deleted: trunk/Src/Common/RegExp.h
===================================================================
--- trunk/Src/Common/RegExp.h 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Common/RegExp.h 2007-01-10 16:40:49 UTC (rev 4029)
@@ -1,136 +0,0 @@
- ////////////////////////////////////////////////////////////////////////
-// RegExp.h
-//
-// This code has been derived from work by Henry Spencer.
-// The main changes are
-// 1. All char variables and functions have been changed to TCHAR
-// counterparts
-// 2. Added GetFindLen() & GetReplaceString() to enable search
-// and replace operations.
-// 3. And of course, added the C++ Wrapper
-//
-// Comments from Russell Moss who posted UNICODE fixes to codeguru, herein adopted:
-// Both CRegExp::regnode and CRegExp::reginsert were leaving
-// 2 "locations" for a short. In the case of UNICODE, a
-// TCHAR is a short so leaving room for a short is equivalent
-// to skipping only one TCHAR
-//
-//
-// The original copyright notice follows:
-//
-// Copyright (c) 1986, 1993, 1995 by University of Toronto.
-// Written by Henry Spencer. Not derived from licensed software.
-//
-// Permission is granted to anyone to use this software for any
-// purpose on any computer system, and to redistribute it in any way,
-// subject to the following restrictions:
-//
-// 1. The author is not responsible for the consequences of use of
-// this software, no matter how awful, even if they arise
-// from defects in it.
-//
-// 2. The origin of this software must not be misrepresented, either
-// by explicit claim or by omission.
-//
-// 3. Altered versions must be plainly marked as such, and must not
-// be misrepresented (by explicit claim or omission) as being
-// the original software.
-//
-// 4. This notice must not be removed or altered.
-/////////////////////////////////////////////////////////////////////////////
-#ifndef REGEXP_H
-#define REGEXP_H
-
-#define NSUBEXP 10
-
-
-class CRegExp
-{
-public:
- CRegExp();
- ~CRegExp();
-
- CRegExp *RegComp( const TCHAR *re );
- int RegFind(const TCHAR *str);
- TCHAR* GetReplaceString( const TCHAR* sReplaceExp );
- int GetFindLen()
- {
- if( startp[0] == NULL || endp[0] == NULL )
- return 0;
-
- return endp[0] - startp[0];
- }
-
-
-private:
- TCHAR *regnext(TCHAR *node);
- void reginsert(TCHAR op, TCHAR *opnd);
-
- int regtry(TCHAR *string);
- int regmatch(TCHAR *prog);
- size_t regrepeat(TCHAR *node);
- TCHAR *reg(int paren, int *flagp);
- TCHAR *regbranch(int *flagp);
- void regtail(TCHAR *p, TCHAR *val);
- void regoptail(TCHAR *p, TCHAR *val);
- TCHAR *regpiece(int *flagp);
- TCHAR *regatom(int *flagp);
-
- // Inline functions
-private:
- TCHAR OP(TCHAR *p) {return *p;};
- TCHAR *OPERAND( TCHAR *p) {return (TCHAR*)((short *)(p+1)+1); };
-
- // regc - emit (if appropriate) a byte of code
- void regc(TCHAR b)
- {
- if (bEmitCode)
- *regcode++ = b;
- else
- regsize++;
- };
-
- // regnode - emit a node
- TCHAR * regnode(TCHAR op)
- {
- if (!bEmitCode) {
- regsize += ( sizeof(short) + 2 - sizeof(TCHAR) ) ;
- return regcode;
- }
-
- *regcode++ = op;
- *regcode++ = _T('\0'); /* Null next pointer. */
-#ifndef _UNICODE
- *regcode++ = _T('\0');
-#endif // _UNICODE
-
- return regcode - (sizeof(short) + 2 - sizeof(TCHAR)) ;
- };
-
-
-private:
- BOOL bEmitCode;
- BOOL bCompiled;
- TCHAR *sFoundText;
-
- TCHAR *startp[NSUBEXP];
- TCHAR *endp[NSUBEXP];
- TCHAR regstart; // Internal use only.
- TCHAR reganch; // Internal use only.
- TCHAR *regmust; // Internal use only.
- int regmlen; // Internal use only.
- TCHAR *program; // Unwarranted chumminess with compiler.
-
- TCHAR *regparse; // Input-scan pointer.
- int regnpar; // () count.
- TCHAR *regcode; // Code-emit pointer; \xAEdummy = don't.
- TCHAR regdummy[3]; // NOTHING, 0 next ptr
- long regsize; // Code size.
-
- TCHAR *reginput; // String-input pointer.
- TCHAR *regbol; // Beginning of input, for ^ check.
-};
-
-
-#endif
-
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/DiffWrapper.cpp 2007-01-10 16:40:49 UTC (rev 4029)
@@ -1395,18 +1395,8 @@
m_pFilterList->RemoveAllFilters();
if (!filterStr.IsEmpty())
{
-#ifdef UNICODE
- // Get the size of UTF-8 string
- int reg_len = TransformUcs2ToUtf8(filterStr, _tcslen(filterStr), NULL, 0);
- ++reg_len; // Space for zero at end
+ char * regexp_utf = UCS2UTF8_ConvertToUtf8(filterStr);
- char * regexp_utf = new char[reg_len];
- ZeroMemory(regexp_utf, reg_len);
- reg_len = TransformUcs2ToUtf8(filterStr, _tcslen(filterStr), regexp_utf, reg_len);
-#else
- char *regexp_utf = strdup(filterStr);
-#endif
-
// Add every "line" of regexps to regexp list
char * token;
const char sep[] = "\r\n";
@@ -1416,7 +1406,7 @@
m_pFilterList->AddRegExp(token);
token = strtok(NULL, sep);
}
- delete [] regexp_utf;
+ UCS2UTF8_Dealloc(regexp_utf);
}
}
Modified: trunk/Src/DirDoc.h
===================================================================
--- trunk/Src/DirDoc.h 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/DirDoc.h 2007-01-10 16:40:49 UTC (rev 4029)
@@ -37,10 +37,6 @@
#include "PluginManager.h"
#endif
-#ifndef REGEXP_H
-#include "RegExp.h"
-#endif
-
class CDirView;
class CMergeDoc;
typedef CTypedPtrList<CPtrList, CMergeDoc *> MergeDocPtrList;
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/FileFilterHelper.cpp 2007-01-10 16:40:49 UTC (rev 4029)
@@ -23,10 +23,11 @@
// $Id$
#include "stdafx.h"
+#include "Ucs2Utf8.h"
+#include "FilterList.h"
#include "FileInfo.h"
#include "FileFilterMgr.h"
#include "FileFilterHelper.h"
-#include "RegExp.h"
#include "Coretools.h"
#include "paths.h"
@@ -40,9 +41,10 @@
* @brief Constructor, creates new filtermanager.
*/
FileFilterHelper::FileFilterHelper()
+: m_pMaskFilter(NULL)
+, m_bUseMask(TRUE)
{
m_fileFilterMgr = new FileFilterMgr;
- m_bUseMask = TRUE;
}
/**
@@ -51,6 +53,7 @@
FileFilterHelper::~FileFilterHelper()
{
delete m_fileFilterMgr;
+ delete m_pMaskFilter;
}
/**
@@ -171,20 +174,42 @@
/**
* @brief Select between mask and filterfile.
+ * @param [in] bUseMask If TRUE we use mask instead of filter files.
*/
void FileFilterHelper::UseMask(BOOL bUseMask)
{
m_bUseMask = bUseMask;
+ if (m_bUseMask)
+ {
+ if (m_pMaskFilter == NULL)
+ {
+ m_pMaskFilter = new FilterList;
+ }
+ }
+ else
+ {
+ delete m_pMaskFilter;
+ m_pMaskFilter = NULL;
+ }
}
/**
- * @brief Set filemask ("*.h *.cpp")
+ * @brief Set filemask for filtering.
+ * @param [in] strMask Mask to set (e.g. *.cpp;*.h).
*/
void FileFilterHelper::SetMask(LPCTSTR strMask)
{
+ if (!m_bUseMask)
+ {
+ _RPTF0(_CRT_ERROR, "Filter mask tried to set when masks disabled!");
+ return;
+ }
m_sMask = strMask;
CString regExp = ParseExtensions(strMask);
- m_rgx.RegComp(regExp);
+
+ char * regexp_utf = UCS2UTF8_ConvertToUtf8(regExp);
+ m_pMaskFilter->AddRegExp(regexp_utf);
+ UCS2UTF8_Dealloc(regexp_utf);
}
/**
@@ -197,6 +222,12 @@
{
if (m_bUseMask)
{
+ if (m_pMaskFilter == NULL)
+ {
+ _RPTF0(_CRT_ERROR, "Use mask set, but no filter rules for mask!");
+ return TRUE;
+ }
+
// preprend a backslash if there is none
CString strFileName = szFileName;
strFileName.MakeLower();
@@ -205,7 +236,11 @@
// append a point if there is no extension
if (strFileName.Find(_T('.')) == -1)
strFileName = strFileName + _T('.');
- return (! m_rgx.RegFind(strFileName));
+
+ char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName);
+ bool match = m_pMaskFilter->Match(name_utf);
+ UCS2UTF8_Dealloc(name_utf);
+ return match;
}
else
{
@@ -318,7 +353,7 @@
{
strParsed = _T("^");
strPattern.MakeLower();
- strParsed += strPattern + _T("$");
+ strParsed = strPattern; //+ _T("$");
}
return strParsed;
}
@@ -362,8 +397,8 @@
// If filter is empty string set default filter
if (filter.IsEmpty())
{
+ UseMask(TRUE);
SetMask(_T("*.*"));
- UseMask(TRUE);
SetFileFilterPath(_T(""));
return FALSE;
}
@@ -375,8 +410,8 @@
// Star means we have a file extension mask
if (filter[0] == '*')
{
+ UseMask(TRUE);
SetMask(filter);
- UseMask(TRUE);
SetFileFilterPath(_T(""));
}
else
@@ -384,14 +419,14 @@
CString path = GetFileFilterPath(filter);
if (!path.IsEmpty())
{
+ UseMask(FALSE);
SetFileFilterPath(path);
- UseMask(FALSE);
}
// If filter not found with given name, use default filter
else
{
+ UseMask(TRUE);
SetMask(_T("*.*"));
- UseMask(TRUE);
SetFileFilterPath(_T(""));
return FALSE;
}
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/FileFilterHelper.h 2007-01-10 16:40:49 UTC (rev 4029)
@@ -26,12 +26,9 @@
#define _FILEFILTERHELPER_H_
class FileFilterMgr;
+class FilterList;
struct FileFilter;
-#ifndef REGEXP_H
-#include "RegExp.h"
-#endif
-
/**
* @brief File extension of file filter files.
*/
@@ -135,6 +132,7 @@
private:
+ FilterList * m_pMaskFilter; /*< Filter for filemasks (*.cpp) */
FileFilter * m_currentFilter; /*< Currently selected filefilter */
FileFilterMgr * m_fileFilterMgr; /*< Associated FileFilterMgr */
CString m_sFileFilterPath; /*< Path to current filter */
@@ -142,8 +140,6 @@
BOOL m_bUseMask; /*< If TRUE file mask is used, filter otherwise */
CString m_sGlobalFilterPath; /*< Path for shared filters */
CString m_sUserSelFilterPath; /*< Path for user's private filters */
-
- CRegExp m_rgx; /*< Compiled file mask regular expression */
};
#endif // _FILEFILTERHELPER_H_
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Merge.cpp 2007-01-10 16:40:49 UTC (rev 4029)
@@ -247,7 +247,6 @@
BOOL bDisableSplash = GetOptionsMgr()->GetBool(OPT_DISABLE_SPLASH);
InitializeFileFilters();
- m_globalFileFilter.SetFilter(_T("*.*"));
CSplashWnd::EnableSplashScreen(bDisableSplash==FALSE && cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew);
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Merge.dsp 2007-01-10 16:40:49 UTC (rev 4029)
@@ -757,10 +757,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\RegExp.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Common\RegKey.cpp
# End Source File
# Begin Source File
@@ -1405,10 +1401,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\RegExp.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Common\RegKey.h
# End Source File
# Begin Source File
Modified: trunk/Src/Ucs2Utf8.cpp
===================================================================
--- trunk/Src/Ucs2Utf8.cpp 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Ucs2Utf8.cpp 2007-01-10 16:40:49 UTC (rev 4029)
@@ -91,3 +91,37 @@
// return number of written wchars
return (nUtf - nremains);
}
+
+/**
+ * @brief Convert string to UTF-8.
+ * This function converts the given string to UTF-8, and returns pointer
+ * to converted string. Given string must be deallocated by calling
+ * UCS2UTF8_Dealloc() after use.
+ * @param [in] strOrigin String to convert.
+ * @return Pointer to UTF-8 string.
+ */
+char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin)
+{
+#ifdef UNICODE
+ // Get the size of UTF-8 string
+ int str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), NULL, 0);
+ ++str_len; // Space for zero at end
+
+ char * str_utf = (char *) malloc(str_len);
+ ZeroMemory(str_utf, str_len);
+ str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), str_utf, str_len);
+#else
+ char *str_utf = strdup(strOrigin);
+#endif
+
+ return str_utf;
+}
+
+/**
+ * @brief Free string allocated by UCS2UTF8_ConvertToUtf8().
+ * @param [in] Utf8Str String to deallocate.
+ */
+void UCS2UTF8_Dealloc(char * Utf8Str)
+{
+ free(Utf8Str);
+}
Modified: trunk/Src/Ucs2Utf8.h
===================================================================
--- trunk/Src/Ucs2Utf8.h 2007-01-10 15:10:53 UTC (rev 4028)
+++ trunk/Src/Ucs2Utf8.h 2007-01-10 16:40:49 UTC (rev 4029)
@@ -27,4 +27,7 @@
UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf);
UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs);
+char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin);
+void UCS2UTF8_Dealloc(char * Utf8Str);
+
#endif // _UCS2UTF8_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-10 16:54:54
|
Revision: 4030
http://svn.sourceforge.net/winmerge/?rev=4030&view=rev
Author: kimmov
Date: 2007-01-10 08:54:44 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
PATCH: [ 1631806 ] Fix Filterspath initialization
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/OptionsInit.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 16:40:49 UTC (rev 4029)
+++ trunk/Src/Changes.txt 2007-01-10 16:54:44 UTC (rev 4030)
@@ -7,6 +7,8 @@
Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
Src/Common removed files: Regexp.cpp RegExp.h
+ PATCH: [ 1631806 ] Fix Filterspath initialization
+ Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
2007-01-10 Takashi
BUG: [ 1631613 ] WinMerge crashes when editing code files
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-10 16:40:49 UTC (rev 4029)
+++ trunk/Src/MainFrm.cpp 2007-01-10 16:54:44 UTC (rev 4030)
@@ -182,13 +182,6 @@
*/
static const TCHAR DocsURL[] = _T("http://winmerge.org/2.6/manual/index.html");
-/**
- * @brief Default relative path to "My Documents" for private filters.
- * We want to use WinMerge folder as general user-file folder in future.
- * So it makes sense to have own subfolder for filters.
- */
-static const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge\\Filters");
-
/** @brief Timer ID for window flashing timer. */
static const UINT ID_TIMER_FLASH = 1;
@@ -244,7 +237,7 @@
if (pathMyFolders.IsEmpty())
{
// No filter path, set it to default and make sure it exists.
- CString pathFilters = GetDefaultFilterUserPath(TRUE);
+ CString pathFilters = theApp.GetDefaultFilterUserPath(TRUE);
GetOptionsMgr()->SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2172,40 +2165,6 @@
return TRUE;
}
-/**
- * @brief Get default user filter folder path.
- * This function returns the default filter path for user filters.
- * If wanted so (@p bCreate) path can be created if it does not
- * exist yet. But you really want to create the patch only when
- * there is no user path defined.
- * @param [in] bCreate If TRUE filter path is created if it does
- * not exist.
- * @return Default folder for user filters.
- */
-CString CMainFrame::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
-{
- CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
- CString pathFilters(pathMyFolders);
- if (pathFilters.Right(1) != _T("\\"))
- pathFilters += _T("\\");
- pathFilters += DefaultRelativeFilterPath;
-
- if (bCreate && !paths_CreateIfNeeded(pathFilters))
- {
- // Failed to create a folder, check it didn't already
- // exist.
- DWORD errCode = GetLastError();
- if (errCode != ERROR_ALREADY_EXISTS)
- {
- // Failed to create a folder for filters, fallback to
- // "My Documents"-folder. It is not worth the trouble to
- // bother user about this or user more clever solutions.
- pathFilters = pathMyFolders;
- }
- }
- return pathFilters;
-}
-
typedef enum { ToConfigLog, FromConfigLog } ConfigLogDirection;
/**
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-01-10 16:40:49 UTC (rev 4029)
+++ trunk/Src/MainFrm.h 2007-01-10 16:54:44 UTC (rev 4030)
@@ -116,7 +116,6 @@
CString SetStatus(LPCTSTR status);
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
- CString GetDefaultFilterUserPath(BOOL bCreate = FALSE);
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-01-10 16:40:49 UTC (rev 4029)
+++ trunk/Src/Merge.cpp 2007-01-10 16:54:44 UTC (rev 4030)
@@ -61,6 +61,14 @@
static char THIS_FILE[] = __FILE__;
#endif
+/**
+ * @brief Default relative path to "My Documents" for private filters.
+ * We want to use WinMerge folder as general user-file folder in future.
+ * So it makes sense to have own subfolder for filters.
+ */
+static const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge\\Filters");
+
+
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
@@ -745,3 +753,37 @@
CString path = paths_GetWindowsDirectory() + _T("\\NOTEPAD.EXE");
return path;
}
+
+/**
+ * @brief Get default user filter folder path.
+ * This function returns the default filter path for user filters.
+ * If wanted so (@p bCreate) path can be created if it does not
+ * exist yet. But you really want to create the patch only when
+ * there is no user path defined.
+ * @param [in] bCreate If TRUE filter path is created if it does
+ * not exist.
+ * @return Default folder for user filters.
+ */
+CString CMergeApp::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
+{
+ CString pathMyFolders = paths_GetMyDocuments(NULL);
+ CString pathFilters(pathMyFolders);
+ if (pathFilters.Right(1) != _T("\\"))
+ pathFilters += _T("\\");
+ pathFilters += DefaultRelativeFilterPath;
+
+ if (bCreate && !paths_CreateIfNeeded(pathFilters))
+ {
+ // Failed to create a folder, check it didn't already
+ // exist.
+ DWORD errCode = GetLastError();
+ if (errCode != ERROR_ALREADY_EXISTS)
+ {
+ // Failed to create a folder for filters, fallback to
+ // "My Documents"-folder. It is not worth the trouble to
+ // bother user about this or user more clever solutions.
+ pathFilters = pathMyFolders;
+ }
+ }
+ return pathFilters;
+}
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-01-10 16:40:49 UTC (rev 4029)
+++ trunk/Src/Merge.h 2007-01-10 16:54:44 UTC (rev 4030)
@@ -72,6 +72,7 @@
void SetNeedIdleTimer();
void SetLastCompareResult(int nResult) { m_nLastCompareResult = nResult; }
CString GetDefaultEditor();
+ CString GetDefaultFilterUserPath(BOOL bCreate = FALSE);
COptionsMgr * GetMergeOptionsMgr() { return static_cast<COptionsMgr *> (m_pOptions); }
void OptionsInit();
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2007-01-10 16:40:49 UTC (rev 4029)
+++ trunk/Src/OptionsInit.cpp 2007-01-10 16:54:44 UTC (rev 4030)
@@ -114,7 +114,7 @@
m_pOptions->InitOption(OPT_LINEFILTER_REGEXP, _T(""));
m_pOptions->InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
// CMainFrame initializes this when it is empty.
- m_pOptions->InitOption(OPT_FILTER_USERPATH, _T(""));
+ m_pOptions->InitOption(OPT_FILTER_USERPATH, GetDefaultFilterUserPath());
m_pOptions->InitOption(OPT_CP_DEFAULT_MODE, (int)0);
m_pOptions->InitOption(OPT_CP_DEFAULT_CUSTOM, (int)GetACP());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-11 13:51:22
|
Revision: 4033
http://svn.sourceforge.net/winmerge/?rev=4033&view=rev
Author: galh
Date: 2007-01-11 05:51:19 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
PATCH: [ 1633194 ] Add editor tab setting to configuration log
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ConfigLog.cpp
trunk/Src/ConfigLog.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 17:57:24 UTC (rev 4032)
+++ trunk/Src/Changes.txt 2007-01-11 13:51:19 UTC (rev 4033)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-11 Gal
+ PATCH: [ 1633194 ] Add editor tab setting to configuration log
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
2007-01-10 Kimmo
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2007-01-10 17:57:24 UTC (rev 4032)
+++ trunk/Src/ConfigLog.cpp 2007-01-11 13:51:19 UTC (rev 4033)
@@ -455,6 +455,8 @@
WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
+ WriteItem(m_file, 2, _T("Tab size"), m_miscSettings.nTabSize);
+ WriteItemYesNoInverted(2, _T("Insert tabs"), &m_miscSettings.bInsertTabs);
// Font settings
FileWriteString(_T("\n Font:\n"));
Modified: trunk/Src/ConfigLog.h
===================================================================
--- trunk/Src/ConfigLog.h 2007-01-10 17:57:24 UTC (rev 4032)
+++ trunk/Src/ConfigLog.h 2007-01-11 13:51:19 UTC (rev 4033)
@@ -65,6 +65,8 @@
BOOL bWrapLines;
BOOL bMergeMode;
BOOL bSyntaxHighlight;
+ BOOL bInsertTabs;
+ INT nTabSize;
};
/**
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-10 17:57:24 UTC (rev 4032)
+++ trunk/Src/MainFrm.cpp 2007-01-11 13:51:19 UTC (rev 4033)
@@ -2239,6 +2239,8 @@
LoadConfigBoolSetting(&configLog.m_miscSettings.bWrapLines, options, OPT_WORDWRAP, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bMergeMode, options, OPT_MERGE_MODE, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bSyntaxHighlight, options, OPT_SYNTAX_HIGHLIGHT, cfgdir);
+ LoadConfigIntSetting(&configLog.m_miscSettings.bInsertTabs, options, OPT_TAB_TYPE, cfgdir);
+ LoadConfigIntSetting(&configLog.m_miscSettings.nTabSize, options, OPT_TAB_SIZE, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultMode, options, OPT_CP_DEFAULT_MODE, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultCustomValue, options, OPT_CP_DEFAULT_CUSTOM, cfgdir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-14 21:59:22
|
Revision: 4049
http://svn.sourceforge.net/winmerge/?rev=4049&view=rev
Author: kimmov
Date: 2007-01-14 13:59:20 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/OpenDlg.cpp
trunk/Src/OpenDlg.h
trunk/Src/paths.cpp
trunk/Src/paths.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-14 21:08:53 UTC (rev 4048)
+++ trunk/Src/Changes.txt 2007-01-14 21:59:20 UTC (rev 4049)
@@ -6,6 +6,8 @@
Update manual URL point to 2.6 version manual in readme.txt
Docs/Users/ReadMe.txt
Docs/Users/Languages/ReadMe-*.txt
+ PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
+ Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
2007-01-11 Gal
PATCH: [ 1633194 ] Add editor tab setting to configuration log
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2007-01-14 21:08:53 UTC (rev 4048)
+++ trunk/Src/OpenDlg.cpp 2007-01-14 21:59:20 UTC (rev 4049)
@@ -237,6 +237,7 @@
if (SelectFileOrFolder(GetSafeHwnd(), s, sfolder))
{
m_strLeft = s;
+ m_strLeftBrowsePath = s;
UpdateData(FALSE);
UpdateButtonStates();
}
@@ -271,6 +272,7 @@
if (SelectFileOrFolder(GetSafeHwnd(), s, sfolder))
{
m_strRight = s;
+ m_strRightBrowsePath = s;
UpdateData(FALSE);
UpdateButtonStates();
}
@@ -303,9 +305,17 @@
return;
}
- m_strRight = paths_GetLongPath(m_strRight);
- m_strLeft = paths_GetLongPath(m_strLeft);
+ // If user has edited path by hand, expand environment variables
+ BOOL bExpandLeft = FALSE;
+ BOOL bExpandRight = FALSE;
+ if (m_strLeftBrowsePath.CompareNoCase(m_strLeft) != 0)
+ bExpandLeft = TRUE;
+ if (m_strRightBrowsePath.CompareNoCase(m_strRight) != 0)
+ bExpandRight = TRUE;
+ m_strRight = paths_GetLongPath(m_strRight, bExpandRight);
+ m_strLeft = paths_GetLongPath(m_strLeft, bExpandLeft);
+
// Add trailing '\' for directories if its missing
if (m_pathsType == IS_EXISTING_DIR)
{
Modified: trunk/Src/OpenDlg.h
===================================================================
--- trunk/Src/OpenDlg.h 2007-01-14 21:08:53 UTC (rev 4048)
+++ trunk/Src/OpenDlg.h 2007-01-14 21:59:20 UTC (rev 4049)
@@ -77,6 +77,8 @@
// Implementation data
private:
prdlg::CMoveConstraint m_constraint;
+ CString m_strLeftBrowsePath; /**< Left path from browse dialog. */
+ CString m_strRightBrowsePath; /**< Right path from browse dialog. */
// Overrides
// ClassWizard generated virtual function overrides
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2007-01-14 21:08:53 UTC (rev 4048)
+++ trunk/Src/paths.cpp 2007-01-14 21:59:20 UTC (rev 4049)
@@ -144,13 +144,14 @@
* Convert path to canonical long path.
* This function converts given path to canonical long form. For example
* foldenames with ~ short names are expanded. Also environment strings are
- * expanded. If path does not exist, make canonical the part that does exist,
- * and leave the rest as is. Result, if a directory, usually does not have a
- * trailing backslash.
+ * expanded if @p bExpandEnvs is TRUE. If path does not exist, make canonical
+ * the part that does exist, and leave the rest as is. Result, if a directory,
+ * usually does not have a trailing backslash.
* @param [in] sPath Path to convert.
+ * @param [in] bExpandEnvs If TRUE environment variables are expanded.
* @return Converted path.
*/
-CString paths_GetLongPath(const CString & sPath)
+CString paths_GetLongPath(const CString & sPath, BOOL bExpandEnvs)
{
int len = sPath.GetLength();
if (len < 1)
@@ -172,12 +173,14 @@
// Expand environment variables:
// Convert "%userprofile%\My Documents" to "C:\Documents and Settings\username\My Documents"
TCHAR expandedPath[_MAX_PATH] = {0};
- LPCTSTR lpcszPath;
+ LPCTSTR lpcszPath = NULL;
- if (_tcschr(sPath, '%') &&
- ExpandEnvironmentStrings(sPath, expandedPath, _MAX_PATH))
+ if (bExpandEnvs && _tcschr(sPath, '%'))
{
- lpcszPath = expandedPath;
+ if (ExpandEnvironmentStrings(sPath, expandedPath, _MAX_PATH))
+ {
+ lpcszPath = expandedPath;
+ }
}
else
lpcszPath = sPath;
Modified: trunk/Src/paths.h
===================================================================
--- trunk/Src/paths.h 2007-01-14 21:08:53 UTC (rev 4048)
+++ trunk/Src/paths.h 2007-01-14 21:59:20 UTC (rev 4049)
@@ -22,7 +22,7 @@
bool paths_EndsWithSlash(const CString & s);
PATH_EXISTENCE paths_DoesPathExist(LPCTSTR szPath);
void paths_normalize(CString & sPath);
-CString paths_GetLongPath(const CString & sPath);
+CString paths_GetLongPath(const CString & sPath, BOOL bExpandEnvs = TRUE);
bool paths_CreateIfNeeded(const CString & sPath);
LPCTSTR paths_GetTempPath(int * pnerr=NULL);
CString paths_GetTempFileName(LPCTSTR lpPathName, LPCTSTR lpPrefixString, int * pnerr=NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-15 22:05:23
|
Revision: 4058
http://svn.sourceforge.net/winmerge/?rev=4058&view=rev
Author: kimmov
Date: 2007-01-15 14:05:22 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
- Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Swedish/MergeSwedish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-15 22:01:39 UTC (rev 4057)
+++ trunk/Src/Changes.txt 2007-01-15 22:05:22 UTC (rev 4058)
@@ -8,6 +8,9 @@
Filters: SourceControl.flt
Add Ren\xE9 Leonhardt to Contributors.txt
Docs/Users: Contributors.txt
+ PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
2007-01-14 Kimmo
Update manual URL point to 2.6 version manual in readme.txt
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-15 22:01:39 UTC (rev 4057)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-15 22:05:22 UTC (rev 4058)
@@ -178,7 +178,7 @@
POPUP "&Fels\xF6kning" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xD6ppna Konfiguration...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&\xC5terst\xE4ll Inst\xE4llningar", ID_DEBUG_RESETOPTIONS
END
POPUP "F&\xF6nster"
BEGIN
@@ -286,7 +286,7 @@
POPUP "&Fels\xF6kning" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xD6ppna Konfiguration...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&\xC5terst\xE4ll Inst\xE4llningar", ID_DEBUG_RESETOPTIONS
END
POPUP "F&\xF6nster"
BEGIN
@@ -449,7 +449,7 @@
POPUP "&Fels\xF6kning" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xD6ppna Konfiguration...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&\xC5terst\xE4ll Inst\xE4llningar", ID_DEBUG_RESETOPTIONS
END
POPUP "F&\xF6nster"
BEGIN
@@ -1969,7 +1969,7 @@
IDS_OPTIONS_INVALID_TABSIZE
"V\xE4rdet i Tabbstorleks-f\xE4ltet \xE4r inte inom vad WinMerge accepterar.\n\nVar god och anv\xE4nd v\xE4rden fr\xE5n 1 - %1."
IDS_RESET_OPTIONS_WARNING
- "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
+ "\xC4r du s\xE4ker att du vill \xE5terst\xE4lla alla WinMerges inst\xE4llningar till standardv\xE4rden?\n\nVar god och \xE5terstarta WinMerge efter \xE5terst\xE4llningen."
END
// BROWSE FILE
@@ -2284,8 +2284,8 @@
IDS_ABORTED_ITEM "Objekt avbrutet"
IDS_FILE_SKIPPED "Hoppat \xF6ver filen"
IDS_DIR_SKIPPED "Hoppat \xF6ver katalogen"
- IDS_LEFT_ONLY_IN_FMT "Left only: %1"
- IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
+ IDS_LEFT_ONLY_IN_FMT "Bara v\xE4nster: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Bara h\xF6ger: %1"
IDS_BIN_FILES_SAME "De bin\xE4ra filerna \xE4r identiska"
IDS_IDENTICAL "Identiska"
IDS_BIN_FILES_DIFF "De bin\xE4ra filerna \xE4r olika"
@@ -2293,7 +2293,7 @@
IDS_LEFTONLY "Endast v\xE4nster"
IDS_RIGHTONLY "Endast h\xF6ger"
IDS_DIFFERENT "Olika"
- IDS_CMPRES_ERROR "Error"
+ IDS_CMPRES_ERROR "Fel"
END
// DIRECTORY DIFFING : SUMMARY BAR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-16 20:13:26
|
Revision: 4061
http://svn.sourceforge.net/winmerge/?rev=4061&view=rev
Author: kimmov
Date: 2007-01-16 12:13:21 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
PATCH: [ 1636314 ] Fix limiting to single file compare window
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-16 19:43:14 UTC (rev 4060)
+++ trunk/Src/Changes.txt 2007-01-16 20:13:21 UTC (rev 4061)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-16 Kimmo
+ PATCH: [ 1636314 ] Fix limiting to single file compare window
+ Src: MainFrm.cpp
+
2007-01-15 Kimmo
PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
Submitted by Ren\xE9 Leonhardt
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-16 19:43:14 UTC (rev 4060)
+++ trunk/Src/MainFrm.cpp 2007-01-16 20:13:21 UTC (rev 4061)
@@ -593,11 +593,11 @@
*
* @param cpleft, cpright : left and right codepages
* = -1 when the file must be parsed
+ * @return OPENRESULTS_TYPE for success/failure code.
*/
-int /* really an OPENRESULTS_TYPE, but MainFrm.h doesn't know that type */
-CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc, const FileLocation & ifilelocLeft, const FileLocation & ifilelocRight,
- BOOL bROLeft, BOOL bRORight,
- PackingInfo * infoUnpacker /*= NULL*/)
+int CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc,
+ const FileLocation & ifilelocLeft, const FileLocation & ifilelocRight,
+ BOOL bROLeft, BOOL bRORight, PackingInfo * infoUnpacker /*= NULL*/)
{
BOOL docNull;
CMergeDoc * pMergeDoc = GetMergeDocToShow(pDirDoc, &docNull);
@@ -1812,9 +1812,30 @@
}
}
-/// Obtain a merge doc to display a difference in files
+/**
+ * @brief Obtain a merge doc to display a difference in files.
+ * This function (usually) uses DirDoc to determine if new or existing
+ * MergeDoc is used. However there is exceptional case when DirDoc does
+ * not contain diffs. Then we have only file compare, and if we also have
+ * limited file compare windows, we always reuse existing MergeDoc.
+ * @param [in] pDirDoc Dir compare document.
+ * @param [out] pNew Did we create a new document?
+ * @return Pointer to merge doucument.
+ */
CMergeDoc * CMainFrame::GetMergeDocToShow(CDirDoc * pDirDoc, BOOL * pNew)
{
+ const BOOL bMultiDocs = GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS);
+ MergeDocList docs;
+ GetAllMergeDocs(&docs);
+
+ if (!pDirDoc->HasDiffs() && !bMultiDocs && !docs.IsEmpty())
+ {
+ *pNew = FALSE;
+
+ POSITION pos = docs.GetHeadPosition();
+ CMergeDoc * pMergeDoc = docs.GetAt(pos);
+ return pMergeDoc;
+ }
CMergeDoc * pMergeDoc = pDirDoc->GetMergeDocForDiff(pNew);
return pMergeDoc;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-16 20:22:33
|
Revision: 4062
http://svn.sourceforge.net/winmerge/?rev=4062&view=rev
Author: kimmov
Date: 2007-01-16 12:22:32 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
Move options function call out of if() (for easier debugging)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-16 20:13:21 UTC (rev 4061)
+++ trunk/Src/Changes.txt 2007-01-16 20:22:32 UTC (rev 4062)
@@ -5,6 +5,8 @@
2007-01-16 Kimmo
PATCH: [ 1636314 ] Fix limiting to single file compare window
Src: MainFrm.cpp
+ Move options function call out of if() (for easier debugging)
+ Src: DirDoc.cpp
2007-01-15 Kimmo
PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-01-16 20:13:21 UTC (rev 4061)
+++ trunk/Src/DirDoc.cpp 2007-01-16 20:22:32 UTC (rev 4062)
@@ -613,12 +613,14 @@
* @brief Obtain a merge doc to display a difference in files.
* @param [out] pNew Set to TRUE if a new doc is created,
* and FALSE if an existing one reused.
+ * @return Pointer to CMergeDoc to use (new or existing).
*/
CMergeDoc * CDirDoc::GetMergeDocForDiff(BOOL * pNew)
{
CMergeDoc * pMergeDoc = 0;
// policy -- use an existing merge doc if available
- if (!GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS) && !m_MergeDocs.IsEmpty())
+ const BOOL bMultiDocs = GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS);
+ if (!bMultiDocs && !m_MergeDocs.IsEmpty())
{
*pNew = FALSE;
pMergeDoc = m_MergeDocs.GetHead();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-18 18:35:38
|
Revision: 4069
http://svn.sourceforge.net/winmerge/?rev=4069&view=rev
Author: kimmov
Date: 2007-01-18 10:35:26 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
BUG: [ 1637433 ] Forget selected filter after close
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.cpp
trunk/Src/OptionsInit.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-17 17:18:57 UTC (rev 4068)
+++ trunk/Src/Changes.txt 2007-01-18 18:35:26 UTC (rev 4069)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-17 Kimmo
+ BUG: [ 1637433 ] Forget selected filter after close
+ Src: Merge.cpp OptionsInit.cpp
+
2007-01-16 Kimmo
PATCH: [ 1636314 ] Fix limiting to single file compare window
Src: MainFrm.cpp
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-01-17 17:18:57 UTC (rev 4068)
+++ trunk/Src/Merge.cpp 2007-01-18 18:35:26 UTC (rev 4069)
@@ -256,6 +256,16 @@
InitializeFileFilters();
+ // Read last used filter from registry
+ // If filter fails to set, reset to default
+ const CString filterString = m_pOptions->GetString(OPT_FILEFILTER_CURRENT);
+ BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(filterString);
+ if (!bFilterSet)
+ {
+ CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter);
+ }
+
CSplashWnd::EnableSplashScreen(bDisableSplash==FALSE && cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew);
// Initialize i18n (multiple language) support
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2007-01-17 17:18:57 UTC (rev 4068)
+++ trunk/Src/OptionsInit.cpp 2007-01-18 18:35:26 UTC (rev 4069)
@@ -128,13 +128,4 @@
m_pOptions->InitOption(OPT_ARCHIVE_ENABLE, 1); // Enable by default
m_pOptions->InitOption(OPT_ARCHIVE_PROBETYPE, false);
-
- // Read last used filter from registry
- // If filter fails to set, reset to default
- BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(m_pOptions->GetString(OPT_FILEFILTER_CURRENT));
- if (!bFilterSet)
- {
- CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter);
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-24 18:41:51
|
Revision: 4075
http://svn.sourceforge.net/winmerge/?rev=4075&view=rev
Author: kimmov
Date: 2007-01-24 10:41:49 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
PATCH: [ 1642809 ] Move compare code out from DiffFileData
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffFileData.cpp
trunk/Src/DiffFileData.h
trunk/Src/DiffWrapper.cpp
trunk/Src/DirScan.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/Changes.txt 2007-01-24 18:41:49 UTC (rev 4075)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-24 Kimmo
+ PATCH: [ 1642809 ] Move compare code out from DiffFileData
+ Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
+ DirViewColItems.cpp Merge.dsp
+ Src new files: FolderCmp.cpp FolderCmp.h
+
2007-01-17 Kimmo
BUG: [ 1637433 ] Forget selected filter after close
Src: Merge.cpp OptionsInit.cpp
Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/DiffFileData.cpp 2007-01-24 18:41:49 UTC (rev 4075)
@@ -13,40 +13,17 @@
#include "DiffItem.h"
#include "FileLocation.h"
#include "Diff.h"
-#include "IAbortable.h"
#include "Paths.h"
#include "DiffContext.h"
#include "FileTransform.h"
#include "common/unicoder.h"
-#include "DiffWrapper.h"
-#include "ByteComparator.h"
#include "codepage_detect.h"
#include <shlwapi.h>
#include "DiffFileData.h"
-static const int KILO = 1024; // Kilo(byte)
-/** @brief Quick contents compare's file buffer size. */
-static const int WMCMPBUFF = 32 * KILO;
-
-static void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, CString & left, CString & right);
-static bool Unpack(CString & filepathTransformed,
- const CString & filteredFilenames, PackingInfo * infoUnpacker);
-static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
-static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData);
-
static int f_defcp = 0; // default codepage
-
-struct FileHandle
-{
- FileHandle() : m_fp(0) { }
- void Assign(FILE * fp) { Close(); m_fp = fp; }
- void Close() { if (m_fp) { fclose(m_fp); m_fp = 0; } }
- ~FileHandle() { Close(); }
- FILE * m_fp;
-};
-
/**
* @brief Simple initialization of DiffFileData
* @note Diffcounts are initialized to invalid values, not zeros.
@@ -58,8 +35,6 @@
for (i=0; i<2; ++i)
memset(&m_inf[i], 0, sizeof(m_inf[i]));
m_used = false;
- m_ndiffs = DiffFileData::DIFFS_UNKNOWN;
- m_ntrivialdiffs = DiffFileData::DIFFS_UNKNOWN;
Reset();
// Set default codepages
for (i=0; i<sizeof(m_FileLocation)/sizeof(m_FileLocation[0]); ++i)
@@ -200,80 +175,8 @@
}
}
-/**
- * @brief Compare two specified files.
- *
- * @param [in] depth Current directory depth.
- * @return Compare result as DIFFCODE.
- */
-int DiffFileData::diffutils_compare_files(int depth)
-{
- int bin_flag = 0;
- int bin_file = 0; // bitmap for binary files
- // Do the actual comparison (generating a change script)
- struct change *script = NULL;
- BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, &bin_file);
- if (!success)
- {
- return DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
- }
- int code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::SAME;
- // make sure to start counting diffs at 0
- // (usually it is -1 at this point, for unknown)
- m_ndiffs = 0;
- m_ntrivialdiffs = 0;
-
- // Free change script (which we don't want)
- if (script != NULL)
- {
- struct change *p,*e;
- for (e = script; e; e = p)
- {
- if (!e->trivial)
- ++m_ndiffs;
- else
- ++m_ntrivialdiffs;
- p = e->link;
- free (e);
- }
- if (m_ndiffs > 0)
- code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
- }
-
- // diff_2_files set bin_flag to -1 if different binary
- // diff_2_files set bin_flag to +1 if same binary
-
- if (bin_flag != 0)
- {
- // Clear text-flag, set binary flag
- // We don't know diff counts for binary files
- code = code & ~DIFFCODE::TEXT;
- switch (bin_file)
- {
- case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1;
- break;
- case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2;
- break;
- case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN;
- break;
- default:
- _RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
- break;
- }
- m_ndiffs = DiffFileData::DIFFS_UNKNOWN;
- }
-
- if (bin_flag < 0)
- {
- // Clear same-flag, set diff-flag
- code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
- }
-
- return code;
-}
-
/** @brief detect unicode file and quess encoding */
DiffFileData::UniFileBom::UniFileBom(int fd)
{
@@ -369,433 +272,6 @@
return true;
}
-/**
- * @brief Prepare files (run plugins) & compare them, and return diffcode.
- * This is function to compare two files in folder compare. It is not used in
- * file compare.
- * @param [in] pCtxt Pointer to compare context.
- * @param [in, out] di Compared files with associated data.
- * @return Compare result code.
- */
-int DiffFileData::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
-{
- int nCompMethod = pCtxt->m_nCompMethod;
- CString filepath1;
- CString filepath2;
- GetComparePaths(pCtxt, di, filepath1, filepath2);
- // Reset text stats
- m_textStats0.clear();
- m_textStats1.clear();
- int code = DIFFCODE::FILE | DIFFCODE::CMPERR;
- // For user chosen plugins, define bAutomaticUnpacker as false and use the chosen infoHandler
- // but how can we receive the infoHandler ? DirScan actually only
- // returns info, but can not use file dependent information.
- // Transformation happens here
- // text used for automatic mode : plugin filter must match it
- CString filteredFilenames = filepath1 + "|" + filepath2;
-
- PackingInfo * infoUnpacker=0;
- PrediffingInfo * infoPrediffer=0;
-
- // Get existing or new plugin infos
- pCtxt->FetchPluginInfos(filteredFilenames, &infoUnpacker, &infoPrediffer);
-
- // plugin may alter filepaths to temp copies (which we delete before returning in all cases)
- CString filepathUnpacked1 = filepath1;
- CString filepathUnpacked2 = filepath2;
-
- CString filepathTransformed1;
- CString filepathTransformed2;
-
- //DiffFileData diffdata; //(filepathTransformed1, filepathTransformed2);
- // Invoke unpacking plugins
- if (!Unpack(filepathUnpacked1, filteredFilenames, infoUnpacker))
- {
- di.errorDesc = _T("Unpack Error Side 1");
- goto exitPrepAndCompare;
- }
-
- // we use the same plugins for both files, so they must be defined before second file
- ASSERT(infoUnpacker->bToBeScanned == FALSE);
-
- if (!Unpack(filepathUnpacked2, filteredFilenames, infoUnpacker))
- {
- di.errorDesc = _T("Unpack Error Side 2");
- goto exitPrepAndCompare;
- }
-
- // As we keep handles open on unpacked files, Transform() may not delete them.
- // Unpacked files will be deleted at end of this function.
- filepathTransformed1 = filepathUnpacked1;
- filepathTransformed2 = filepathUnpacked2;
- SetDisplayFilepaths(filepath1, filepath2); // store true names for diff utils patch file
- if (!OpenFiles(filepathTransformed1, filepathTransformed2))
- {
- di.errorDesc = _T("OpenFiles Error (before tranform)");
- goto exitPrepAndCompare;
- }
-
- // Invoke prediff'ing plugins
- if (!Filepath_Transform(m_FileLocation[0], filepathUnpacked1, filepathTransformed1, filteredFilenames, infoPrediffer, m_inf[0].desc))
- {
- di.errorDesc = _T("Transform Error Side 1");
- goto exitPrepAndCompare;
- }
-
- // we use the same plugins for both files, so they must be defined before second file
- ASSERT(infoPrediffer->bToBeScanned == FALSE);
-
- if (!Filepath_Transform(m_FileLocation[1], filepathUnpacked2, filepathTransformed2, filteredFilenames, infoPrediffer, m_inf[1].desc))
- {
- di.errorDesc = _T("Transform Error Side 2");
- goto exitPrepAndCompare;
- }
-
- // If options are binary equivalent, we could check for filesize
- // difference here, and bail out if files are clearly different
- // But, then we don't know if file is ascii or binary, and this
- // affects behavior (also, we don't have an icon for unknown type)
-
- // Actually compare the files
- // diffutils_compare_files is a fairly thin front-end to diffutils
- if (filepathTransformed1 != filepathUnpacked1 || filepathTransformed2 != filepathUnpacked2)
- {
- //diffdata.m_sFilepath[0] = filepathTransformed1;
- //diffdata.m_sFilepath[1] = filepathTransformed2;
- if (!OpenFiles(filepathTransformed1, filepathTransformed2))
- {
- di.errorDesc = _T("OpenFiles Error (after tranform)");
- goto exitPrepAndCompare;
- }
- }
-
- // If either file is larger than limit compare files by quick contents
- // This allows us to (faster) compare big binary files
- if (pCtxt->m_nCompMethod == CMP_CONTENT &&
- (di.left.size > pCtxt->m_nQuickCompareLimit ||
- di.right.size > pCtxt->m_nQuickCompareLimit))
- {
- nCompMethod = CMP_QUICK_CONTENT;
- }
-
- if (nCompMethod == CMP_CONTENT)
- {
- // use diffutils
- code = diffutils_compare_files(0);
- // If unique item, it was being compared to itself to determine encoding
- // and the #diffs is invalid
- if (di.isSideRightOnly() || di.isSideLeftOnly())
- {
- m_ndiffs = DiffFileData::DIFFS_UNKNOWN;
- m_ntrivialdiffs = DiffFileData::DIFFS_UNKNOWN;
- }
- if (DIFFCODE::isResultError(code))
- di.errorDesc = _T("DiffUtils Error");
-
- if (!DIFFCODE::isResultError(code) && pCtxt->m_bGuessEncoding)
- {
- // entire file is in memory in the diffutils buffers
- // inside the diff context, so may as well use in-memory copy
- GuessEncoding_from_buffer_in_DiffContext(0, pCtxt);
- GuessEncoding_from_buffer_in_DiffContext(1, pCtxt);
- }
- }
- else if (nCompMethod == CMP_QUICK_CONTENT)
- {
- // use our own byte-by-byte compare
- code = byte_compare_files(pCtxt->m_bStopAfterFirstDiff, pCtxt->GetAbortable());
- // Quick contents doesn't know about diff counts
- // Set to special value to indicate invalid
- m_ndiffs = DIFFS_UNKNOWN_QUICKCOMPARE;
- m_ntrivialdiffs = DIFFS_UNKNOWN_QUICKCOMPARE;
- di.left.m_textStats = m_textStats0;
- di.right.m_textStats = m_textStats1;
-
- if (!DIFFCODE::isResultError(code) && pCtxt->m_bGuessEncoding)
- {
- GuessEncoding_from_FileLocation(m_FileLocation[0]);
- GuessEncoding_from_FileLocation(m_FileLocation[1]);
- }
- }
- else
- {
- // Print error since we should have handled by date compare earlier
- _RPTF0(_CRT_ERROR, "Invalid compare type, DiffFileData can't handle it");
- di.errorDesc = _T("Bad compare type");
- goto exitPrepAndCompare;
- }
-
-
-exitPrepAndCompare:
- Reset();
- // delete the temp files after comparison
- if (filepathTransformed1 != filepathUnpacked1)
- VERIFY(::DeleteFile(filepathTransformed1) || gLog::DeleteFileFailed(filepathTransformed1));
- if (filepathTransformed2 != filepathUnpacked2)
- VERIFY(::DeleteFile(filepathTransformed2) || gLog::DeleteFileFailed(filepathTransformed2));
- if (filepathUnpacked1 != filepath1)
- VERIFY(::DeleteFile(filepathUnpacked1) || gLog::DeleteFileFailed(filepathUnpacked1));
- if (filepathUnpacked2 != filepath2)
- VERIFY(::DeleteFile(filepathUnpacked2) || gLog::DeleteFileFailed(filepathUnpacked2));
- return code;
-}
-
-/**
- * @brief Compare two files using diffutils.
- *
- * Compare two files (in DiffFileData param) using diffutils. Run diffutils
- * inside SEH so we can trap possible error and exceptions. If error or
- * execption is trapped, return compare failure.
- * @param [out] diffs Pointer to list of change structs where diffdata is stored.
- * @param [in] depth Depth in folder compare (we use 0).
- * @param [out] bin_status used to return binary status from compare.
- * @param [in] bMovedBlocks If TRUE moved blocks are analyzed.
- * @param [out] bin_file Returns which file was binary file as bitmap.
- So if first file is binary, first bit is set etc. Can be NULL if binary file
- info is not needed (faster compare since diffutils don't bother checking
- second file if first is binary).
- * @return TRUE when compare succeeds, FALSE if error happened during compare.
- */
-BOOL DiffFileData::Diff2Files(struct change ** diffs, int depth,
- int * bin_status, BOOL bMovedBlocks, int * bin_file)
-{
- BOOL bRet = TRUE;
- __try
- {
- *diffs = diff_2_files (m_inf, depth, bin_status, bMovedBlocks, bin_file);
- CopyDiffutilTextStats(m_inf, this);
- }
- __except (EXCEPTION_EXECUTE_HANDLER)
- {
- *diffs = NULL;
- bRet = FALSE;
- }
- return bRet;
-}
-
-/**
- * @brief Compare two specified files, byte-by-byte
- * @param [in] bStopAfterFirstDiff Stop compare after we find first difference?
- * @param [in] piAbortable Interface allowing to abort compare
- * @return DIFFCODE
- */
-int DiffFileData::byte_compare_files(BOOL bStopAfterFirstDiff, const IAbortable * piAbortable)
-{
- // Close any descriptors open for diffutils
- Reset();
-
- // TODO
- // Right now, we assume files are in 8-bit encoding
- // because transform code converted any UCS-2 files to UTF-8
- // We could compare directly in UCS-2LE here, as an optimization, in that case
- char buff[2][WMCMPBUFF]; // buffered access to files
- FILE * fp[2]; // for files to compare
- FileHandle fhd[2]; // to ensure file handles fp get closed
- int i;
- int diffcode = 0;
-
- // Open both files
- for (i=0; i<2; ++i)
- {
- fp[i] = _tfopen(m_FileLocation[i].filepath, _T("rb"));
- if (!fp[i])
- return DIFFCODE::CMPERR;
- fhd[i].Assign(fp[i]);
- }
-
- // area of buffer currently holding data
- __int64 bfstart[2]; // offset into buff[i] where current data resides
- __int64 bfend[2]; // past-the-end pointer into buff[i], giving end of current data
- // buff[0] has bytes to process from buff[0][bfstart[0]] to buff[0][bfend[0]-1]
-
- bool eof[2]; // if we've finished file
-
- // initialize our buffer pointers and end of file flags
- for (i=0; i<2; ++i)
- {
- bfstart[i] = bfend[i] = 0;
- eof[i] = false;
- }
-
- ByteComparator comparator(ignore_case_flag, ignore_space_change_flag
- , ignore_all_space_flag, ignore_eol_diff, ignore_blank_lines_flag);
-
- // Begin loop
- // we handle the files in WMCMPBUFF sized buffers (variable buff[][])
- // That is, we do one buffer full at a time
- // or even less, as we process until one side buffer is empty, then reload that one
- // and continue
- while (!eof[0] || !eof[1])
- {
- if (piAbortable && piAbortable->ShouldAbort())
- return DIFFCODE::CMPABORT;
-
- // load or update buffers as appropriate
- for (i=0; i<2; ++i)
- {
- if (!eof[i] && bfstart[i]==countof(buff[i]))
- {
- bfstart[i]=bfend[i] = 0;
- }
- if (!eof[i] && bfend[i]<countof(buff[i])-1)
- {
- // Assume our blocks are in range of unsigned int
- unsigned int space = countof(buff[i]) - bfend[i];
- size_t rtn = fread(&buff[i][bfend[i]], 1, space, fp[i]);
- if (ferror(fp[i]))
- return DIFFCODE::CMPERR;
- if (feof(fp[i]))
- eof[i] = true;
- bfend[i] += rtn;
- }
- }
-
- // where to start comparing right now
- LPCSTR ptr0 = &buff[0][bfstart[0]];
- LPCSTR ptr1 = &buff[1][bfstart[1]];
-
- // remember where we started
- LPCSTR orig0 = ptr0, orig1 = ptr1;
-
- // how far can we go right now?
- LPCSTR end0 = &buff[0][bfend[0]];
- LPCSTR end1 = &buff[1][bfend[1]];
-
- __int64 offset0 = (ptr0 - &buff[0][0]);
- __int64 offset1 = (ptr1 - &buff[1][0]);
-
- // are these two buffers the same?
- if (!comparator.CompareBuffers(m_textStats0, m_textStats1,
- ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1))
- {
- if (bStopAfterFirstDiff)
- {
- // By bailing out here
- // we leave our text statistics incomplete
- return diffcode | DIFFCODE::DIFF;
- }
- else
- {
- diffcode |= DIFFCODE::DIFF;
- ptr0 = end0;
- ptr1 = end1;
- }
- }
- else
- {
- ptr0 = end0;
- ptr1 = end1;
- }
-
-
- // did we finish both files?
- if (eof[0] && eof[1])
- {
-
- BOOL bBin0 = (m_textStats0.nzeros>0);
- BOOL bBin1 = (m_textStats1.nzeros>0);
-
- if (bBin0 && bBin1)
- diffcode |= DIFFCODE::BIN;
- else if (bBin0)
- diffcode |= DIFFCODE::BINSIDE1;
- else if (bBin1)
- diffcode |= DIFFCODE::BINSIDE2;
-
- // If either unfinished, they differ
- if (ptr0 != end0 || ptr1 != end1)
- diffcode = (diffcode & DIFFCODE::DIFF);
-
- if (diffcode & DIFFCODE::DIFF)
- return diffcode | DIFFCODE::DIFF;
- else
- return diffcode | DIFFCODE::SAME;
- }
-
- // move our current pointers over what we just compared
- ASSERT(ptr0 >= orig0);
- ASSERT(ptr1 >= orig1);
- bfstart[0] += ptr0-orig0;
- bfstart[1] += ptr1-orig1;
- }
- return diffcode;
-}
-
-/**
- * @brief Get actual compared paths from DIFFITEM.
- * @note If item is unique, same path is returned for both.
- */
-void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, CString & left, CString & right)
-{
- static const TCHAR backslash[] = _T("\\");
-
- if (!di.isSideRightOnly())
- {
- // Compare file to itself to detect encoding
- left = pCtxt->GetNormalizedLeft();
- if (!paths_EndsWithSlash(left))
- left += backslash;
- if (!di.sLeftSubdir.IsEmpty())
- left += di.sLeftSubdir + backslash;
- left += di.sLeftFilename;
- if (di.isSideLeftOnly())
- right = left;
- }
- if (!di.isSideLeftOnly())
- {
- // Compare file to itself to detect encoding
- right = pCtxt->GetNormalizedRight();
- if (!paths_EndsWithSlash(right))
- right += backslash;
- if (!di.sRightSubdir.IsEmpty())
- right += di.sRightSubdir + backslash;
- right += di.sRightFilename;
- if (di.isSideRightOnly())
- left = right;
- }
-}
-
-/**
- * @brief Invoke appropriate plugins for unpacking
- * return false if anything fails
- * caller has to DeleteFile filepathTransformed, if it differs from filepath
- */
-static bool Unpack(CString & filepathTransformed,
- const CString & filteredFilenames, PackingInfo * infoUnpacker)
-{
- // first step : unpack (plugins)
- if (infoUnpacker->bToBeScanned)
- {
- if (!FileTransform_Unpacking(filepathTransformed, filteredFilenames, infoUnpacker, &infoUnpacker->subcode))
- return false;
- }
- else
- {
- if (!FileTransform_Unpacking(filepathTransformed, infoUnpacker, &infoUnpacker->subcode))
- return false;
- }
- return true;
-}
-
-/**
- * @brief Copy text stat results from diffutils back into the FileTextStats structure
- */
-static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats)
-{
- myTextStats->ncrlfs = inf->count_crlfs;
- myTextStats->ncrs = inf->count_crs;
- myTextStats->nlfs = inf->count_lfs;
-}
-
-/**
- * @brief Copy both left & right text stats results back into the DiffFileData text stats
- */
-static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData)
-{
- CopyTextStats(&inf[0], &diffData->m_textStats0);
- CopyTextStats(&inf[1], &diffData->m_textStats1);
-}
-
Modified: trunk/Src/DiffFileData.h
===================================================================
--- trunk/Src/DiffFileData.h 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/DiffFileData.h 2007-01-24 18:41:49 UTC (rev 4075)
@@ -14,10 +14,17 @@
// forward declarations needed by DiffFileData
struct file_data;
class PrediffingInfo;
-struct DIFFITEM;
-class IAbortable;
class CDiffContext;
+struct FileHandle
+{
+ FileHandle() : m_fp(0) { }
+ void Assign(FILE * fp) { Close(); m_fp = fp; }
+ void Close() { if (m_fp) { fclose(m_fp); m_fp = 0; } }
+ ~FileHandle() { Close(); }
+ FILE * m_fp;
+};
+
/**
* @brief C++ container for the structure (file_data) used by diffutils' diff_2_files(...)
*/
@@ -27,8 +34,6 @@
static void SetDefaultCodepage(int defcp); // set codepage to assume for all unknown files
-// enums
- enum { DIFFS_UNKNOWN=-1, DIFFS_UNKNOWN_QUICKCOMPARE=-9 };
// instance interface
@@ -40,11 +45,6 @@
void Close() { Reset(); }
void SetDisplayFilepaths(LPCTSTR szTrueFilepath1, LPCTSTR szTrueFilepath2);
- int diffutils_compare_files(int depth);
- int byte_compare_files(BOOL bStopAfterFirstDiff, const IAbortable * piAbortable);
- int prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di);
- BOOL Diff2Files(struct change ** diffs, int depth,
- int * bin_status, BOOL bMovedBlocks, int * bin_file);
bool Filepath_Transform(FileLocation & fpenc, const CString & filepath, CString & filepathTransformed,
const CString & filteredFilenames, PrediffingInfo * infoPrediffer, int fd);
void GuessEncoding_from_buffer_in_DiffContext(int side, CDiffContext * pCtxt);
@@ -58,8 +58,6 @@
FileTextStats m_textStats0, m_textStats1;
CString m_sDisplayFilepath[2];
- int m_ndiffs;
- int m_ntrivialdiffs;
struct UniFileBom // detect unicode file and quess encoding
{
UniFileBom(int); // initialize from file descriptor
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/DiffWrapper.cpp 2007-01-24 18:41:49 UTC (rev 4075)
@@ -41,7 +41,8 @@
#include "paths.h"
#include "CompareOptions.h"
#include "FileTextStats.h"
-#include "DiffFileData.h"
+//#include "DiffFileData.h"
+#include "FolderCmp.h"
#include "FilterCommentsManager.h"
#ifdef _DEBUG
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/DirScan.cpp 2007-01-24 18:41:49 UTC (rev 4075)
@@ -15,6 +15,7 @@
#include "common/unicoder.h"
#include "DiffContext.h"
#include "DiffWrapper.h"
+#include "FolderCmp.h"
#include "FileFilterHelper.h"
#include "logfile.h"
#include "paths.h"
@@ -23,7 +24,8 @@
#include "DiffItemList.h"
#include "PathContext.h"
#include "IAbortable.h"
-#include "DiffFileData.h"
+#include "FolderCmp.h"
+//#include "DiffFileData.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -53,7 +55,7 @@
static void Sort(fentryArray * dirs, bool casesensitive);;
static int collstr(const CString & s1, const CString & s2, bool casesensitive);
static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt,
- const DiffFileData * pDiffFileData);
+ const FolderCmp * pCmpData);
static void AddToList(const CString & sLeftDir, const CString & sRightDir, const fentry * lent, const fentry * rent,
int code, DiffItemList * pList, CDiffContext *pCtxt);
static void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt);
@@ -391,13 +393,15 @@
pCtxt->m_nCompMethod != CMP_DATE_SIZE &&
pCtxt->m_nCompMethod != CMP_SIZE)
{
- DiffFileData diffdata;
- int diffCode = diffdata.prepAndCompareTwoFiles(pCtxt, di);
+ FolderCmp folderCmp;
+ //DiffFileData diffdata;
+ //int diffCode = diffdata.prepAndCompareTwoFiles(pCtxt, di);
+ int diffCode = folderCmp.prepAndCompareTwoFiles(pCtxt, di);
// Add possible binary flag for unique items
if (diffCode & DIFFCODE::BIN)
di.diffcode |= DIFFCODE::BIN;
- StoreDiffData(di, pCtxt, &diffdata);
+ StoreDiffData(di, pCtxt, &folderCmp);
}
else
{
@@ -465,10 +469,12 @@
else
{
// Really compare
- DiffFileData diffdata;
- di.diffcode |= diffdata.prepAndCompareTwoFiles(pCtxt, di);
+ //DiffFileData diffdata;
+ FolderCmp folderCmp;
+ //di.diffcode |= diffdata.prepAndCompareTwoFiles(pCtxt, di);
+ di.diffcode |= folderCmp.prepAndCompareTwoFiles(pCtxt, di);
// report result back to caller
- StoreDiffData(di, pCtxt, &diffdata);
+ StoreDiffData(di, pCtxt, &folderCmp);
}
}
else
@@ -607,27 +613,27 @@
* @brief Send one file or directory result back through the diff context
*/
static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt,
- const DiffFileData * pDiffFileData)
+ const FolderCmp * pCmpData)
{
- if (pDiffFileData)
+ if (pCmpData)
{
// Set text statistics
if (di.isSideLeftOrBoth())
- di.left.m_textStats = pDiffFileData->m_textStats0;
+ di.left.m_textStats = pCmpData->m_diffFileData.m_textStats0;
if (di.isSideRightOrBoth())
- di.right.m_textStats = pDiffFileData->m_textStats1;
+ di.right.m_textStats = pCmpData->m_diffFileData.m_textStats1;
- di.nsdiffs = pDiffFileData->m_ndiffs;
- di.nidiffs = pDiffFileData->m_ntrivialdiffs;
+ di.nsdiffs = pCmpData->m_ndiffs;
+ di.nidiffs = pCmpData->m_ntrivialdiffs;
if (!di.isSideLeftOnly())
{
- di.right.encoding = pDiffFileData->m_FileLocation[1].encoding;
+ di.right.encoding = pCmpData->m_diffFileData.m_FileLocation[1].encoding;
}
if (!di.isSideRightOnly())
{
- di.left.encoding = pDiffFileData->m_FileLocation[0].encoding;
+ di.left.encoding = pCmpData->m_diffFileData.m_FileLocation[0].encoding;
}
}
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/DirViewColItems.cpp 2007-01-24 18:41:49 UTC (rev 4075)
@@ -20,7 +20,7 @@
#include "locality.h"
#include "unicoder.h"
#include "coretools.h"
-#include "DiffFileData.h"
+#include "FolderCmp.h"
// shlwapi.h prior to VC6SP6 might lack definition of StrIsIntlEqual
#ifdef UNICODE
@@ -296,11 +296,11 @@
{
const int &r = *static_cast<const int*>(p);
CString s;
- if (r == DiffFileData::DIFFS_UNKNOWN_QUICKCOMPARE)
+ if (r == FolderCmp::DIFFS_UNKNOWN_QUICKCOMPARE)
{ // QuickCompare, unknown
s = _T("*");
}
- else if (r == DiffFileData::DIFFS_UNKNOWN)
+ else if (r == FolderCmp::DIFFS_UNKNOWN)
{ // Unique item
s = _T("");
}
Added: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp (rev 0)
+++ trunk/Src/FolderCmp.cpp 2007-01-24 18:41:49 UTC (rev 4075)
@@ -0,0 +1,542 @@
+/**
+ * @file FolderCmp.cpp
+ *
+ * @brief Implementation file for FolderCmp
+ */
+
+#include "stdafx.h"
+#include "paths.h"
+#include "DiffContext.h"
+#include "DiffWrapper.h"
+#include "FileTransform.h"
+#include "diff.h"
+#include "IAbortable.h"
+#include "FolderCmp.h"
+#include "ByteComparator.h"
+
+static const int KILO = 1024; // Kilo(byte)
+
+/** @brief Quick contents compare's file buffer size. */
+static const int WMCMPBUFF = 32 * KILO;
+
+static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData);
+static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
+static void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, CString & left, CString & right);
+static bool Unpack(CString & filepathTransformed,
+ const CString & filteredFilenames, PackingInfo * infoUnpacker);
+
+FolderCmp::FolderCmp()
+: m_ndiffs(DIFFS_UNKNOWN)
+, m_ntrivialdiffs(DIFFS_UNKNOWN)
+{
+
+}
+
+/**
+ * @brief Prepare files (run plugins) & compare them, and return diffcode.
+ * This is function to compare two files in folder compare. It is not used in
+ * file compare.
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in, out] di Compared files with associated data.
+ * @return Compare result code.
+ */
+int FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
+{
+ int nCompMethod = pCtxt->m_nCompMethod;
+ CString filepath1;
+ CString filepath2;
+ GetComparePaths(pCtxt, di, filepath1, filepath2);
+
+ // Reset text stats
+ m_diffFileData.m_textStats0.clear();
+ m_diffFileData.m_textStats1.clear();
+
+ int code = DIFFCODE::FILE | DIFFCODE::CMPERR;
+ // For user chosen plugins, define bAutomaticUnpacker as false and use the chosen infoHandler
+ // but how can we receive the infoHandler ? DirScan actually only
+ // returns info, but can not use file dependent information.
+
+ // Transformation happens here
+ // text used for automatic mode : plugin filter must match it
+ CString filteredFilenames = filepath1 + "|" + filepath2;
+
+ PackingInfo * infoUnpacker=0;
+ PrediffingInfo * infoPrediffer=0;
+
+ // Get existing or new plugin infos
+ pCtxt->FetchPluginInfos(filteredFilenames, &infoUnpacker, &infoPrediffer);
+
+ // plugin may alter filepaths to temp copies (which we delete before returning in all cases)
+ CString filepathUnpacked1 = filepath1;
+ CString filepathUnpacked2 = filepath2;
+
+ CString filepathTransformed1;
+ CString filepathTransformed2;
+
+ //DiffFileData diffdata; //(filepathTransformed1, filepathTransformed2);
+ // Invoke unpacking plugins
+ if (!Unpack(filepathUnpacked1, filteredFilenames, infoUnpacker))
+ {
+ di.errorDesc = _T("Unpack Error Side 1");
+ goto exitPrepAndCompare;
+ }
+
+ // we use the same plugins for both files, so they must be defined before second file
+ ASSERT(infoUnpacker->bToBeScanned == FALSE);
+
+ if (!Unpack(filepathUnpacked2, filteredFilenames, infoUnpacker))
+ {
+ di.errorDesc = _T("Unpack Error Side 2");
+ goto exitPrepAndCompare;
+ }
+
+ // As we keep handles open on unpacked files, Transform() may not delete them.
+ // Unpacked files will be deleted at end of this function.
+ filepathTransformed1 = filepathUnpacked1;
+ filepathTransformed2 = filepathUnpacked2;
+ m_diffFileData.SetDisplayFilepaths(filepath1, filepath2); // store true names for diff utils patch file
+ if (!m_diffFileData.OpenFiles(filepathTransformed1, filepathTransformed2))
+ {
+ di.errorDesc = _T("OpenFiles Error (before tranform)");
+ goto exitPrepAndCompare;
+ }
+
+ // Invoke prediff'ing plugins
+ if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[0], filepathUnpacked1,
+ filepathTransformed1, filteredFilenames, infoPrediffer,
+ m_diffFileData.m_inf[0].desc))
+ {
+ di.errorDesc = _T("Transform Error Side 1");
+ goto exitPrepAndCompare;
+ }
+
+ // we use the same plugins for both files, so they must be defined before second file
+ ASSERT(infoPrediffer->bToBeScanned == FALSE);
+
+ if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[1], filepathUnpacked2,
+ filepathTransformed2, filteredFilenames, infoPrediffer,
+ m_diffFileData.m_inf[1].desc))
+ {
+ di.errorDesc = _T("Transform Error Side 2");
+ goto exitPrepAndCompare;
+ }
+
+ // If options are binary equivalent, we could check for filesize
+ // difference here, and bail out if files are clearly different
+ // But, then we don't know if file is ascii or binary, and this
+ // affects behavior (also, we don't have an icon for unknown type)
+
+ // Actually compare the files
+ // diffutils_compare_files is a fairly thin front-end to diffutils
+ if (filepathTransformed1 != filepathUnpacked1 || filepathTransformed2 != filepathUnpacked2)
+ {
+ //diffdata.m_sFilepath[0] = filepathTransformed1;
+ //diffdata.m_sFilepath[1] = filepathTransformed2;
+ if (!m_diffFileData.OpenFiles(filepathTransformed1, filepathTransformed2))
+ {
+ di.errorDesc = _T("OpenFiles Error (after tranform)");
+ goto exitPrepAndCompare;
+ }
+ }
+
+ // If either file is larger than limit compare files by quick contents
+ // This allows us to (faster) compare big binary files
+ if (pCtxt->m_nCompMethod == CMP_CONTENT &&
+ (di.left.size > pCtxt->m_nQuickCompareLimit ||
+ di.right.size > pCtxt->m_nQuickCompareLimit))
+ {
+ nCompMethod = CMP_QUICK_CONTENT;
+ }
+
+ if (nCompMethod == CMP_CONTENT)
+ {
+ // use diffutils
+ code = diffutils_compare_files(0);
+ // If unique item, it was being compared to itself to determine encoding
+ // and the #diffs is invalid
+ if (di.isSideRightOnly() || di.isSideLeftOnly())
+ {
+ m_ndiffs = DIFFS_UNKNOWN;
+ m_ntrivialdiffs = DIFFS_UNKNOWN;
+ }
+ if (DIFFCODE::isResultError(code))
+ di.errorDesc = _T("DiffUtils Error");
+
+ if (!DIFFCODE::isResultError(code) && pCtxt->m_bGuessEncoding)
+ {
+ // entire file is in memory in the diffutils buffers
+ // inside the diff context, so may as well use in-memory copy
+ m_diffFileData.GuessEncoding_from_buffer_in_DiffContext(0, pCtxt);
+ m_diffFileData.GuessEncoding_from_buffer_in_DiffContext(1, pCtxt);
+ }
+ }
+ else if (nCompMethod == CMP_QUICK_CONTENT)
+ {
+ // use our own byte-by-byte compare
+ code = byte_compare_files(pCtxt->m_bStopAfterFirstDiff, pCtxt->GetAbortable());
+ // Quick contents doesn't know about diff counts
+ // Set to special value to indicate invalid
+ m_ndiffs = DIFFS_UNKNOWN_QUICKCOMPARE;
+ m_ntrivialdiffs = DIFFS_UNKNOWN_QUICKCOMPARE;
+ di.left.m_textStats = m_diffFileData.m_textStats0;
+ di.right.m_textStats = m_diffFileData.m_textStats1;
+
+ if (!DIFFCODE::isResultError(code) && pCtxt->m_bGuessEncoding)
+ {
+ m_diffFileData.GuessEncoding_from_FileLocation(m_diffFileData.m_FileLocation[0]);
+ m_diffFileData.GuessEncoding_from_FileLocation(m_diffFileData.m_FileLocation[1]);
+ }
+ }
+ else
+ {
+ // Print error since we should have handled by date compare earlier
+ _RPTF0(_CRT_ERROR, "Invalid compare type, DiffFileData can't handle it");
+ di.errorDesc = _T("Bad compare type");
+ goto exitPrepAndCompare;
+ }
+
+
+exitPrepAndCompare:
+ m_diffFileData.Reset();
+ // delete the temp files after comparison
+ if (filepathTransformed1 != filepathUnpacked1)
+ VERIFY(::DeleteFile(filepathTransformed1) || gLog::DeleteFileFailed(filepathTransformed1));
+ if (filepathTransformed2 != filepathUnpacked2)
+ VERIFY(::DeleteFile(filepathTransformed2) || gLog::DeleteFileFailed(filepathTransformed2));
+ if (filepathUnpacked1 != filepath1)
+ VERIFY(::DeleteFile(filepathUnpacked1) || gLog::DeleteFileFailed(filepathUnpacked1));
+ if (filepathUnpacked2 != filepath2)
+ VERIFY(::DeleteFile(filepathUnpacked2) || gLog::DeleteFileFailed(filepathUnpacked2));
+ return code;
+}
+
+
+/**
+ * @brief Compare two specified files.
+ *
+ * @param [in] depth Current directory depth.
+ * @return Compare result as DIFFCODE.
+ */
+int FolderCmp::diffutils_compare_files(int depth)
+{
+ int bin_flag = 0;
+ int bin_file = 0; // bitmap for binary files
+
+ // Do the actual comparison (generating a change script)
+ struct change *script = NULL;
+ BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, &bin_file);
+ if (!success)
+ {
+ return DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
+ }
+ int code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::SAME;
+
+ // make sure to start counting diffs at 0
+ // (usually it is -1 at this point, for unknown)
+ m_ndiffs = 0;
+ m_ntrivialdiffs = 0;
+
+ // Free change script (which we don't want)
+ if (script != NULL)
+ {
+ struct change *p,*e;
+ for (e = script; e; e = p)
+ {
+ if (!e->trivial)
+ ++m_ndiffs;
+ else
+ ++m_ntrivialdiffs;
+ p = e->link;
+ free (e);
+ }
+ if (m_ndiffs > 0)
+ code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
+ }
+
+ // diff_2_files set bin_flag to -1 if different binary
+ // diff_2_files set bin_flag to +1 if same binary
+
+ if (bin_flag != 0)
+ {
+ // Clear text-flag, set binary flag
+ // We don't know diff counts for binary files
+ code = code & ~DIFFCODE::TEXT;
+ switch (bin_file)
+ {
+ case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1;
+ break;
+ case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2;
+ break;
+ case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN;
+ break;
+ default:
+ _RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
+ break;
+ }
+ m_ndiffs = DIFFS_UNKNOWN;
+ }
+
+ if (bin_flag < 0)
+ {
+ // Clear same-flag, set diff-flag
+ code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
+ }
+
+ return code;
+}
+
+/**
+ * @brief Compare two specified files, byte-by-byte
+ * @param [in] bStopAfterFirstDiff Stop compare after we find first difference?
+ * @param [in] piAbortable Interface allowing to abort compare
+ * @return DIFFCODE
+ */
+int FolderCmp::byte_compare_files(BOOL bStopAfterFirstDiff, const IAbortable * piAbortable)
+{
+ // Close any descriptors open for diffutils
+ m_diffFileData.Reset();
+
+ // TODO
+ // Right now, we assume files are in 8-bit encoding
+ // because transform code converted any UCS-2 files to UTF-8
+ // We could compare directly in UCS-2LE here, as an optimization, in that case
+ char buff[2][WMCMPBUFF]; // buffered access to files
+ FILE * fp[2]; // for files to compare
+ FileHandle fhd[2]; // to ensure file handles fp get closed
+ int i;
+ int diffcode = 0;
+
+ // Open both files
+ for (i=0; i<2; ++i)
+ {
+ fp[i] = _tfopen(m_diffFileData.m_FileLocation[i].filepath, _T("rb"));
+ if (!fp[i])
+ return DIFFCODE::CMPERR;
+ fhd[i].Assign(fp[i]);
+ }
+
+ // area of buffer currently holding data
+ __int64 bfstart[2]; // offset into buff[i] where current data resides
+ __int64 bfend[2]; // past-the-end pointer into buff[i], giving end of current data
+ // buff[0] has bytes to process from buff[0][bfstart[0]] to buff[0][bfend[0]-1]
+
+ bool eof[2]; // if we've finished file
+
+ // initialize our buffer pointers and end of file flags
+ for (i=0; i<2; ++i)
+ {
+ bfstart[i] = bfend[i] = 0;
+ eof[i] = false;
+ }
+
+ ByteComparator comparator(ignore_case_flag, ignore_space_change_flag
+ , ignore_all_space_flag, ignore_eol_diff, ignore_blank_lines_flag);
+
+ // Begin loop
+ // we handle the files in WMCMPBUFF sized buffers (variable buff[][])
+ // That is, we do one buffer full at a time
+ // or even less, as we process until one side buffer is empty, then reload that one
+ // and continue
+ while (!eof[0] || !eof[1])
+ {
+ if (piAbortable && piAbortable->ShouldAbort())
+ return DIFFCODE::CMPABORT;
+
+ // load or update buffers as appropriate
+ for (i=0; i<2; ++i)
+ {
+ if (!eof[i] && bfstart[i]==countof(buff[i]))
+ {
+ bfstart[i]=bfend[i] = 0;
+ }
+ if (!eof[i] && bfend[i]<countof(buff[i])-1)
+ {
+ // Assume our blocks are in range of unsigned int
+ unsigned int space = countof(buff[i]) - bfend[i];
+ size_t rtn = fread(&buff[i][bfend[i]], 1, space, fp[i]);
+ if (ferror(fp[i]))
+ return DIFFCODE::CMPERR;
+ if (feof(fp[i]))
+ eof[i] = true;
+ bfend[i] += rtn;
+ }
+ }
+
+ // where to start comparing right now
+ LPCSTR ptr0 = &buff[0][bfstart[0]];
+ LPCSTR ptr1 = &buff[1][bfstart[1]];
+
+ // remember where we started
+ LPCSTR orig0 = ptr0, orig1 = ptr1;
+
+ // how far can we go right now?
+ LPCSTR end0 = &buff[0][bfend[0]];
+ LPCSTR end1 = &buff[1][bfend[1]];
+
+ __int64 offset0 = (ptr0 - &buff[0][0]);
+ __int64 offset1 = (ptr1 - &buff[1][0]);
+
+ // are these two buffers the same?
+ if (!comparator.CompareBuffers(m_diffFileData.m_textStats0, m_diffFileData.m_textStats1,
+ ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1))
+ {
+ if (bStopAfterFirstDiff)
+ {
+ // By bailing out here
+ // we leave our text statistics incomplete
+ return diffcode | DIFFCODE::DIFF;
+ }
+ else
+ {
+ diffcode |= DIFFCODE::DIFF;
+ ptr0 = end0;
+ ptr1 = end1;
+ }
+ }
+ else
+ {
+ ptr0 = end0;
+ ptr1 = end1;
+ }
+
+
+ // did we finish both files?
+ if (eof[0] && eof[1])
+ {
+
+ BOOL bBin0 = (m_diffFileData.m_textStats0.nzeros>0);
+ BOOL bBin1 = (m_diffFileData.m_textStats1.nzeros>0);
+
+ if (bBin0 && bBin1)
+ diffcode |= DIFFCODE::BIN;
+ else if (bBin0)
+ diffcode |= DIFFCODE::BINSIDE1;
+ else if (bBin1)
+ diffcode |= DIFFCODE::BINSIDE2;
+
+ // If either unfinished, they differ
+ if (ptr0 != end0 || ptr1 != end1)
+ diffcode = (diffcode & DIFFCODE::DIFF);
+
+ if (diffcode & DIFFCODE::DIFF)
+ return diffcode | DIFFCODE::DIFF;
+ else
+ return diffcode | DIFFCODE::SAME;
+ }
+
+ // move our current pointers over what we just compared
+ ASSERT(ptr0 >= orig0);
+ ASSERT(ptr1 >= orig1);
+ bfstart[0] += ptr0-orig0;
+ bfstart[1] += ptr1-orig1;
+ }
+ return diffcode;
+}
+
+/**
+ * @brief Compare two files using diffutils.
+ *
+ * Compare two files (in DiffFileData param) using diffutils. Run diffutils
+ * inside SEH so we can trap possible error and exceptions. If error or
+ * execption is trapped, return compare failure.
+ * @param [out] diffs Pointer to list of change structs where diffdata is stored.
+ * @param [in] depth Depth in folder compare (we use 0).
+ * @param [out] bin_status used to return binary status from compare.
+ * @param [in] bMovedBlocks If TRUE moved blocks are analyzed.
+ * @param [out] bin_file Returns which file was binary file as bitmap.
+ So if first file is binary, first bit is set etc. Can be NULL if binary file
+ info is not needed (faster compare since diffutils don't bother checking
+ second file if first is binary).
+ * @return TRUE when compare succeeds, FALSE if error happened during compare.
+ */
+BOOL FolderCmp::Diff2Files(struct change ** diffs, int depth,
+ int * bin_status, BOOL bMovedBlocks, int * bin_file)
+{
+ BOOL bRet = TRUE;
+ __try
+ {
+ *diffs = diff_2_files (m_diffFileData.m_inf, depth, bin_status, bMovedBlocks, bin_file);
+ CopyDiffutilTextStats(m_diffFileData.m_inf, &m_diffFileData);
+ }
+ __except (EXCEPTION_EXECUTE_HANDLER)
+ {
+ *diffs = NULL;
+ bRet = FALSE;
+ }
+ return bRet;
+}
+
+/**
+ * @brief Copy both left & right text stats results back into the DiffFileData text stats
+ */
+static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData)
+{
+ CopyTextStats(&inf[0], &diffData->m_textStats0);
+ CopyTextStats(&inf[1], &diffData->m_textStats1);
+}
+
+/**
+ * @brief Copy text stat results from diffutils back into the FileTextStats structure
+ */
+static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats)
+{
+ myTextStats->ncrlfs = inf->count_crlfs;
+ myTextStats->ncrs = inf->count_crs;
+ myTextStats->nlfs = inf->count_lfs;
+}
+
+/**
+ * @brief Get actual compared paths from DIFFITEM.
+ * @note If item is unique, same path is returned for both.
+ */
+void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, CString & left, CString & right)
+{
+ static const TCHAR backslash[] = _T("\\");
+
+ if (!di.isSideRightOnly())
+ {
+ // Compare file to itself to detect encoding
+ left = pCtxt->GetNormalizedLeft();
+ if (!paths_EndsWithSlash(left))
+ left += backslash;
+ if (!di.sLeftSubdir.IsEmpty())
+ left += di.sLeftSubdir + backslash;
+ left += di.sLeftFilename;
+ if (di.isSideLeftOnly())
+ right = left;
+ }
+ if (!di.isSideLeftOnly())
+ {
+ // Compare file to itself to detect encoding
+ right = pCtxt->GetNormalizedRight();
+ if (!paths_EndsWithSlash(right))
+ right += backslash;
+ if (!di.sRightSubdir.IsEmpty())
+ right += di.sRightSubdir + backslash;
+ right += di.sRightFilename;
+ if (di.isSideRightOnly())
+ left = right;
+ }
+}
+
+/**
+ * @brief Invoke appropriate plugins for unpacking
+ * return false if anything fails
+ * caller has to DeleteFile filepathTransformed, if it differs from filepath
+ */
+static bool Unpack(CString & filepathTransformed,
+ const CString & filteredFilenames, PackingInfo * infoUnpacker)
+{
+ // first step : unpack (plugins)
+ if (infoUnpacker->bToBeScanned)
+ {
+ if (!FileTransform_Unpacking(filepathTransformed, filteredFilenames, infoUnpacker, &infoUnpacker->subcode))
+ return false;
+ }
+ else
+ {
+ if (!FileTransform_Unpacking(filepathTransformed, infoUnpacker, &infoUnpacker->subcode))
+ return false;
+ }
+ return true;
+}
Added: trunk/Src/FolderCmp.h
===================================================================
--- trunk/Src/FolderCmp.h (rev 0)
+++ trunk/Src/FolderCmp.h 2007-01-24 18:41:49 UTC (rev 4075)
@@ -0,0 +1,41 @@
+/**
+ * @file FolderCmp.h
+ *
+ * @brief Declaration file for FolderCmp
+ */
+
+#ifndef _FOLDERCMP_H_
+#define _FOLDERCMP_H_
+
+#include "DiffFileData.h"
+
+class CDiffContext;
+class IAbortable;
+
+/**
+ * @brief Class implementing file compare for folder compare.
+ * This class implements (called from DirScan.cpp) compare of two files
+ * during folder compare. The class implements both diffutils compare and
+ * quick compare.
+ */
+class FolderCmp
+{
+public:
+
+ enum { DIFFS_UNKNOWN=-1, DIFFS_UNKNOWN_QUICKCOMPARE=-9 };
+
+ FolderCmp();
+ int prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di);
+ int diffutils_compare_files(int depth);
+ int byte_compare_files(BOOL bStopAfterFirstDiff, const IAbortable * piAbortable);
+ BOOL Diff2Files(struct change ** diffs, int depth,
+ int * bin_status, BOOL bMovedBlocks, int * bin_file);
+
+ int m_ndiffs;
+ int m_ntrivialdiffs;
+
+ DiffFileData m_diffFileData;
+};
+
+
+#endif // _FOLDERCMP_H_
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-01-22 17:34:50 UTC (rev 4074)
+++ trunk/Src/Merge.dsp 2007-01-24 18:41:49 UTC (rev 4075)
@@ -449,6 +449,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FolderCmp.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.cpp
# End Source File
# Begin Source File
@@ -1193,6 +1197,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FolderCmp.h
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.h
# End Source File
# Begin Source File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-25 22:46:15
|
Revision: 4077
http://svn.sourceforge.net/winmerge/?rev=4077&view=rev
Author: gerundt
Date: 2007-01-25 14:46:13 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
PATCH: [ 1644785 ] 24bit icons for "Window" menu
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/res/cascade.bmp
trunk/Src/res/change_pane.bmp
trunk/Src/res/close.bmp
trunk/Src/res/horizontally.bmp
trunk/Src/res/vertically.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-24 21:44:13 UTC (rev 4076)
+++ trunk/Src/Changes.txt 2007-01-25 22:46:13 UTC (rev 4077)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-25 Tim
+ PATCH: [ 1644785 ] 24bit icons for "Window" menu
+ Based on icons by Alexander Skinner
+ Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
+
2007-01-24 Kimmo
PATCH: [ 1642809 ] Move compare code out from DiffFileData
Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
Modified: trunk/Src/res/cascade.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/change_pane.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/close.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/horizontally.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/vertically.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-25 22:48:07
|
Revision: 4078
http://svn.sourceforge.net/winmerge/?rev=4078&view=rev
Author: gerundt
Date: 2007-01-25 14:48:05 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
PATCH: [ 1644800 ] 24bit "Goto" icon
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/res/go_to.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-25 22:46:13 UTC (rev 4077)
+++ trunk/Src/Changes.txt 2007-01-25 22:48:05 UTC (rev 4078)
@@ -6,6 +6,9 @@
PATCH: [ 1644785 ] 24bit icons for "Window" menu
Based on icons by Alexander Skinner
Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
+ PATCH: [ 1644800 ] 24bit "Goto" icon
+ Based on icons by Alexander Skinner
+ Src/res: go_to.bmp
2007-01-24 Kimmo
PATCH: [ 1642809 ] Move compare code out from DiffFileData
Modified: trunk/Src/res/go_to.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-26 14:57:02
|
Revision: 4079
http://svn.sourceforge.net/winmerge/?rev=4079&view=rev
Author: kimmov
Date: 2007-01-26 06:56:58 -0800 (Fri, 26 Jan 2007)
Log Message:
-----------
PATCH: [ 1644668 ] Fix ANSI regexps
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/FileFilterHelper.cpp
trunk/Src/FilterList.cpp
trunk/Src/FilterList.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-25 22:48:05 UTC (rev 4078)
+++ trunk/Src/Changes.txt 2007-01-26 14:56:58 UTC (rev 4079)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-25 Kimmo
+ PATCH: [ 1644668 ] Fix ANSI regexps
+ Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
+
2007-01-25 Tim
PATCH: [ 1644785 ] 24bit icons for "Window" menu
Based on icons by Alexander Skinner
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-01-25 22:48:05 UTC (rev 4078)
+++ trunk/Src/DiffWrapper.cpp 2007-01-26 14:56:58 UTC (rev 4079)
@@ -1149,7 +1149,6 @@
int line = StartPos;
while (line <= EndPos && linesMatch == true)
- // for (int i = StartPos; i <= EndPos; i++)
{
std::string LineData(files[FileNo].linbuf[line]);
size_t EolPos = LineData.find_first_of(EolIndicators);
@@ -1396,18 +1395,32 @@
m_pFilterList->RemoveAllFilters();
if (!filterStr.IsEmpty())
{
- char * regexp_utf = UCS2UTF8_ConvertToUtf8(filterStr);
+ char * regexp_str;
+ FilterList::EncodingType type;
+
+#ifdef UNICODE
+ regexp_str = UCS2UTF8_ConvertToUtf8(filterStr);
+ type = FilterList::ENC_UTF8;
+#else
+ CString tmp_str(filterStr);
+ regexp_str = tmp_str.GetBuffer();
+ type = FilterList::ENC_ANSI;
+#endif
// Add every "line" of regexps to regexp list
char * token;
const char sep[] = "\r\n";
- token = strtok(regexp_utf, sep);
+ token = strtok(regexp_str, sep);
while (token)
{
- m_pFilterList->AddRegExp(token);
+ m_pFilterList->AddRegExp(token, type);
token = strtok(NULL, sep);
}
- UCS2UTF8_Dealloc(regexp_utf);
+#ifdef UNICODE
+ UCS2UTF8_Dealloc(regexp_str);
+#else
+ tmp_str.ReleaseBuffer();
+#endif
}
}
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2007-01-25 22:48:05 UTC (rev 4078)
+++ trunk/Src/FileFilterHelper.cpp 2007-01-26 14:56:58 UTC (rev 4079)
@@ -207,9 +207,23 @@
m_sMask = strMask;
CString regExp = ParseExtensions(strMask);
- char * regexp_utf = UCS2UTF8_ConvertToUtf8(regExp);
- m_pMaskFilter->AddRegExp(regexp_utf);
- UCS2UTF8_Dealloc(regexp_utf);
+ char * regexp_str;
+ FilterList::EncodingType type;
+
+#ifdef UNICODE
+ regexp_str = UCS2UTF8_ConvertToUtf8(regExp);
+ type = FilterList::ENC_UTF8;
+#else
+ regexp_str = regExp.GetBuffer();
+#endif
+
+ m_pMaskFilter->AddRegExp(regexp_str, type);
+
+#ifdef UNICODE
+ UCS2UTF8_Dealloc(regexp_str);
+#else
+ regExp.ReleaseBuffer();
+#endif
}
/**
Modified: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp 2007-01-25 22:48:05 UTC (rev 4078)
+++ trunk/Src/FilterList.cpp 2007-01-26 14:56:58 UTC (rev 4079)
@@ -32,16 +32,24 @@
* @brief Add new regular expression to the list.
* This function adds new regular expression to the list of expressions.
* The regular expression is compiled and studied for better performance.
- * @param [in] regularExpression Regular expression as UTF-8 string.
+ * @param [in] regularExpression Regular expression string.
+ * @param [in] encoding Expression encoding.
*/
-void FilterList::AddRegExp(const char * regularExpression)
+void FilterList::AddRegExp(const char * regularExpression, EncodingType encoding)
{
filter_item item;
item.filterAsString = strdup(regularExpression);
const char * errormsg = NULL;
int erroroffset = 0;
- pcre *regexp = pcre_compile(regularExpression, PCRE_UTF8, &errormsg,
+ int pcre_flags = 0;
+
+ if (encoding == ENC_UTF8)
+ pcre_flags |= PCRE_UTF8;
+ else if (encoding != ENC_ANSI)
+ _RPTF0(_CRT_ERROR, "Unregognized regexp encoding!");
+
+ pcre *regexp = pcre_compile(regularExpression, pcre_flags, &errormsg,
&erroroffset, NULL);
if (regexp)
{
Modified: trunk/Src/FilterList.h
===================================================================
--- trunk/Src/FilterList.h 2007-01-25 22:48:05 UTC (rev 4078)
+++ trunk/Src/FilterList.h 2007-01-26 14:56:58 UTC (rev 4079)
@@ -34,10 +34,16 @@
class FilterList
{
public:
+ enum EncodingType
+ {
+ ENC_ANSI,
+ ENC_UTF8,
+ };
+
FilterList();
~FilterList();
- void AddRegExp(const char *regularExpression);
+ void AddRegExp(const char *regularExpression, EncodingType encoding);
void RemoveAllFilters();
bool HasRegExps();
bool Match(const char *string);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-26 14:59:56
|
Revision: 4080
http://svn.sourceforge.net/winmerge/?rev=4080&view=rev
Author: kimmov
Date: 2007-01-26 06:59:50 -0800 (Fri, 26 Jan 2007)
Log Message:
-----------
PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffContext.cpp
trunk/Src/DiffContext.h
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
trunk/Src/DirDoc.cpp
trunk/Src/DirDoc.h
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/Changes.txt 2007-01-26 14:59:50 UTC (rev 4080)
@@ -5,6 +5,9 @@
2007-01-25 Kimmo
PATCH: [ 1644668 ] Fix ANSI regexps
Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
+ PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
+ Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
+ DirDoc.h FolderCmp.cpp FolderCmp.h
2007-01-25 Tim
PATCH: [ 1644785 ] 24bit icons for "Window" menu
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/DiffContext.cpp 2007-01-26 14:59:50 UTC (rev 4080)
@@ -32,6 +32,7 @@
#include "Merge.h"
#include "CompareStats.h"
#include "version.h"
+#include "FilterList.h"
#include "DiffContext.h"
#include "paths.h"
#include "coretools.h"
@@ -66,6 +67,7 @@
, m_pList(&m_dirlist)
, m_piAbortable(NULL)
, m_bStopAfterFirstDiff(FALSE)
+, m_pFilterList(NULL)
{
m_paths.SetLeft(pszLeft);
m_paths.SetRight(pszRight);
@@ -94,8 +96,14 @@
m_nCompMethod = src.m_nCompMethod;
m_bIgnoreSmallTimeDiff = src.m_bIgnoreSmallTimeDiff;
m_bStopAfterFirstDiff = src.m_bStopAfterFirstDiff;
+ m_pFilterList = src.m_pFilterList;
}
+CDiffContext::~CDiffContext()
+{
+ delete m_pFilterList;
+}
+
/**
* @brief Fetch & return the fixed file version as a dotted string
*/
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/DiffContext.h 2007-01-26 14:59:50 UTC (rev 4080)
@@ -28,6 +28,7 @@
struct DIFFITEM;
class CompareStats;
class IAbortable;
+class FilterList;
// Interface for reporting current file, as diff traverses file tree
class IDiffStatus
@@ -56,6 +57,7 @@
public:
CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight);
CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight, CDiffContext& src);
+ ~CDiffContext();
// add & remove differences
virtual void AddDiff(const DIFFITEM & di);
@@ -96,6 +98,7 @@
CompareStats *m_pCompareStats; /**< Pointer to compare statistics */
BOOL m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
int m_nQuickCompareLimit; /**< Bigger files are always compared with quick compare */
+ FilterList * m_pFilterList; /**< Filter list for line filters */
private:
CList<DIFFITEM,DIFFITEM&> *m_pList; /**< Pointer to list, used to access list */
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/DiffThread.cpp 2007-01-26 14:59:50 UTC (rev 4080)
@@ -24,6 +24,7 @@
#include "stdafx.h"
#include "diffcontext.h"
+#include "FilterList.h"
#include "diffthread.h"
#include "diff.h"
#include "DirScan.h"
@@ -82,37 +83,35 @@
* @brief Default constructor
*/
CDiffThread::CDiffThread()
+: m_pDiffContext(NULL)
+, m_thread(NULL)
+, m_msgUpdateUI(0)
+, m_hWnd(0)
+, m_bAborting(FALSE)
{
- m_pDiffContext = NULL;
- m_thread = NULL;
m_pDiffParm = new DiffFuncStruct;
m_pAbortgate = new DiffThreadAbortable(this);
- m_msgUpdateUI = 0;
- m_hWnd = 0;
- m_bAborting = FALSE;
}
CDiffThread::~CDiffThread()
{
delete m_pDiffParm;
delete m_pAbortgate;
-
}
/**
* @brief Sets context pointer forwarded to thread
*/
-CDiffContext * CDiffThread::SetContext(CDiffContext * pCtx)
+void CDiffThread::SetContext(CDiffContext * pCtx)
{
- CDiffContext *pTempContext = m_pDiffContext;
m_pDiffContext = pCtx;
- return pTempContext;
}
/**
* @brief Start directory compare thread
*/
-UINT CDiffThread::CompareDirectories(CString dir1, CString dir2, BOOL bRecursive)
+UINT CDiffThread::CompareDirectories(const CString & dir1,
+ const CString & dir2, BOOL bRecursive)
{
ASSERT(m_pDiffParm->nThreadState != THREAD_COMPARING);
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/DiffThread.h 2007-01-26 14:59:50 UTC (rev 4080)
@@ -51,8 +51,8 @@
// creation and use, called on main thread
CDiffThread();
~CDiffThread();
- CDiffContext * SetContext(CDiffContext * pCtx);
- UINT CompareDirectories(CString dir1, CString dir2, BOOL bRecursive);
+ void SetContext(CDiffContext * pCtx);
+ UINT CompareDirectories(const CString & dir1, const CString & dir2, BOOL bRecursive);
void SetHwnd(HWND hWnd);
void SetMessageIDs(UINT updateMsg, UINT statusMsg);
void SetCompareSelected(bool bSelected = false);
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/DirDoc.cpp 2007-01-26 14:59:50 UTC (rev 4080)
@@ -32,6 +32,8 @@
#include <Shlwapi.h> // PathFindFileName()
#include "Merge.h"
#include "CompareStats.h"
+#include "FilterList.h"
+#include "Ucs2Utf8.h"
#include "DirDoc.h"
#include "DirFrame.h"
#include "diff.h"
@@ -267,6 +269,43 @@
return AllowUpwardDirectory::No;
}
+void CDirDoc::LoadLineFilterList()
+{
+ ASSERT(m_pCtxt);
+
+ BOOL bFilters = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
+ if (!bFilters)
+ {
+ delete m_pCtxt->m_pFilterList;
+ m_pCtxt->m_pFilterList = NULL;
+ return;
+ }
+
+ if (m_pCtxt->m_pFilterList)
+ m_pCtxt->m_pFilterList->RemoveAllFilters();
+ else
+ m_pCtxt->m_pFilterList = new FilterList();
+
+ CString filters = GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP);
+ char * regexp_str;
+ FilterList::EncodingType type;
+
+#ifdef UNICODE
+ regexp_str = UCS2UTF8_ConvertToUtf8(filters);
+ type = FilterList::ENC_UTF8;
+#else
+ regexp_str = filters.GetBuffer();
+#endif
+
+ m_pCtxt->m_pFilterList->AddRegExp(regexp_str, type);
+
+#ifdef UNICODE
+ UCS2UTF8_Dealloc(regexp_str);
+#else
+ filters.ReleaseBuffer();
+#endif
+}
+
/**
* @brief Perform directory comparison again from scratch
*/
@@ -295,6 +334,8 @@
m_pCtxt->RemoveAll();
}
+ LoadLineFilterList();
+
m_pCtxt->m_hDirFrame = pf->GetSafeHwnd();
m_pCtxt->m_bGuessEncoding = GetOptionsMgr()->GetBool(OPT_CP_DETECT);
m_pCtxt->m_nCompMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
Modified: trunk/Src/DirDoc.h
===================================================================
--- trunk/Src/DirDoc.h 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/DirDoc.h 2007-01-26 14:59:50 UTC (rev 4080)
@@ -149,6 +149,8 @@
const CompareStats * GetCompareStats() const { return m_pCompareStats; };
protected:
+ void LoadLineFilterList();
+
CDiffWrapper m_diffWrapper;
// Generated message map functions
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/FolderCmp.cpp 2007-01-26 14:59:50 UTC (rev 4080)
@@ -6,6 +6,7 @@
#include "stdafx.h"
#include "paths.h"
+#include "FilterList.h"
#include "DiffContext.h"
#include "DiffWrapper.h"
#include "FileTransform.h"
@@ -46,6 +47,7 @@
CString filepath1;
CString filepath2;
GetComparePaths(pCtxt, di, filepath1, filepath2);
+ m_pCtx = pCtxt;
// Reset text stats
m_diffFileData.m_textStats0.clear();
@@ -236,6 +238,69 @@
m_ndiffs = 0;
m_ntrivialdiffs = 0;
+ if (script && m_pCtx->m_pFilterList && m_pCtx->m_pFilterList->HasRegExps())
+ {
+ struct change *next = script;
+ struct change *thisob=0, *end=0;
+
+ while (next)
+ {
+ /* Find a set of changes that belong together. */
+ thisob = next;
+ end = find_change(next);
+
+ /* Disconnect them from the rest of the changes,
+ making them a hunk, and remember the rest for next iteration. */
+ next = end->link;
+ end->link = 0;
+#ifdef DEBUG
+ debug_script(thisob);
+#endif
+
+ {
+ /* Determine range of line numbers involved in each file. */
+ int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
+ analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
+// int op=0;
+ if (deletes || inserts || thisob->trivial)
+ {
+/* if (deletes && inserts)
+ op = OP_DIFF;
+ else if (deletes)
+ op = OP_LEFTONLY;
+ else if (inserts)
+ op = OP_RIGHTONLY;
+ else
+ op = OP_TRIVIAL;
+*/
+ /* Print the lines that the first file has. */
+ int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;
+ translate_range(&m_diffFileData.m_inf[0], first0, last0, &trans_a0, &trans_b0);
+ translate_range(&m_diffFileData.m_inf[1], first1, last1, &trans_a1, &trans_b1);
+
+ //Determine quantity of lines in this block for both sides
+ int QtyLinesLeft = (trans_b0 - trans_a0);
+ int QtyLinesRight = (trans_b1 - trans_a1);
+
+ // Match lines against regular expression filters
+ // Our strategy is that every line in both sides must
+ // match regexp before we mark difference as ignored.
+ bool match2 = false;
+ bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
+ if (match1)
+ match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
+ if (match1 && match2)
+ //op = OP_TRIVIAL;
+ thisob->trivial = 1;
+
+ }
+ /* Reconnect the script so it will all be freed properly. */
+ end->link = next;
+ }
+ }
+ }
+
+
// Free change script (which we don't want)
if (script != NULL)
{
@@ -467,6 +532,47 @@
}
/**
+ * @brief Match regular expression list against given difference.
+ * This function matches the regular expression list against the difference
+ * (given as start line and end line). Matching the diff requires that all
+ * lines in difference match.
+ * @param [in] StartPos First line of the difference.
+ * @param [in] endPos Last line of the difference.
+ * @param [in] FileNo File to match.
+ * return true if any of the expressions matches.
+ */
+bool FolderCmp::RegExpFilter(int StartPos, int EndPos, int FileNo)
+{
+ if (m_pCtx->m_pFilterList == NULL)
+ {
+ _RPTF0(_CRT_ERROR, "FolderCmp::RegExpFilter() called when "
+ "filterlist doesn't exist (=NULL)");
+ return false;
+ }
+
+ const char EolIndicators[] = "\r\n"; //List of characters used as EOL
+ bool linesMatch = true; // set to false when non-matching line is found.
+ int line = StartPos;
+
+ while (line <= EndPos && linesMatch == true)
+ {
+ std::string LineData(files[FileNo].linbuf[line]);
+ size_t EolPos = LineData.find_first_of(EolIndicators);
+ if (EolPos != std::string::npos)
+ {
+ LineData.erase(EolPos);
+ }
+
+ if (!m_pCtx->m_pFilterList->Match(LineData.c_str()))
+ {
+ linesMatch = false;
+ }
+ ++line;
+ }
+ return linesMatch;
+}
+
+/**
* @brief Copy both left & right text stats results back into the DiffFileData text stats
*/
static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData)
Modified: trunk/Src/FolderCmp.h
===================================================================
--- trunk/Src/FolderCmp.h 2007-01-26 14:56:58 UTC (rev 4079)
+++ trunk/Src/FolderCmp.h 2007-01-26 14:59:50 UTC (rev 4080)
@@ -30,11 +30,13 @@
int byte_compare_files(BOOL bStopAfterFirstDiff, const IAbortable * piAbortable);
BOOL Diff2Files(struct change ** diffs, int depth,
int * bin_status, BOOL bMovedBlocks, int * bin_file);
+ bool FolderCmp::RegExpFilter(int StartPos, int EndPos, int FileNo);
int m_ndiffs;
int m_ntrivialdiffs;
DiffFileData m_diffFileData;
+ CDiffContext * m_pCtx;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-01-27 10:01:31
|
Revision: 4081
http://svn.sourceforge.net/winmerge/?rev=4081&view=rev
Author: sdottaka
Date: 2007-01-27 02:01:27 -0800 (Sat, 27 Jan 2007)
Log Message:
-----------
PATCH: [ 1644668 ] Fix ANSI regexps(2)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DirDoc.cpp
trunk/Src/FileFilterHelper.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-26 14:59:50 UTC (rev 4080)
+++ trunk/Src/Changes.txt 2007-01-27 10:01:27 UTC (rev 4081)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-27 Takashi
+ PATCH: [ 1644668 ] Fix ANSI regexps(2)
+ Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
+
2007-01-25 Kimmo
PATCH: [ 1644668 ] Fix ANSI regexps
Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-01-26 14:59:50 UTC (rev 4080)
+++ trunk/Src/DiffWrapper.cpp 2007-01-27 10:01:27 UTC (rev 4081)
@@ -1403,7 +1403,7 @@
type = FilterList::ENC_UTF8;
#else
CString tmp_str(filterStr);
- regexp_str = tmp_str.GetBuffer();
+ regexp_str = tmp_str.LockBuffer();
type = FilterList::ENC_ANSI;
#endif
@@ -1419,7 +1419,7 @@
#ifdef UNICODE
UCS2UTF8_Dealloc(regexp_str);
#else
- tmp_str.ReleaseBuffer();
+ tmp_str.UnlockBuffer();
#endif
}
}
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-01-26 14:59:50 UTC (rev 4080)
+++ trunk/Src/DirDoc.cpp 2007-01-27 10:01:27 UTC (rev 4081)
@@ -294,7 +294,8 @@
regexp_str = UCS2UTF8_ConvertToUtf8(filters);
type = FilterList::ENC_UTF8;
#else
- regexp_str = filters.GetBuffer();
+ regexp_str = filters.LockBuffer();
+ type = FilterList::ENC_ANSI;
#endif
m_pCtxt->m_pFilterList->AddRegExp(regexp_str, type);
@@ -302,7 +303,7 @@
#ifdef UNICODE
UCS2UTF8_Dealloc(regexp_str);
#else
- filters.ReleaseBuffer();
+ filters.UnlockBuffer();
#endif
}
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2007-01-26 14:59:50 UTC (rev 4080)
+++ trunk/Src/FileFilterHelper.cpp 2007-01-27 10:01:27 UTC (rev 4081)
@@ -214,7 +214,8 @@
regexp_str = UCS2UTF8_ConvertToUtf8(regExp);
type = FilterList::ENC_UTF8;
#else
- regexp_str = regExp.GetBuffer();
+ regexp_str = regExp.LockBuffer();
+ type = FilterList::ENC_ANSI;
#endif
m_pMaskFilter->AddRegExp(regexp_str, type);
@@ -222,7 +223,7 @@
#ifdef UNICODE
UCS2UTF8_Dealloc(regexp_str);
#else
- regExp.ReleaseBuffer();
+ regExp.UnlockBuffer();
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-01-28 02:42:37
|
Revision: 4082
http://svn.sourceforge.net/winmerge/?rev=4082&view=rev
Author: sdottaka
Date: 2007-01-27 18:42:36 -0800 (Sat, 27 Jan 2007)
Log Message:
-----------
PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/editlib/ccrystaltextview.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-27 10:01:27 UTC (rev 4081)
+++ trunk/Src/Changes.txt 2007-01-28 02:42:36 UTC (rev 4082)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-28 Takashi
+ PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
+ Src: MergeEditView.cpp MergeEditView.h
+ Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
+
2007-01-27 Takashi
PATCH: [ 1644668 ] Fix ANSI regexps(2)
Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2007-01-27 10:01:27 UTC (rev 4081)
+++ trunk/Src/MergeEditView.cpp 2007-01-28 02:42:36 UTC (rev 4082)
@@ -2860,6 +2860,24 @@
}
/**
+ * @brief Invalidate sub line index cache from the specified index to the end of file.
+ * @param [in] nLineIndex Index of the first line to invalidate
+ */
+void CMergeEditView::InvalidateSubLineIndexCache( int nLineIndex )
+{
+ CMergeDoc * pDoc = GetDocument();
+ ASSERT(pDoc != NULL);
+
+ // We have to invalidate sub line index cache on both panes.
+ for (int nPane = 0; nPane < 2; nPane++)
+ {
+ CMergeEditView *pView = pDoc->GetView(nPane);
+ if (pView)
+ pView->CCrystalTextView::InvalidateSubLineIndexCache( nLineIndex );
+ }
+}
+
+/**
* @brief Swap the positions of the two panes
*/
void CMergeEditView::OnViewSwapPanes()
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2007-01-27 10:01:27 UTC (rev 4081)
+++ trunk/Src/MergeEditView.h 2007-01-28 02:42:36 UTC (rev 4082)
@@ -167,6 +167,7 @@
CCrystalTextView::GetLineBySubLine(nSubLineIndex, nLine, nSubLine);
}
virtual int GetEmptySubLines( int nLineIndex );
+ virtual void InvalidateSubLineIndexCache( int nLineIndex );
void RepaintLocationPane();
void SlavePrint(CDC* pDC, CPrintInfo* pInfo);
bool SetPredifferByName(const CString & prediffer);
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2007-01-27 10:01:27 UTC (rev 4081)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2007-01-28 02:42:36 UTC (rev 4082)
@@ -490,8 +490,11 @@
m_bBookmarkExist = FALSE;
//BEGIN SW
m_panSubLines = new CArray<int, int>();
+ m_panSubLineIndexCache = new CArray<int, int>();
ASSERT( m_panSubLines );
+ ASSERT( m_panSubLineIndexCache );
m_panSubLines->SetSize( 0, 4096 );
+ m_panSubLineIndexCache->SetSize( 0, 4096 );
m_pstrIncrementalSearchString = new CString;
ASSERT( m_pstrIncrementalSearchString );
@@ -506,6 +509,8 @@
m_bRememberLastPos = false;
m_pColors = NULL;
+
+ m_nLastLineIndexCalculatedSubLineIndex = -1;
}
CCrystalTextView::~CCrystalTextView ()
@@ -535,6 +540,11 @@
delete m_panSubLines;
m_panSubLines = NULL;
}
+ if( m_panSubLineIndexCache )
+ {
+ delete m_panSubLineIndexCache;
+ m_panSubLineIndexCache = NULL;
+ }
if( m_pstrIncrementalSearchString )
{
delete m_pstrIncrementalSearchString;
@@ -1279,6 +1289,9 @@
void CCrystalTextView::InvalidateLineCache( int nLineIndex1, int nLineIndex2 /*= -1*/ )
{
+ // invalidate cached sub line index
+ InvalidateSubLineIndexCache( nLineIndex1 );
+
// invalidate cached sub line count
if( nLineIndex2 == -1 && nLineIndex1 < m_panSubLines->GetSize() )
@@ -1306,6 +1319,16 @@
}
/**
+ * @brief Invalidate sub line index cache from the specified index to the end of file.
+ * @param [in] nLineIndex Index of the first line to invalidate
+ */
+void CCrystalTextView::InvalidateSubLineIndexCache( int nLineIndex )
+{
+ if (m_nLastLineIndexCalculatedSubLineIndex > nLineIndex)
+ m_nLastLineIndexCalculatedSubLineIndex = nLineIndex - 1;
+}
+
+/**
* @brief Invalidate items related screen size.
*/
void CCrystalTextView::InvalidateScreenRect()
@@ -2798,12 +2821,9 @@
return nLineCount;
// calculate number of sub lines
- int nSubLineCount = 0;
-
- for( int i = 0; i < nLineCount; i++ )
- nSubLineCount+= GetSubLines( i );
-
- return nSubLineCount;
+ if (nLineCount <= 0)
+ return 0;
+ return CCrystalTextView::GetSubLineIndex( nLineCount - 1 ) + GetSubLines( nLineCount - 1 );
}
int CCrystalTextView::GetSubLineIndex( int nLineIndex )
@@ -2819,9 +2839,27 @@
if( nLineIndex >= nLineCount )
nLineIndex = nLineCount - 1;
- for( int i = 0; i < nLineIndex; i++ )
- nSubLineCount+= GetSubLines( i );
+ // return cached subline index of the line if it is already cached.
+ if (nLineIndex <= m_nLastLineIndexCalculatedSubLineIndex)
+ return (*m_panSubLineIndexCache)[nLineIndex];
+ // calculate subline index of the line and cache it.
+ if (m_nLastLineIndexCalculatedSubLineIndex >= 0)
+ nSubLineCount = (*m_panSubLineIndexCache)[m_nLastLineIndexCalculatedSubLineIndex];
+ else
+ {
+ m_nLastLineIndexCalculatedSubLineIndex = 0;
+ m_panSubLineIndexCache->SetAtGrow( 0, 0 );
+ }
+
+ for( int i = m_nLastLineIndexCalculatedSubLineIndex; i < nLineIndex; i++ )
+ {
+ m_panSubLineIndexCache->SetAtGrow( i, nSubLineCount);
+ nSubLineCount+= GetSubLines( i );
+ }
+ m_panSubLineIndexCache->SetAtGrow( nLineIndex, nSubLineCount);
+ m_nLastLineIndexCalculatedSubLineIndex = nLineIndex;
+
return nSubLineCount;
}
Modified: trunk/Src/editlib/ccrystaltextview.h
===================================================================
--- trunk/Src/editlib/ccrystaltextview.h 2007-01-27 10:01:27 UTC (rev 4081)
+++ trunk/Src/editlib/ccrystaltextview.h 2007-01-28 02:42:36 UTC (rev 4082)
@@ -128,6 +128,8 @@
initialize the member objects. This would destroy a CArray object.
*/
CArray<int, int> *m_panSubLines;
+ CArray<int, int> *m_panSubLineIndexCache;
+ int m_nLastLineIndexCalculatedSubLineIndex;
//END SW
int m_nMaxLineLength;
@@ -539,6 +541,7 @@
-1 (default) all lines from nLineIndex1 to the end are invalidated.
*/
virtual void InvalidateLineCache( int nLineIndex1, int nLineIndex2 );
+ virtual void InvalidateSubLineIndexCache( int nLineIndex1 );
void InvalidateScreenRect();
//END SW
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-31 22:04:44
|
Revision: 4087
http://svn.sourceforge.net/winmerge/?rev=4087&view=rev
Author: kimmov
Date: 2007-01-31 14:04:42 -0800 (Wed, 31 Jan 2007)
Log Message:
-----------
PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/CompareOptions.h
trunk/Src/DiffWrapper.h
trunk/Src/DirDoc.cpp
trunk/Src/DirDoc.h
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/CompareOptions.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-30 21:42:55 UTC (rev 4086)
+++ trunk/Src/Changes.txt 2007-01-31 22:04:42 UTC (rev 4087)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-31 Kimmo
+ PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
+ Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
+ Src new file: CompareOptions.cpp
+
2007-01-28 Jochen
Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
Added: trunk/Src/CompareOptions.cpp
===================================================================
--- trunk/Src/CompareOptions.cpp (rev 0)
+++ trunk/Src/CompareOptions.cpp 2007-01-31 22:04:42 UTC (rev 4087)
@@ -0,0 +1,130 @@
+/**
+ * @file CompareOptions.cpp
+ *
+ * @brief Compare options implementation.
+ */
+
+#include "stdafx.h"
+#include "Diff.h"
+#include "CompareOptions.h"
+
+// Global defined in diffutils code
+extern int recursive;
+
+/**
+ * @brief Default constructor.
+ */
+CompareOptions::CompareOptions()
+: m_ignoreWhitespace(WHITESPACE_COMPARE_ALL)
+, m_bIgnoreBlankLines(false)
+, m_bIgnoreCase(false)
+, m_bIgnoreEOLDifference(false)
+{
+}
+
+/**
+ * @brief Default constructor.
+ */
+DiffutilsOptions::DiffutilsOptions()
+: m_outputStyle(DIFF_OUTPUT_NORMAL)
+, m_contextLines(0)
+, m_filterCommentsLines(0)
+{
+}
+
+/**
+ * @brief Sets options from DIFFOPTIONS structure.
+ * @param [in] options Diffutils options.
+ */
+void DiffutilsOptions::SetFromDiffOptions(const DIFFOPTIONS & options)
+{
+ switch (options.nIgnoreWhitespace)
+ {
+ case 0:
+ m_ignoreWhitespace = WHITESPACE_COMPARE_ALL;
+ break;
+ case 1:
+ m_ignoreWhitespace = WHITESPACE_IGNORE_CHANGE;
+ break;
+ case 2:
+ m_ignoreWhitespace = WHITESPACE_IGNORE_ALL;
+ break;
+ default:
+ _RPTF0(_CRT_ERROR, "Unknown whitespace ignore value!");
+ break;
+ }
+ m_bIgnoreBlankLines = options.bIgnoreBlankLines;
+ m_bIgnoreCase = options.bIgnoreCase;
+ m_bIgnoreEOLDifference = options.bIgnoreEol;
+ m_filterCommentsLines = options.bFilterCommentsLines;
+}
+
+/**
+ * @brief Set options to diffutils.
+ * Diffutils uses options from global variables we must set. Those variables
+ * aren't most logically named, and most are just int's, with some magic
+ * values and meanings, with fancy combinations? So not easy to setup. This
+ * function maps our easier to handle compare options to diffutils globals.
+ */
+void DiffutilsOptions::SetToDiffUtils()
+{
+ switch (m_outputStyle)
+ {
+ case DIFF_OUTPUT_NORMAL:
+ output_style = OUTPUT_NORMAL;
+ break;
+ case DIFF_OUTPUT_CONTEXT:
+ output_style = OUTPUT_CONTEXT;
+ break;
+ case DIFF_OUTPUT_UNIFIED:
+ output_style = OUTPUT_UNIFIED;
+ break;
+ default:
+ _RPTF0(_CRT_ERROR, "Unknown output style!");
+ break;
+ }
+
+ context = m_contextLines;
+
+ if (m_ignoreWhitespace == WHITESPACE_IGNORE_CHANGE)
+ ignore_space_change_flag = 1;
+ else
+ ignore_space_change_flag = 0;
+
+ if (m_ignoreWhitespace == WHITESPACE_IGNORE_ALL)
+ ignore_all_space_flag = 1;
+ else
+ ignore_all_space_flag = 0;
+
+ if (m_bIgnoreBlankLines)
+ ignore_blank_lines_flag = 1;
+ else
+ ignore_blank_lines_flag = 0;
+
+ if (m_bIgnoreCase)
+ ignore_case_flag = 1;
+ else
+ ignore_case_flag = 0;
+
+ if (m_bIgnoreEOLDifference)
+ ignore_eol_diff = 1;
+ else
+ ignore_eol_diff = 0;
+
+ if (m_ignoreWhitespace != WHITESPACE_COMPARE_ALL || m_bIgnoreCase ||
+ m_bIgnoreBlankLines || m_bIgnoreEOLDifference)
+ ignore_some_changes = 1;
+ else
+ ignore_some_changes = 0;
+
+ if (m_ignoreWhitespace != WHITESPACE_COMPARE_ALL)
+ length_varies = 1;
+ else
+ length_varies = 0;
+
+ // We have no interest changing these values, hard-code them.
+ always_text_flag = 0; // diffutils needs to detect binary files
+ horizon_lines = 0;
+ heuristic = 1;
+ recursive = 0;
+}
Modified: trunk/Src/CompareOptions.h
===================================================================
--- trunk/Src/CompareOptions.h 2007-01-30 21:42:55 UTC (rev 4086)
+++ trunk/Src/CompareOptions.h 2007-01-31 22:04:42 UTC (rev 4087)
@@ -1,3 +1,9 @@
+/**
+ * @file CompareOptions.h
+ *
+ * @brief Compare options classes and types.
+ */
+
#ifndef CompareOptions_h_included
#define CompareOptions_h_included
@@ -13,11 +19,92 @@
* Also, trailing and leading whitespace is ignored for both
* WHITESPACE_IGNORE_CHANGE and WHITESPACE_IGNORE_ALL
*/
-enum
+enum WhitespaceIgnoreChoices
{
WHITESPACE_COMPARE_ALL = 0, /**< no special handling of whitespace */
WHITESPACE_IGNORE_CHANGE, /**< ignore changes in whitespace */
- WHITESPACE_IGNORE_ALL /**< ignore whitespace altogether */
+ WHITESPACE_IGNORE_ALL, /**< ignore whitespace altogether */
};
+/**
+ * @brief Patch styles.
+ *
+ * Diffutils can output patch in these formats. Normal format has original
+ * and altered lines listed in separate blocks, prefixed with \< and \>
+ * characters. Context format has context lines around difference blocks,
+ * which are prefixed with - and + characters. Unified format combines
+ * difference blocks and prefixes lines with + and - characters.
+ * @note We really use only first three types (normal + context formats).
+ * Those three types are the ones mostly used and preferred.
+ */
+enum DiffOutputType
+{
+ /**< Default output style. */
+ DIFF_OUTPUT_NORMAL,
+ /**< Output the differences with lines of context before and after (-c). */
+ DIFF_OUTPUT_CONTEXT,
+ /**< Output the differences in a unified context diff format (-u). */
+ DIFF_OUTPUT_UNIFIED,
+
+// These are not used, see the comment above enum.
+#if 0
+ /**< Output the differences as commands suitable for `ed' (-e). */
+ DIFF_OUTPUT_ED,
+ /**< Output the diff as a forward ed script (-f). */
+ DIFF_OUTPUT_FORWARD_ED,
+ /**< Like -f, but output a count of changed lines in each "command" (-n). */
+ DIFF_OUTPUT_RCS,
+ /**< Output merged #ifdef'd file (-D). */
+ DIFF_OUTPUT_IFDEF,
+ /**< Output sdiff style (-y). */
+ DIFF_OUTPUT_SDIFF
+#endif
+};
+
+/**
+ * @brief Diffutils options.
+ */
+struct DIFFOPTIONS
+{
+ int nIgnoreWhitespace; /**< Ignore whitespace -option. */
+ BOOL bIgnoreCase; /**< Ignore case -option. */
+ BOOL bIgnoreBlankLines; /**< Ignore blank lines -option. */
+ BOOL bIgnoreEol; /**< Ignore EOL differences -option. */
+ BOOL bFilterCommentsLines; /**< Ignore Multiline comments differences -option. */
+};
+
+/**
+ * @brief General compare options.
+ * This class has general compare options we expect every compare engine and
+ * routine to implement.
+ */
+class CompareOptions
+{
+public:
+ CompareOptions();
+
+ enum WhitespaceIgnoreChoices m_ignoreWhitespace; /**< Ignore whitespace characters */
+ bool m_bIgnoreBlankLines; /**< Ignore blank lines (both sides) */
+ bool m_bIgnoreCase; /**< Ignore case differences? */
+ bool m_bIgnoreEOLDifference; /**< Ignore EOL style differences? */
+};
+
+/**
+ * @brief Compare options used with diffutils.
+ * This class adds some diffutils-specific compare options to general compare
+ * options class. And also methods for easy setting options and forwarding
+ * options to diffutils.
+ */
+class DiffutilsOptions : public CompareOptions
+{
+public:
+ DiffutilsOptions();
+ void SetFromDiffOptions(const DIFFOPTIONS & options);
+ void SetToDiffUtils();
+
+ enum DiffOutputType m_outputStyle; /**< Output style (for patch files) */
+ int m_contextLines; /**< Number of context lines (for patch files) */
+ int m_filterCommentsLines;/**< Ignore Multiline comments differences.*/
+};
+
#endif // CompareOptions_h_included
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2007-01-30 21:42:55 UTC (rev 4086)
+++ trunk/Src/DiffWrapper.h 2007-01-31 22:04:42 UTC (rev 4087)
@@ -33,6 +33,10 @@
#include "FileTextStats.h"
#endif
+#ifndef CompareOptions_h_included
+#include "CompareOptions.h"
+#endif
+
class CDiffContext;
class PrediffingInfo;
struct DIFFRANGE;
@@ -110,44 +114,6 @@
};
/**
- * @brief Patch styles
- *
- * Diffutils can output patch in these formats.
- * @note We really use only first three types (normal + context formats).
- */
-enum DIFF_OUTPUT_TYPE
-{
- /**< Default output style. */
- DIFF_OUTPUT_NORMAL,
- /**< Output the differences with lines of context before and after (-c). */
- DIFF_OUTPUT_CONTEXT,
- /**< Output the differences in a unified context diff format (-u). */
- DIFF_OUTPUT_UNIFIED,
- /**< Output the differences as commands suitable for `ed' (-e). */
- DIFF_OUTPUT_ED,
- /**< Output the diff as a forward ed script (-f). */
- DIFF_OUTPUT_FORWARD_ED,
- /**< Like -f, but output a count of changed lines in each "command" (-n). */
- DIFF_OUTPUT_RCS,
- /**< Output merged #ifdef'd file (-D). */
- DIFF_OUTPUT_IFDEF,
- /**< Output sdiff style (-y). */
- DIFF_OUTPUT_SDIFF
-};
-
-/**
- * @brief Diffutils options users of this class must use
- */
-struct DIFFOPTIONS
-{
- int nIgnoreWhitespace; /**< Ignore whitespace -option. */
- BOOL bIgnoreCase; /**< Ignore case -option. */
- BOOL bIgnoreBlankLines; /**< Ignore blank lines -option. */
- BOOL bIgnoreEol; /**< Ignore EOL differences -option. */
- BOOL bFilterCommentsLines; /**< Ignore Multiline comments differences -option. */
-};
-
-/**
* @brief Additional options for creating patch files
*/
struct PATCHOPTIONS
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-01-30 21:42:55 UTC (rev 4086)
+++ trunk/Src/DirDoc.cpp 2007-01-31 22:04:42 UTC (rev 4087)
@@ -79,14 +79,13 @@
{
DIFFOPTIONS options = {0};
- m_diffWrapper.SetDetectMovedBlocks(GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS));
options.nIgnoreWhitespace = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
options.bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
options.bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
options.bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
options.bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL);
- m_diffWrapper.SetOptions(&options);
+ m_diffOptions.SetFromDiffOptions(options);
}
/**
@@ -344,6 +343,7 @@
m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
m_pCtxt->m_pCompareStats = m_pCompareStats;
+ m_diffOptions.SetToDiffUtils();
// Set total items count since we don't collect items
if (m_bMarkedRescan)
@@ -365,8 +365,6 @@
// Empty display before new compare
m_pDirView->DeleteAllDisplayItems();
- m_diffWrapper.StartDirectoryDiff();
-
m_diffThread.SetContext(m_pCtxt);
m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd());
m_diffThread.SetMessageIDs(MSG_UI_UPDATE, MSG_STAT_UPDATE);
@@ -723,7 +721,6 @@
delete m_statusCursor;
m_statusCursor = NULL;
- m_diffWrapper.EndDirectoryDiff();
}
/**
@@ -735,16 +732,15 @@
*/
void CDirDoc::RefreshOptions()
{
- DIFFOPTIONS options;
+ DIFFOPTIONS options = {0};
- m_diffWrapper.SetDetectMovedBlocks(GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS));
options.nIgnoreWhitespace = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
options.bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
options.bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
options.bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
options.bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL);
- m_diffWrapper.SetOptions(&options);
+ m_diffOptions.SetFromDiffOptions(options);
if (m_pDirView)
m_pDirView->RefreshOptions();
}
Modified: trunk/Src/DirDoc.h
===================================================================
--- trunk/Src/DirDoc.h 2007-01-30 21:42:55 UTC (rev 4086)
+++ trunk/Src/DirDoc.h 2007-01-31 22:04:42 UTC (rev 4087)
@@ -31,7 +31,6 @@
#pragma once
#include "diffThread.h"
-#include "DiffWrapper.h"
#ifndef PluginManager_h_included
#include "PluginManager.h"
@@ -151,8 +150,6 @@
protected:
void LoadLineFilterList();
- CDiffWrapper m_diffWrapper;
-
// Generated message map functions
//{{AFX_MSG(CDirDoc)
// NOTE - the ClassWizard will add and remove member functions here.
@@ -174,6 +171,7 @@
PluginManager m_pluginman;
BOOL m_bReuseCloses; /**< Are we closing because of reuse? */
BOOL m_bMarkedRescan; /**< If TRUE next rescan scans only marked items */
+ DiffutilsOptions m_diffOptions; /**< Compare options for folder compare */
};
//{{AFX_INSERT_LOCATION}}
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-01-30 21:42:55 UTC (rev 4086)
+++ trunk/Src/Merge.dsp 2007-01-31 22:04:42 UTC (rev 4087)
@@ -225,6 +225,10 @@
# End Source File
# Begin Source File
+SOURCE=.\CompareOptions.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\CompareStatisticsDlg.cpp
# End Source File
# Begin Source File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-31 22:09:53
|
Revision: 4088
http://svn.sourceforge.net/winmerge/?rev=4088&view=rev
Author: kimmov
Date: 2007-01-31 14:09:48 -0800 (Wed, 31 Jan 2007)
Log Message:
-----------
PATCH: [ 1646638 ] Catalan translation update
- Submitted by Jordi Vilar
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Catalan/MergeCatalan.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-31 22:04:42 UTC (rev 4087)
+++ trunk/Src/Changes.txt 2007-01-31 22:09:48 UTC (rev 4088)
@@ -6,6 +6,9 @@
PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
Src new file: CompareOptions.cpp
+ PATCH: [ 1646638 ] Catalan translation update
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
2007-01-28 Jochen
Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-31 22:04:42 UTC (rev 4087)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-31 22:09:48 UTC (rev 4088)
@@ -178,7 +178,7 @@
POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&Reinicialitza les opcions", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -286,7 +286,7 @@
POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&Reinicialitza les opcions", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -449,7 +449,7 @@
POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&Reinicialitza les opcions", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -1133,7 +1133,7 @@
7,80,221,10
CONTROL "&Habilita detecci\xF3 de blocs despla\xE7ats",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ CONTROL "Em&parella les l\xEDnies similars",IDC_MATCH_SIMILAR_LINES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
LTEXT "M\xE8tode de comparaci\xF3 de &fitxers:",IDC_STATIC,7,115,113,9
COMBOBOX IDC_COMPAREMETHODCOMBO,120,113,110,70,CBS_DROPDOWNLIST |
@@ -1141,7 +1141,7 @@
CONTROL "&Atura despr\xE9s de la primera difer\xE8ncia",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
GROUPBOX "Comentaris",IDC_STATIC,7,144,221,32
- CONTROL "Filtra els comentaris",IDC_FILTERCOMMENTS_CHECK,"Button",
+ CONTROL "&Filtra els comentaris",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
PUSHBUTTON "Predeterminats",IDC_COMPARE_DEFAULTS,7,189,63,14
END
@@ -1167,7 +1167,7 @@
BS_AUTORADIOBUTTON,128,62,94,10
GROUPBOX "Acoloriment de difer\xE8ncia de l\xEDnia",IDC_LINE_COLORING_GROUP,7,87,
221,61
- CONTROL "Veure les difer\xE8ncies de la l\xEDnia",IDC_VIEW_LINE_DIFFERENCES,"Button",
+ CONTROL "&Veure les difer\xE8ncies de la l\xEDnia",IDC_VIEW_LINE_DIFFERENCES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,14,98,128,8
CONTROL "Nivell de &car\xE0cter",IDC_EDITOR_CHARLEVEL,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,14,108,138,10
@@ -1210,14 +1210,14 @@
ES_READONLY
CONTROL "&Desa-hi els canvis",IDC_SAVECLOSING_SAVELEFT,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,36,230,10
- CONTROL "D&escarta els canvis",IDC_SAVECLOSING_DISCARDLEFT,"Button",
+ CONTROL "D&escarta'n els canvis",IDC_SAVECLOSING_DISCARDLEFT,"Button",
BS_AUTORADIOBUTTON,16,46,230,10
GROUPBOX "Fitxer del costat dret",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55
EDITTEXT IDC_SAVECLOSING_RIGHTFILE,16,82,230,14,ES_AUTOHSCROLL |
ES_READONLY
CONTROL "De&sa-hi els canvis",IDC_SAVECLOSING_SAVERIGHT,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
- CONTROL "Des&carta els canvis",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
+ CONTROL "Des&carta'n els canvis",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
PUSHBUTTON "Descarta-ho tot",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "D'acord",IDOK,149,133,50,14
@@ -1987,7 +1987,7 @@
IDS_OPTIONS_INVALID_TABSIZE
"El valor del camp de la mida de les tabulacions no \xE9s dins el rang que accepta el WinMerge.\n\nUseu valors entre 1 i %1."
IDS_RESET_OPTIONS_WARNING
- "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
+ "Esteu segure que voleu reinicialitzar totes les opcions del WinMerge als valors predeterminats?\n\nReinicieu el WinMerge despr\xE9s de la reinicialitzaci\xF3."
END
// BROWSE FILE
@@ -2302,8 +2302,8 @@
IDS_ABORTED_ITEM "Element avortat"
IDS_FILE_SKIPPED "Fitxer om\xE8s"
IDS_DIR_SKIPPED "Directori om\xE8s"
- IDS_LEFT_ONLY_IN_FMT "Left only: %1"
- IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
+ IDS_LEFT_ONLY_IN_FMT "Nom\xE9s esquerra: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Nom\xE9s dreta: %1"
IDS_BIN_FILES_SAME "Els fitxers binaris s\xF3n id\xE8ntics"
IDS_IDENTICAL "Id\xE8ntics"
IDS_BIN_FILES_DIFF "Els fitxers binaris s\xF3n diferents"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-01 18:15:00
|
Revision: 4089
http://svn.sourceforge.net/winmerge/?rev=4089&view=rev
Author: kimmov
Date: 2007-02-01 10:14:59 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
- Fix from Takashi
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-31 22:09:48 UTC (rev 4088)
+++ trunk/Src/Changes.txt 2007-02-01 18:14:59 UTC (rev 4089)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-01 Kimmo
+ PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
+ Fix from Takashi
+ Src: MainFrm.cpp
+
2007-01-31 Kimmo
PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-31 22:09:48 UTC (rev 4088)
+++ trunk/Src/MainFrm.cpp 2007-02-01 18:14:59 UTC (rev 4089)
@@ -90,8 +90,6 @@
extern CLogFile gLog;
-static BOOL add_regexp PARAMS((struct regexp_list **, char const*, BOOL bShowError));
-
static void LoadToolbarImageList(UINT nIDResource, CImageList& ImgList);
/////////////////////////////////////////////////////////////////////////////
@@ -1830,11 +1828,9 @@
if (!pDirDoc->HasDiffs() && !bMultiDocs && !docs.IsEmpty())
{
- *pNew = FALSE;
-
POSITION pos = docs.GetHeadPosition();
CMergeDoc * pMergeDoc = docs.GetAt(pos);
- return pMergeDoc;
+ pMergeDoc->CloseNow();
}
CMergeDoc * pMergeDoc = pDirDoc->GetMergeDocForDiff(pNew);
return pMergeDoc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-01 18:54:24
|
Revision: 4091
http://svn.sourceforge.net/winmerge/?rev=4091&view=rev
Author: kimmov
Date: 2007-02-01 10:54:23 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/CompareOptions.cpp
trunk/Src/CompareOptions.h
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-01 18:51:40 UTC (rev 4090)
+++ trunk/Src/Changes.txt 2007-02-01 18:54:23 UTC (rev 4091)
@@ -10,6 +10,8 @@
Submitted by tigertron
Src/Languages/Bulgarian: MergeBulgarian.rc
Docs/Users/Languages: Readme-Bulgarian.txt
+ PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
+ Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
2007-01-31 Kimmo
PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
Modified: trunk/Src/CompareOptions.cpp
===================================================================
--- trunk/Src/CompareOptions.cpp 2007-02-01 18:51:40 UTC (rev 4090)
+++ trunk/Src/CompareOptions.cpp 2007-02-01 18:54:23 UTC (rev 4091)
@@ -128,3 +128,31 @@
heuristic = 1;
recursive = 0;
}
+
+/**
+ * @brief Gets options to DIFFOPTIONS structure.
+ * @param [out] options Diffutils options.
+ */
+void DiffutilsOptions::GetAsDiffOptions(DIFFOPTIONS &options)
+{
+ options.bFilterCommentsLines = m_filterCommentsLines;
+ options.bIgnoreBlankLines = m_bIgnoreBlankLines;
+ options.bIgnoreCase = m_bIgnoreCase;
+ options.bIgnoreEol = m_bIgnoreEOLDifference;
+
+ switch (m_ignoreWhitespace)
+ {
+ case WHITESPACE_COMPARE_ALL:
+ options.nIgnoreWhitespace = 0;
+ break;
+ case WHITESPACE_IGNORE_CHANGE:
+ options.nIgnoreWhitespace = 1;
+ break;
+ case WHITESPACE_IGNORE_ALL:
+ options.nIgnoreWhitespace = 2;
+ break;
+ default:
+ _RPTF0(_CRT_ERROR, "Unknown whitespace ignore value!");
+ break;
+ }
+}
Modified: trunk/Src/CompareOptions.h
===================================================================
--- trunk/Src/CompareOptions.h 2007-02-01 18:51:40 UTC (rev 4090)
+++ trunk/Src/CompareOptions.h 2007-02-01 18:54:23 UTC (rev 4091)
@@ -101,6 +101,7 @@
DiffutilsOptions();
void SetFromDiffOptions(const DIFFOPTIONS & options);
void SetToDiffUtils();
+ void GetAsDiffOptions(DIFFOPTIONS &options);
enum DiffOutputType m_outputStyle; /**< Output style (for patch files) */
int m_contextLines; /**< Number of context lines (for patch files) */
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-02-01 18:51:40 UTC (rev 4090)
+++ trunk/Src/DiffWrapper.cpp 2007-02-01 18:54:23 UTC (rev 4091)
@@ -41,7 +41,6 @@
#include "paths.h"
#include "CompareOptions.h"
#include "FileTextStats.h"
-//#include "DiffFileData.h"
#include "FolderCmp.h"
#include "FilterCommentsManager.h"
@@ -91,13 +90,7 @@
, m_pMovedLines(NULL)
, m_pFilterList(NULL)
{
- ZeroMemory(&m_settings, sizeof(DIFFSETTINGS));
- ZeroMemory(&m_globalSettings, sizeof(DIFFSETTINGS));
ZeroMemory(&m_status, sizeof(DIFFSTATUS));
- m_settings.heuristic = 1;
- m_settings.outputStyle = OUTPUT_NORMAL;
- m_settings.context = -1;
-
// character that ends a line. Currently this is always `\n'
line_end_char = '\n';
}
@@ -161,10 +154,13 @@
* format used outside CDiffWrapper and returns them.
* @param [in,out] options Pointer to structure getting used options.
*/
-void CDiffWrapper::GetOptions(DIFFOPTIONS *options) const
+void CDiffWrapper::GetOptions(DIFFOPTIONS *options)
{
ASSERT(options);
- InternalGetOptions(options);
+ DIFFOPTIONS tmpOptions = {0};
+ m_options.GetAsDiffOptions(tmpOptions);
+ *options = tmpOptions;
+// InternalGetOptions(options);
}
/**
@@ -176,7 +172,8 @@
void CDiffWrapper::SetOptions(const DIFFOPTIONS *options)
{
ASSERT(options);
- InternalSetOptions(options);
+ m_options.SetFromDiffOptions(*options);
+// InternalSetOptions(options);
}
/**
@@ -210,8 +207,24 @@
void CDiffWrapper::SetPatchOptions(const PATCHOPTIONS *options)
{
ASSERT(options);
- m_settings.context = options->nContext;
- m_settings.outputStyle = options->outputStyle;
+ m_options.m_contextLines = options->nContext;
+
+ switch (options->outputStyle)
+ {
+ case OUTPUT_NORMAL:
+ m_options.m_outputStyle = DIFF_OUTPUT_NORMAL;
+ break;
+ case OUTPUT_CONTEXT:
+ m_options.m_outputStyle = DIFF_OUTPUT_CONTEXT;
+ break;
+ case OUTPUT_UNIFIED:
+ m_options.m_outputStyle = DIFF_OUTPUT_UNIFIED;
+ break;
+ default:
+ _RPTF0(_CRT_ERROR, "Unknown output style!");
+ break;
+ }
+
m_bAddCmdLine = options->bAddCommandline;
}
@@ -653,7 +666,9 @@
USES_CONVERSION;
CString strFile1Temp = filepath1;
CString strFile2Temp = filepath2;
- SwapToInternalSettings();
+
+ m_options.SetToDiffUtils();
+ //SwapToInternalSettings();
if (m_bUseDiffList)
m_nDiffs = m_pDiffList->GetSize();
@@ -800,115 +815,11 @@
strFile2Temp.Empty();
}
- SwapToGlobalSettings();
+// SwapToGlobalSettings();
return bRet;
}
/**
- * @brief Return current diffutils options
- */
-void CDiffWrapper::InternalGetOptions(DIFFOPTIONS *options) const
-{
- int nIgnoreWhitespace = 0;
-
- if (m_settings.ignoreAllSpace)
- nIgnoreWhitespace = WHITESPACE_IGNORE_ALL;
- else if (m_settings.ignoreSpaceChange)
- nIgnoreWhitespace = WHITESPACE_IGNORE_CHANGE;
-
- options->nIgnoreWhitespace = nIgnoreWhitespace;
- options->bIgnoreBlankLines = m_settings.ignoreBlankLines;
- options->bFilterCommentsLines = m_settings.filterCommentsLines;
- options->bIgnoreCase = m_settings.ignoreCase;
- options->bIgnoreEol = m_settings.ignoreEOLDiff;
-
-}
-
-/**
- * @brief Set diffutils options
- */
-void CDiffWrapper::InternalSetOptions(const DIFFOPTIONS *options)
-{
- m_settings.ignoreAllSpace = (options->nIgnoreWhitespace == WHITESPACE_IGNORE_ALL);
- m_settings.ignoreSpaceChange = (options->nIgnoreWhitespace == WHITESPACE_IGNORE_CHANGE);
- m_settings.ignoreBlankLines = options->bIgnoreBlankLines;
- m_settings.filterCommentsLines = options->bFilterCommentsLines;
- m_settings.ignoreEOLDiff = options->bIgnoreEol;
- m_settings.ignoreCase = options->bIgnoreCase;
- m_settings.ignoreSomeChanges = (options->nIgnoreWhitespace != WHITESPACE_COMPARE_ALL) ||
- options->bIgnoreCase || options->bIgnoreBlankLines ||
- options->bIgnoreEol;
- m_settings.lengthVaries = (options->nIgnoreWhitespace != WHITESPACE_COMPARE_ALL);
-}
-
-/**
- * @brief Replaces global options used by diff-engine with options in diff-wrapper
- */
-void CDiffWrapper::SwapToInternalSettings()
-{
- // Save current settings to temp variables
- m_globalSettings.outputStyle = output_style;
- output_style = m_settings.outputStyle;
-
- m_globalSettings.context = context;
- context = m_settings.context;
-
- m_globalSettings.alwaysText = always_text_flag;
- always_text_flag = m_settings.alwaysText;
-
- m_globalSettings.horizLines = horizon_lines;
- horizon_lines = m_settings.horizLines;
-
- m_globalSettings.ignoreSpaceChange = ignore_space_change_flag;
- ignore_space_change_flag = m_settings.ignoreSpaceChange;
-
- m_globalSettings.ignoreAllSpace = ignore_all_space_flag;
- ignore_all_space_flag = m_settings.ignoreAllSpace;
-
- m_globalSettings.ignoreBlankLines = ignore_blank_lines_flag;
- ignore_blank_lines_flag = m_settings.ignoreBlankLines;
-
- m_globalSettings.ignoreCase = ignore_case_flag;
- ignore_case_flag = m_settings.ignoreCase;
-
- m_globalSettings.ignoreEOLDiff = ignore_eol_diff;
- ignore_eol_diff = m_settings.ignoreEOLDiff;
-
- m_globalSettings.ignoreSomeChanges = ignore_some_changes;
- ignore_some_changes = m_settings.ignoreSomeChanges;
-
- m_globalSettings.lengthVaries = length_varies;
- length_varies = m_settings.lengthVaries;
-
- m_globalSettings.heuristic = heuristic;
- heuristic = m_settings.heuristic;
-
- m_globalSettings.recursive = recursive;
- recursive = m_settings.recursive;
-}
-
-/**
- * @brief Resumes global options as they were before calling SwapToInternalOptions()
- */
-void CDiffWrapper::SwapToGlobalSettings()
-{
- // Resume values
- output_style = m_globalSettings.outputStyle;
- context = m_globalSettings.context;
- always_text_flag = m_globalSettings.alwaysText;
- horizon_lines = m_globalSettings.horizLines;
- ignore_space_change_flag = m_globalSettings.ignoreSpaceChange;
- ignore_all_space_flag = m_globalSettings.ignoreAllSpace;
- ignore_blank_lines_flag = m_globalSettings.ignoreBlankLines;
- ignore_case_flag = m_globalSettings.ignoreCase;
- ignore_eol_diff = m_globalSettings.ignoreEOLDiff;
- ignore_some_changes = m_globalSettings.ignoreSomeChanges;
- length_varies = m_globalSettings.lengthVaries;
- heuristic = m_globalSettings.heuristic;
- recursive = m_globalSettings.recursive;
-}
-
-/**
* @brief Add diff to external diff-list
*/
void CDiffWrapper::AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op)
@@ -997,7 +908,7 @@
CString switches;
TCHAR tmpNum[5] = {0};
- switch (m_settings.outputStyle)
+ switch (m_options.m_outputStyle)
{
case OUTPUT_CONTEXT:
switches = _T(" C");
@@ -1025,22 +936,22 @@
break;
}
- if (m_settings.context > 0)
+ if (m_options.m_contextLines > 0)
{
- _itot(m_settings.context, tmpNum, 10);
+ _itot(m_options.m_contextLines, tmpNum, 10);
switches += tmpNum;
}
- if (m_settings.ignoreAllSpace > 0)
+ if (ignore_all_space_flag > 0)
switches += _T("w");
- if (m_settings.ignoreBlankLines > 0)
+ if (ignore_blank_lines_flag > 0)
switches += _T("B");
- if (m_settings.ignoreCase > 0)
+ if (ignore_case_flag > 0)
switches += _T("i");
- if (m_settings.ignoreSpaceChange > 0)
+ if (ignore_space_change_flag > 0)
switches += _T("b");
return switches;
@@ -1057,22 +968,6 @@
}
/**
- * @brief Sets options for directory compare
- */
-void CDiffWrapper::StartDirectoryDiff()
-{
- SwapToInternalSettings();
-}
-
-/**
- * @brief resumes options after directory compare
- */
-void CDiffWrapper::EndDirectoryDiff()
-{
- SwapToGlobalSettings();
-}
-
-/**
* @brief Compare two files using diffutils.
*
* Compare two files (in DiffFileData param) using diffutils. Run diffutils
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2007-02-01 18:51:40 UTC (rev 4090)
+++ trunk/Src/DiffWrapper.h 2007-02-01 18:54:23 UTC (rev 4091)
@@ -137,27 +137,6 @@
DIFFSTATUS() { memset(this, 0, sizeof(*this)); } // start out with all flags clear
};
-/**
- * @brief Internally used diffutils options.
- */
-struct DIFFSETTINGS
-{
- enum output_style outputStyle; /**< Output style (for patch files) */
- int context; /**< Number of context lines (for patch files) */
- int alwaysText;
- int horizLines;
- int ignoreSpaceChange;
- int ignoreAllSpace;
- int ignoreBlankLines; /**< Ignore blank lines (both sides) */
- int filterCommentsLines;/**< Ignore Multiline comments differences.*/
- int ignoreCase; /**< Ignore case differences? */
- int ignoreEOLDiff; /**< Ignore EOL style differences? */
- int ignoreSomeChanges;
- int lengthVaries;
- int heuristic;
- int recursive; /**< Recurse to subfolders? (not used) */
-};
-
class FilterCommentsManager;
/**
@@ -176,7 +155,7 @@
void SetCreatePatchFile(const CString &filename);
void SetCreateDiffList(DiffList *diffList);
void SetDiffList(DiffList *diffList);
- void GetOptions(DIFFOPTIONS *options) const;
+ void GetOptions(DIFFOPTIONS *options);
void SetOptions(const DIFFOPTIONS *options);
void SetTextForAutomaticPrediff(const CString &text);
void SetPrediffer(PrediffingInfo * prediffer =NULL);
@@ -191,17 +170,11 @@
void GetDiffStatus(DIFFSTATUS *status);
void AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op);
void FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left);
- void StartDirectoryDiff();
- void EndDirectoryDiff();
MovedLines * GetMovedLines() { return m_pMovedLines; }
void SetCompareFiles(const CString &OriginalFile1, const CString &OriginalFile2);
void SetFilterList(const CString &filterStr);
protected:
- void InternalGetOptions(DIFFOPTIONS *options) const;
- void InternalSetOptions(const DIFFOPTIONS *options);
- void SwapToInternalSettings();
- void SwapToGlobalSettings();
CString FormatSwitchString();
BOOL Diff2Files(struct change ** diffs, DiffFileData *diffData,
int * bin_status, int * bin_file);
@@ -210,8 +183,7 @@
bool RegExpFilter(int StartPos, int EndPos, int FileNo);
private:
- DIFFSETTINGS m_settings; /**< Compare settings for current compare */
- DIFFSETTINGS m_globalSettings; /**< Global compare settings */
+ DiffutilsOptions m_options;
DIFFSTATUS m_status; /**< Status of last compare */
FilterList * m_pFilterList; /**< List of linefilters. */
CString m_s1File; /**< Full path to first diff'ed file. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-01 18:58:35
|
Revision: 4092
http://svn.sourceforge.net/winmerge/?rev=4092&view=rev
Author: kimmov
Date: 2007-02-01 10:58:25 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
Remove commented out include line
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirScan.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-01 18:54:23 UTC (rev 4091)
+++ trunk/Src/Changes.txt 2007-02-01 18:58:25 UTC (rev 4092)
@@ -12,6 +12,8 @@
Docs/Users/Languages: Readme-Bulgarian.txt
PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
+ Remove commented out include line
+ Src: DirScan.cpp
2007-01-31 Kimmo
PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-02-01 18:54:23 UTC (rev 4091)
+++ trunk/Src/DirScan.cpp 2007-02-01 18:58:25 UTC (rev 4092)
@@ -25,7 +25,6 @@
#include "PathContext.h"
#include "IAbortable.h"
#include "FolderCmp.h"
-//#include "DiffFileData.h"
#ifdef _DEBUG
#define new DEBUG_NEW
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-01 21:41:50
|
Revision: 4095
http://svn.sourceforge.net/winmerge/?rev=4095&view=rev
Author: kimmov
Date: 2007-02-01 13:41:46 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
Remove unused parameter from CMainFrame::SyncFileToVCS()
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileActionScript.cpp
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-01 19:02:29 UTC (rev 4094)
+++ trunk/Src/Changes.txt 2007-02-01 21:41:46 UTC (rev 4095)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-01 Kimmo
+ Remove unused parameter from CMainFrame::SyncFileToVCS()
+ Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
+
2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
2007-02-01 Kimmo
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2007-02-01 19:02:29 UTC (rev 4094)
+++ trunk/Src/FileActionScript.cpp 2007-02-01 21:41:46 UTC (rev 4095)
@@ -96,7 +96,7 @@
return retVal;
// TODO: First param is not used!
- int nRetVal = GetMainFrame()->SyncFileToVCS(_T(""), path, bApplyToAll, &strErr);
+ int nRetVal = GetMainFrame()->SyncFileToVCS(path, bApplyToAll, &strErr);
if (nRetVal == -1)
{
retVal = SCRIPT_FAIL; // So we exit without file operations done
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-02-01 19:02:29 UTC (rev 4094)
+++ trunk/Src/MainFrm.cpp 2007-02-01 21:41:46 UTC (rev 4095)
@@ -1224,17 +1224,15 @@
/**
* @brief Sync file to Version Control System
- * @param pszSrc [in] File to copy
* @param pszDest [in] Where to copy (incl. filename)
* @param bApplyToAll [in,out] Apply user selection to all items
* @param psError [out] Error string that can be shown to user in caller func
* @return User selection or -1 if error happened
* @sa CMainFrame::HandleReadonlySave()
* @sa CDirView::PerformActionList()
- * @todo Parameter @p pszSrc is ununsed.
*/
-int CMainFrame::SyncFileToVCS(LPCTSTR pszSrc, LPCTSTR pszDest,
- BOOL &bApplyToAll, CString *psError)
+int CMainFrame::SyncFileToVCS(LPCTSTR pszDest, BOOL &bApplyToAll,
+ CString *psError)
{
CString sActionError;
CString strSavePath(pszDest);
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-02-01 19:02:29 UTC (rev 4094)
+++ trunk/Src/MainFrm.h 2007-02-01 21:41:46 UTC (rev 4095)
@@ -104,8 +104,7 @@
HMENU GetPrediffersSubmenu(HMENU mainMenu);
void UpdatePrediffersMenu();
- BOOL SyncFileToVCS(LPCTSTR pszSrc, LPCTSTR pszDest, BOOL &bApplyToAll,
- CString *psError);
+ BOOL SyncFileToVCS(LPCTSTR pszDest, BOOL &bApplyToAll, CString *psError);
BOOL DoFileOpen(LPCTSTR pszLeft = NULL, LPCTSTR pszRight = NULL,
DWORD dwLeftFlags = 0, DWORD dwRightFlags = 0, BOOL bRecurse = FALSE, CDirDoc *pDirDoc = NULL, CString prediffer = _T(""));
int ShowMergeDoc(CDirDoc * pDirDoc, const FileLocation & filelocLeft,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-03 15:31:54
|
Revision: 4096
http://svn.sourceforge.net/winmerge/?rev=4096&view=rev
Author: kimmov
Date: 2007-02-03 07:31:51 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
Remove unused enum definition
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/PropCompare.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-01 21:41:46 UTC (rev 4095)
+++ trunk/Src/Changes.txt 2007-02-03 15:31:51 UTC (rev 4096)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-03 Kimmo
+ Remove unused enum definition
+ Src: PropCompare.h
+
2007-02-01 Kimmo
Remove unused parameter from CMainFrame::SyncFileToVCS()
Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
Modified: trunk/Src/PropCompare.h
===================================================================
--- trunk/Src/PropCompare.h 2007-02-01 21:41:46 UTC (rev 4095)
+++ trunk/Src/PropCompare.h 2007-02-03 15:31:51 UTC (rev 4096)
@@ -35,7 +35,7 @@
{
// Construction
public:
- enum CompareMethod { BY_CONTENTS, BY_DATE};
+// enum CompareMethod { BY_CONTENTS, BY_DATE};
CPropCompare(COptionsMgr *optionsMgr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-03 15:48:30
|
Revision: 4097
http://svn.sourceforge.net/winmerge/?rev=4097&view=rev
Author: kimmov
Date: 2007-02-03 07:48:29 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
Fix Doxygen comments
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/PropCompare.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-03 15:31:51 UTC (rev 4096)
+++ trunk/Src/Changes.txt 2007-02-03 15:48:29 UTC (rev 4097)
@@ -5,6 +5,8 @@
2007-02-03 Kimmo
Remove unused enum definition
Src: PropCompare.h
+ Fix Doxygen comments
+ Src: PropCompare.h
2007-02-01 Kimmo
Remove unused parameter from CMainFrame::SyncFileToVCS()
Modified: trunk/Src/PropCompare.h
===================================================================
--- trunk/Src/PropCompare.h 2007-02-03 15:31:51 UTC (rev 4096)
+++ trunk/Src/PropCompare.h 2007-02-03 15:48:29 UTC (rev 4097)
@@ -1,9 +1,9 @@
/**
- * @file PropCompare.cpp
+ * @file PropCompare.h
*
- * @brief Implementation of CPropCompare propertysheet
+ * @brief Declaration of CPropCompare propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// RCS ID line follows -- this is updated by SVN
// $Id$
#ifndef _PROPPAGE_COMPARE_H_
@@ -27,6 +27,8 @@
* Compare methods:
* - compare by contents
* - compare by modified date
+ * - compare by file size
+ * - compare by date and size
* - compare by quick contents
*
* @author Tim Musschoot, several modifications by others
@@ -35,8 +37,6 @@
{
// Construction
public:
-// enum CompareMethod { BY_CONTENTS, BY_DATE};
-
CPropCompare(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
@@ -83,4 +83,3 @@
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // _PROPPAGE_COMPARE_H_
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-03 15:57:57
|
Revision: 4098
http://svn.sourceforge.net/winmerge/?rev=4098&view=rev
Author: kimmov
Date: 2007-02-03 07:57:56 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
Fix Doxygen comment
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/PropCompare.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-03 15:48:29 UTC (rev 4097)
+++ trunk/Src/Changes.txt 2007-02-03 15:57:56 UTC (rev 4098)
@@ -7,6 +7,8 @@
Src: PropCompare.h
Fix Doxygen comments
Src: PropCompare.h
+ Fix Doxygen comment
+ Src: PropCompare.cpp
2007-02-01 Kimmo
Remove unused parameter from CMainFrame::SyncFileToVCS()
Modified: trunk/Src/PropCompare.cpp
===================================================================
--- trunk/Src/PropCompare.cpp 2007-02-03 15:48:29 UTC (rev 4097)
+++ trunk/Src/PropCompare.cpp 2007-02-03 15:57:56 UTC (rev 4098)
@@ -1,9 +1,9 @@
/**
- * @file PropColors.cpp
+ * @file PropCompare.cpp
*
* @brief Implementation of CPropCompare propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
