Mercurial > hg > match-vamp

changeset 85:a540b26db228 refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ah, no, of course the advance differs for the forward path (it is based on partial information). But the cost shouldn't.
author Chris Cannam
date Thu, 27 Nov 2014 11:27:17 +0000
parents de7034e93dd0
children f07b9b7f1ab6
files src/Finder.cpp src/Finder.h
diffstat 2 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/Finder.cpp	Thu Nov 27 10:53:00 2014 +0000
+++ b/src/Finder.cpp	Thu Nov 27 11:27:17 2014 +0000
@@ -222,17 +222,6 @@
             }
 
             if (dir != Matcher::AdvanceNone) {
-                if (m_m->getAdvance(r, c) != dir) {
-                    cerr << "WrongAdvance found" << endl;
-                    err.type = ErrorPosition::WrongAdvance;
-                    err.r = r;
-                    err.c = c;
-                    err.costWas = m_m->getPathCost(r, c);
-                    err.costShouldBe = updateTo;
-                    err.advanceWas = m_m->getAdvance(r, c);
-                    err.advanceShouldBe = dir;
-                    return err;
-                }
                 if (m_m->getPathCost(r, c) != updateTo) {
                     cerr << "WrongCost found" << endl;
                     err.type = ErrorPosition::WrongCost;
--- a/src/Finder.h	Thu Nov 27 10:53:00 2014 +0000
+++ b/src/Finder.h	Thu Nov 27 11:27:17 2014 +0000
@@ -68,7 +68,7 @@
 protected:
 #ifdef PERFORM_ERROR_CHECKS
     struct ErrorPosition {
-        enum Type { NoError = 0, WrongCost, WrongAdvance, NoAdvance };
+        enum Type { NoError = 0, WrongCost, NoAdvance };
         ErrorPosition() : type(NoError) { }
         Type type;
         int r;