natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issue 282, Mercurial support in new projects.

Browse Source
This commit is contained in:
David Feeney 2009-10-01 14:56:54 +02:00 committed by Loic d'Anterroches
parent 6edaf03faa
commit 4765ca2232
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/IDF/Scm/Mercurial.php
View File

@ -49,7 +49,12 @@ class IDF_Scm_Mercurial extends IDF_Scm
public function isAvailable() public function isAvailable()
{ {
return true; try {
$branches = $this->getBranches();
} catch (IDF_Scm_Exception $e) {
return false;
}
return (count($branches) > 0);
} }
public function findAuthor($author) public function findAuthor($author)
@ -86,7 +91,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
escapeshellarg($rev)); escapeshellarg($rev));
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;
exec($cmd, $out, $ret); exec($cmd, $out, $ret);
return ($ret == 0); return ($ret == 0) && (count($out) > 0);
} }
/** /**
@ -287,8 +292,11 @@ class IDF_Scm_Mercurial extends IDF_Scm
* @param bool Get commit diff (false) * @param bool Get commit diff (false)
* @return array Changes * @return array Changes
*/ */
public function getCommit($commit='tip', $getdiff=false) public function getCommit($commit, $getdiff=false)
{ {
if (!$this->isValidRevision($commit)) {
return false;
}
$tmpl = ($getdiff) ? $tmpl = ($getdiff) ?
Pluf::f('hg_path', 'hg').' log -p -r %s -R %s' : Pluf::f('hg_path', 'hg').' log -r %s -R %s'; Pluf::f('hg_path', 'hg').' log -p -r %s -R %s' : Pluf::f('hg_path', 'hg').' log -r %s -R %s';
$cmd = sprintf($tmpl, $cmd = sprintf($tmpl,
@ -393,8 +401,8 @@ class IDF_Scm_Mercurial extends IDF_Scm
continue; continue;
} }
} }
$c['tree'] = $c['commit']; $c['tree'] = !empty($c['commit']) ? trim($c['commit']) : '';
$c['full_message'] = trim($c['full_message']); $c['full_message'] = !empty($c['full_message']) ? trim($c['full_message']) : '';
$res[] = (object) $c; $res[] = (object) $c;
return $res; return $res;
} }