|
119 | 119 | }; |
120 | 120 |
|
121 | 121 | var diffLines = diffInput.split('\n'); |
| 122 | + |
| 123 | + /* Diff */ |
| 124 | + var oldMode = /^old mode (\d{6})/; |
| 125 | + var newMode = /^new mode (\d{6})/; |
| 126 | + var deletedFileMode = /^deleted file mode (\d{6})/; |
| 127 | + var newFileMode = /^new file mode (\d{6})/; |
| 128 | + |
| 129 | + var copyFrom = /^copy from (.+)/; |
| 130 | + var copyTo = /^copy to (.+)/; |
| 131 | + |
| 132 | + var renameFrom = /^rename from (.+)/; |
| 133 | + var renameTo = /^rename to (.+)/; |
| 134 | + |
| 135 | + var similarityIndex = /^similarity index (\d+)%/; |
| 136 | + var dissimilarityIndex = /^dissimilarity index (\d+)%/; |
| 137 | + var index = /^index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/; |
| 138 | + |
| 139 | + /* Combined Diff */ |
| 140 | + var combinedIndex = /^index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/; |
| 141 | + var combinedMode = /^mode (\d{6}),(\d{6})..(\d{6})/; |
| 142 | + var combinedNewFile = /^new file mode (\d{6})/; |
| 143 | + var combinedDeletedFile = /^deleted file mode (\d{6}),(\d{6})/; |
| 144 | + |
122 | 145 | diffLines.forEach(function(line) { |
123 | 146 | // Unmerged paths, and possibly other non-diffable files |
124 | 147 | // https://github.com/scottgonzalez/pretty-diff/issues/11 |
|
127 | 150 | return; |
128 | 151 | } |
129 | 152 |
|
130 | | - /* Diff */ |
131 | | - var oldMode = /^old mode (\d{6})/; |
132 | | - var newMode = /^new mode (\d{6})/; |
133 | | - var deletedFileMode = /^deleted file mode (\d{6})/; |
134 | | - var newFileMode = /^new file mode (\d{6})/; |
135 | | - |
136 | | - var copyFrom = /^copy from (.+)/; |
137 | | - var copyTo = /^copy to (.+)/; |
138 | | - |
139 | | - var renameFrom = /^rename from (.+)/; |
140 | | - var renameTo = /^rename to (.+)/; |
141 | | - |
142 | | - var similarityIndex = /^similarity index (\d+)%/; |
143 | | - var dissimilarityIndex = /^dissimilarity index (\d+)%/; |
144 | | - var index = /^index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/; |
145 | | - |
146 | | - /* Combined Diff */ |
147 | | - var combinedIndex = /^index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/; |
148 | | - var combinedMode = /^mode (\d{6}),(\d{6})..(\d{6})/; |
149 | | - var combinedNewFile = /^new file mode (\d{6})/; |
150 | | - var combinedDeletedFile = /^deleted file mode (\d{6}),(\d{6})/; |
151 | | - |
152 | 153 | var values = []; |
153 | 154 | if (utils.startsWith(line, 'diff')) { |
154 | 155 | startFile(); |
|
0 commit comments