Indefero

Indefero Commit Details


Date:2011-05-31 06:41:37 (14 years 5 months ago)
Author:Thomas Keller
Branch:develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3
Commit:2aab4eea3b2bc0298a6ac4c5bd5a3bad3c4a9875
Parents: 5bbff9f5a6ea805f606474bba9471171c1292427
Message:Apply (and adapt) the patch from issue 364, which should fix the issue.
Changes:

File differences

NEWS.mdtext
99
1010
1111
12
1213
1314
1415
␊
## Bugfixes␊
␊
- The SVN interface acts more robust if an underlying repository has been restructured (issue 364)␊
- monotone zip archive entries now all carry the revision date as mtime (issue 645)␊
- Timeline only displays filter options for items a user has actually access to (issue 655)␊
- The log, tags and branches parsers for Mercurial are more robust now (issue 663)␊
src/IDF/Scm/Svn.php
163163
164164
165165
166
166
167167
168168
169
170
169
170
171171
172172
173173
......
176176
177177
178178
179
180179
181180
182181
......
191190
192191
193192
194
193
195194
196195
197
198
196
197
199198
200199
201200
......
218217
219218
220219
221
220
222221
223222
224
225
223
224
226225
227226
228227
......
248247
249248
250249
251
252250
253251
254252
......
260258
261259
262260
263
261
264262
265263
266
267
264
265
268266
269267
270268
......
281279
282280
283281
284
282
285283
286284
287
288
285
286
289287
290288
291289
......
308306
309307
310308
311
309
312310
313311
314
315
312
313
316314
317315
318316
......
329327
330328
331329
332
330
333331
334332
335333
......
344342
345343
346344
347
345
348346
349347
350348
......
368366
369367
370368
371
369
372370
373371
374372
......
412410
413411
414412
415
416413
417414
418415
......
426423
427424
428425
429
426
430427
431428
432
433
429
430
434431
435432
436433
......
498495
499496
500497
501
498
502499
503500
504501
505
506
502
503
507504
508505
509506
......
520517
521518
522519
523
524520
525521
526522
......
531527
532528
533529
534
530
535531
536532
537
538
533
534
539535
540536
541537
......
554550
555551
556552
557
558553
559554
560555
......
566561
567562
568563
569
564
570565
571566
572567
573
574
568
569
575570
576571
577572
......
579574
580575
581576
582
583577
584578
585579
......
590584
591585
592586
593
587
594588
595589
596
597
590
591
598592
599593
600594
return IDF_Scm::REVISION_VALID;␊
}␊
␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
self::exec('IDF_Scm_Svn::validateRevision', $cmd, $out, $ret);␊
␊
return IDF_Scm::REVISION_INVALID;␊
}␊
␊
␊
/**␊
* Test a given object hash.␊
*␊
}␊
␊
// Else, test the path on revision␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --xml --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --xml --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/'.self::smartEncode($path)),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo.'/'.self::smartEncode($path)));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xmlInfo = self::shell_exec('IDF_Scm_Svn::testHash', $cmd);␊
␊
␊
public function getTree($commit, $folder='/', $branch=null)␊
{␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --no-auth-cache --xml --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --no-auth-cache --xml --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/'.self::smartEncode($folder)),␊
escapeshellarg($commit));␊
escapeshellarg($commit),␊
escapeshellarg($this->repo.'/'.self::smartEncode($folder)));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xml = simplexml_load_string(self::shell_exec('IDF_Scm_Svn::getTree', $cmd));␊
$res = array();␊
return $res;␊
}␊
␊
␊
/**␊
* Get the commit message of a revision revision.␊
*␊
if (isset($this->cache['commitmess'][$rev])) {␊
return $this->cache['commitmess'][$rev];␊
}␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --no-auth-cache --xml --limit 1 --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --no-auth-cache --xml --limit 1 --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
try {␊
$xml = simplexml_load_string(self::shell_exec('IDF_Scm_Svn::getCommitMessage', $cmd));␊
if ($rev == null) {␊
$rev = 'HEAD';␊
}␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --xml --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --xml --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/'.self::smartEncode($filename)),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo.'/'.self::smartEncode($filename)));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xml = simplexml_load_string(self::shell_exec('IDF_Scm_Svn::getPathInfo', $cmd));␊
if (!isset($xml->entry)) {␊
␊
public function getFile($def, $cmd_only=false)␊
{␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' cat --no-auth-cache --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' cat --no-auth-cache --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/'.self::smartEncode($def->fullpath)),␊
escapeshellarg($def->rev));␊
escapeshellarg($def->rev),␊
escapeshellarg($this->repo.'/'.self::smartEncode($def->fullpath)));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
return ($cmd_only) ?␊
$cmd : self::shell_exec('IDF_Scm_Svn::getFile', $cmd);␊
return $this->cache['branches'];␊
}␊
$res = array();␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --no-auth-cache --username=%s --password=%s %s@HEAD',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --no-auth-cache --username=%s --password=%s --revision=HEAD %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/branches'));␊
}␊
}␊
ksort($res);␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --username=%s --password=%s %s@HEAD',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --username=%s --password=%s --revision=HEAD %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/trunk'));␊
return $this->cache['tags'];␊
}␊
$res = array();␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --no-auth-cache --username=%s --password=%s %s@HEAD',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --no-auth-cache --username=%s --password=%s --revision=HEAD %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/tags'));␊
return array();␊
}␊
␊
␊
/**␊
* Get commit details.␊
*␊
return false;␊
}␊
$res = array();␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --no-auth-cache --xml --limit 1 -v --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --no-auth-cache --xml --limit 1 -v --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo),␊
escapeshellarg($commit));␊
escapeshellarg($commit),␊
escapeshellarg($this->repo));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xmlRes = self::shell_exec('IDF_Scm_Svn::getCommit', $cmd);␊
$xml = simplexml_load_string($xmlRes);␊
$branch = 'HEAD';␊
}␊
$res = array();␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --no-auth-cache --xml -v --limit %s --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --no-auth-cache --xml -v --limit %s --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($n),␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo),␊
escapeshellarg($branch));␊
escapeshellarg($branch),␊
escapeshellarg($this->repo));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xmlRes = self::shell_exec('IDF_Scm_Svn::getChangeLog', $cmd);␊
$xml = simplexml_load_string($xmlRes);␊
return $res;␊
}␊
␊
␊
/**␊
* Get additionnals properties on path and revision␊
*␊
public function getProperties($rev, $path='')␊
{␊
$res = array();␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' proplist --no-auth-cache --xml --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' proplist --no-auth-cache --xml --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/'.self::smartEncode($path)),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo.'/'.self::smartEncode($path)));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xmlProps = self::shell_exec('IDF_Scm_Svn::getProperties', $cmd);␊
$props = simplexml_load_string($xmlProps);␊
return $res;␊
}␊
␊
␊
/**␊
* Get a specific additionnal property on path and revision␊
*␊
private function getProperty($property, $rev, $path='')␊
{␊
$res = array();␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' propget --no-auth-cache --xml %s --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' propget --no-auth-cache --xml %s --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($property),␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo.'/'.self::smartEncode($path)),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo.'/'.self::smartEncode($path)));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xmlProp = self::shell_exec('IDF_Scm_Svn::getProperty', $cmd);␊
$prop = simplexml_load_string($xmlProp);␊
return (string) $prop->target->property;␊
}␊
␊
␊
/**␊
* Get the number of the last commit in the repository.␊
*␊
public function getLastCommit($rev='HEAD')␊
{␊
$xmlInfo = '';␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --xml --username=%s --password=%s %s@%s',␊
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --no-auth-cache --xml --username=%s --password=%s --revision=%s %s',␊
escapeshellarg($this->username),␊
escapeshellarg($this->password),␊
escapeshellarg($this->repo),␊
escapeshellarg($rev));␊
escapeshellarg($rev),␊
escapeshellarg($this->repo));␊
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
$xmlInfo = self::shell_exec('IDF_Scm_Svn::getLastCommit', $cmd);␊
␊

Archive Download the corresponding diff file

Page rendered in 0.36811s using 14 queries.