1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
<?php
/**
* $Horde: chora/diff.php,v 1.87.8.1 2005/01/03 12:25:30 jan Exp $
*
* Copyright 2000-2005 Anil Madhavapeddy <anil@recoil.org>
*
* See the enclosed file COPYING for license information (GPL). If you
* did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
*/
@define('CHORA_BASE', dirname(__FILE__));
require_once CHORA_BASE . '/lib/base.php';
/* Spawn the repository and file objects */
$fl = &$VC->getFileObject($where, $cache);
Chora::checkError($fl);
/* Initialise the form variables correctly.
* If r1/r2 are empty, then use the corresponding text field instead */
$r1 = Util::getFormData('r1', 0);
$r2 = Util::getFormData('r2', 0);
if (!$r1) {
$r1 = Util::getFormData('tr1');
}
if (!$r2) {
$r2 = Util::getFormData('tr2');
}
/* If no context-size has been specified, default to 3. */
$num = (int)Util::getFormData('num', 3);
/* If no type has been specified, then default to human readable. */
$ty = Util::getFormData('ty', 'h');
/* Unless otherwise specified, show whitespace differences. */
$ws = Util::getFormData('ws', 1);
/* Figure out what type of diff has been requested. */
switch ($ty) {
case 's':
$type = 'column';
break;
case 'c':
$type = 'context';
break;
case 'e':
$type = 'ed';
break;
case 'u':
case 'h':
default:
$type = 'unified';
}
/* Ensure that we have valid revision numbers. */
if (!VC_Revision::valid($r1) || !VC_Revision::valid($r2)) {
Chora::fatal(_("Malformed Query"));
}
/* Cache the output of the diff for a week - it can be longer, since
* it should never change */
header('Cache-Control: max-age=604800');
/* Title to use for html output pages */
$title = sprintf(_("Diff for %s between version %s and %s"),
Text::htmlallspaces($where), $r1, $r2);
/* All is ok, proceed with the diff */
switch ($type) {
case 'column':
/* We'll need to know the mime type to modify diffs based on the mime
type. */
require_once 'Horde/MIME/Magic.php';
$mime_type = MIME_Magic::filenameToMIME($fullname);
if ($browser->isViewable($mime_type)) {
// The above are images that most web browsers can inline
// We borrow a *large* part of this from the Human-Readable case
$url1 = Chora::url('co', $where, array('r' => $r1));
$url2 = Chora::url('co', $where, array('r' => $r2));
$path = $fl->queryModulePath();
// Get the log entry so we can display it
$log = $fl->logs[$r2];
$log_print = Chora::formatLogMessage($log->queryLog());
// Start the html output, include menu bar and headers.
require CHORA_TEMPLATES . '/common-header.inc';
require CHORA_TEMPLATES . '/menu.inc';
require CHORA_TEMPLATES . '/headerbar.inc';
// Create a table for the two revisions, display log, and
// print a labeled bar for the revisions.
require CHORA_TEMPLATES . '/diff/hr/header.inc';
echo "<td><img src=\"$url1\"></td>";
echo "<td><img src=\"$url2\"></td>";
echo '</tr>';
require $registry->get('templates', 'horde') . '/common-footer.inc';
} else {
header('Content-Type: text/plain');
echo implode("\n", $VC->getDiff($fl, $r1, $r2, $type, $num, $ws));
}
break;
case 'context':
header('Content-Type: text/plain');
echo implode("\n", $VC->getDiff($fl, $r1, $r2, $type, $num, $ws));
break;
case 'ed':
header('Content-Type: text/plain');
echo implode("\n", $VC->getDiff($fl, $r1, $r2, $type, $num, $ws));
break;
case 'unified':
default:
if ($ty != 'h') {
/* Not Human-Readable format. */
header('Content-Type: text/plain');
echo implode("\n", $VC->getDiff($fl, $r1, $r2, $type, $num, $ws));
} else {
/* Human-Readable diff. */
/* Output standard header information for the page. */
$filename = preg_replace('/^.*\//', '', $where);
$pathname = preg_replace('/[^\/]*$/', '', $where);
$log = $fl->logs[$r2];
$log_print = Chora::formatLogMessage($log->queryLog());
require CHORA_TEMPLATES . '/common-header.inc';
require CHORA_TEMPLATES . '/menu.inc';
require CHORA_TEMPLATES . '/headerbar.inc';
require CHORA_TEMPLATES . '/diff/hr/header.inc';
/* Retrieve the tree of changes. */
$lns = VC_Diff::humanReadable($VC->getDiff($fl, $r1, $r2, 'unified', $num, $ws));
/* TODO: check for errors here (PEAR_Error returned) - avsm */
/* Is the diff empty? */
if (!sizeof($lns)) {
require CHORA_TEMPLATES . '/diff/hr/nochange.inc';
} else {
/* Iterate through every header block of changes */
foreach ($lns as $header) {
$lefthead = Text::htmlspaces(@$header['oldline']);
$righthead = Text::htmlspaces(@$header['newline']);
$headfunc = Text::htmlspaces(@$header['function']);
require CHORA_TEMPLATES . '/diff/hr/row.inc';
/* Each header block consists of a number of changes
* (add, remove, change) */
foreach ($header['contents'] as $change) {
switch ($change['type']) {
case 'add':
foreach ($change['lines'] as $line) {
$line = Text::htmlAllSpaces($line);
require CHORA_TEMPLATES . '/diff/hr/add.inc';
}
break;
case 'remove':
foreach ($change['lines'] as $line) {
$line = Text::htmlAllSpaces($line);
require CHORA_TEMPLATES . '/diff/hr/remove.inc';
}
break;
case 'empty':
$line = Text::htmlAllSpaces($change['line']);
require CHORA_TEMPLATES . '/diff/hr/empty.inc';
break;
case 'change':
/* Pop the old/new stacks one by one, until
* both are empty. */
$oldsize = count($change['old']);
$newsize = count($change['new']);
for ($row = 0; $row < max($oldsize, $newsize); $row++) {
$left = isset($change['old'][$row]) ? Text::htmlAllSpaces($change['old'][$row]) : '';
$right = isset($change['new'][$row]) ? Text::htmlAllSpaces($change['new'][$row]) : '';
require CHORA_TEMPLATES . '/diff/hr/change.inc';
}
break;
}
}
}
}
/* Print legend. */
require CHORA_TEMPLATES . '/diff/hr/footer.inc';
require $registry->get('templates', 'horde') . '/common-footer.inc';
}
}
|
