Indefero Commit Details

Date:

2008-12-30 11:21:04 (16 years 3 months ago)

Author:

Julien Issler

Branch:

dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

c33b2715198c92212865503763004f44accd13c4

Parents:

2078d69a838a7cb52ae984d42df75920358cfce7

Message:

Fixed issue 96, errors when parsing a Mercurial diff.

Changes:

File differences

-55
56 56
57 57
58 
59 
58
59
60
61
62
63
64
65
60 66
61 67
62 68
... ...
327 333
328 334
329 335
330 
336
+                $files[$current_file]['chunks_def'] = array();␊
                $current_chunk = 0;␊
                continue;␊
            }␊
            if (0 === strpos($line, 'Index: ')) {␊
            } else if (preg_match('#^diff -r [^\s]+ -r [^\s]+ (.+)$#', $line, $matches)) {␊
                $current_file = $matches[1];␊
                $files[$current_file] = array();␊
                $files[$current_file]['chunks'] = array();␊
                $files[$current_file]['chunks_def'] = array();␊
                $current_chunk = 0;␊
                continue;␊
            } else if (0 === strpos($line, 'Index: ')) {␊
                $current_file = self::getSvnFile($line);␊
                $files[$current_file] = array();␊
                $files[$current_file]['chunks'] = array();␊

        return Pluf_Template::markSafe($out);␊
␊
    }␊
}
}␊
 ...
                 $files[$current_file]['chunks_def'] = array();␊
                 $current_chunk = 0;␊
                 continue;␊
-            }␊
-            if (0 === strpos($line, 'Index: ')) {␊
+            } else if (preg_match('#^diff -r [^\s]+ -r [^\s]+ (.+)$#', $line, $matches)) {␊
+                $current_file = $matches[1];␊
+                $files[$current_file] = array();␊
+                $files[$current_file]['chunks'] = array();␊
+                $files[$current_file]['chunks_def'] = array();␊
+                $current_chunk = 0;␊
+                continue;␊
+            } else if (0 === strpos($line, 'Index: ')) {␊
                 $current_file = self::getSvnFile($line);␊
                 $files[$current_file] = array();␊
                 $files[$current_file]['chunks'] = array();␊
         return Pluf_Template::markSafe($out);␊
 ␊
     }␊
-}
+}␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags