Indefero Commit Details

Date:

2010-06-23 08:58:07 (14 years 9 months ago)

Author:

Thomas Keller

Branch:

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:

7303e9dd58122dba90ae5c22c60f943cf650ebf5

Parents:

e57fc18bcbdd5dc304e5b90bf5bd5e6727189603

Message:

return the correct file name for dropped files from monotone's diff output

Changes:

File differences

-72
73 73
74 74
75
75 76
77
78
79
80
81
82
83
84
85
86
76 87
77 88
78 89
+                $indiff = true;␊
                continue;␊
            } else if (0 === strpos($line, '=========')) {␊
                // by default always use the new name of a possibly renamed file␊
                $current_file = self::getMtnFile($this->lines[$i+1]);␊
                // mtn 0.48 and newer set /dev/null as file path for dropped files␊
                // so we display the old name here␊
                if ($current_file == "/dev/null") {␊
                    $current_file = self::getMtnFile($this->lines[$i]);␊
                }␊
                if ($current_file == "/dev/null") {␊
                    throw new Exception(␊
                        "could not determine path from diff"␊
                    );␊
                }␊
                $files[$current_file] = array();␊
                $files[$current_file]['chunks'] = array();␊
                $files[$current_file]['chunks_def'] = array();␊
                 $indiff = true;␊
                 continue;␊
             } else if (0 === strpos($line, '=========')) {␊
+                // by default always use the new name of a possibly renamed file␊
                 $current_file = self::getMtnFile($this->lines[$i+1]);␊
+                // mtn 0.48 and newer set /dev/null as file path for dropped files␊
+                // so we display the old name here␊
+                if ($current_file == "/dev/null") {␊
+                    $current_file = self::getMtnFile($this->lines[$i]);␊
+                }␊
+                if ($current_file == "/dev/null") {␊
+                    throw new Exception(␊
+                        "could not determine path from diff"␊
+                    );␊
+                }␊
                 $files[$current_file] = array();␊
                 $files[$current_file]['chunks'] = array();␊
                 $files[$current_file]['chunks_def'] = array();␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags