srchub Commit Details

Date:

2015-09-05 15:15:36 (9 years 3 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

420d4fdd26d65406db5520c94cbb67fd87a9fbff

Parents:

1c563f340b393347ede2e5ac917499ae1d946112

Message:

Issue 90: Full change log doesn't work for mercurial

Changes:

File differences

-512
513 513
514 514
515 
516 
517 
518 
519 
515
516
517
518
519
520
521
522
523
524
525
526
520 527
521 528
522 529
+        // hg accepts revision IDs as arguments to --branch / -b as well and␊
        // uses the branch of the revision in question to filter the other␊
        // revisions␊
        $cmd = sprintf(Pluf::f('hg_path', 'hg').' log --debug -R %s -l%s --style %s -b %s',␊
                       escapeshellarg($this->repo),␊
                       $n,␊
                       escapeshellarg($logStyle->get()),␊
                       escapeshellarg($commit));␊
        if ($n) {␊
            $cmd = sprintf(Pluf::f('hg_path', 'hg').' log --debug -R %s -l%s --style %s -b %s',␊
                           escapeshellarg($this->repo),␊
                           $n,␊
                           escapeshellarg($logStyle->get()),␊
                           escapeshellarg($commit));␊
        } else {␊
            $cmd = sprintf(Pluf::f('hg_path', 'hg').' log --debug -R %s --style %s -b %s',␊
                escapeshellarg($this->repo),␊
                escapeshellarg($logStyle->get()),␊
                escapeshellarg($commit));␊
        }␊
        $out = array();␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
        self::exec('IDF_Scm_Mercurial::getChangeLog', $cmd, $out);␊
         // hg accepts revision IDs as arguments to --branch / -b as well and␊
         // uses the branch of the revision in question to filter the other␊
         // revisions␊
-        $cmd = sprintf(Pluf::f('hg_path', 'hg').' log --debug -R %s -l%s --style %s -b %s',␊
-                       escapeshellarg($this->repo),␊
-                       $n,␊
-                       escapeshellarg($logStyle->get()),␊
-                       escapeshellarg($commit));␊
+        if ($n) {␊
+            $cmd = sprintf(Pluf::f('hg_path', 'hg').' log --debug -R %s -l%s --style %s -b %s',␊
+                           escapeshellarg($this->repo),␊
+                           $n,␊
+                           escapeshellarg($logStyle->get()),␊
+                           escapeshellarg($commit));␊
+        } else {␊
+            $cmd = sprintf(Pluf::f('hg_path', 'hg').' log --debug -R %s --style %s -b %s',␊
+                escapeshellarg($this->repo),␊
+                escapeshellarg($logStyle->get()),␊
+                escapeshellarg($commit));␊
+        }␊
         $out = array();␊
         $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
         self::exec('IDF_Scm_Mercurial::getChangeLog', $cmd, $out);␊

-524
525 525
526 526
527 
527
528
528 529
530
531
532
533
529 534
530 535
531 536
+            $rev = 'HEAD';␊
        }␊
        $res = array();␊
        $cmd = $this->svnCmd(array('log', '--xml', '-v', '--limit', $n),␊
        if ($n) {␊
            $cmd = $this->svnCmd(array('log', '--xml', '-v', '--limit', $n),␊
                             $this->repo.'@'.$rev);␊
        } else {␊
            $cmd = $this->svnCmd(array('log', '--xml', '-v'),␊
                $this->repo.'@'.$rev);␊
        }␊
        $xmlRes = self::shell_exec('IDF_Scm_Svn::getChangeLog', $cmd);␊
        $xml = simplexml_load_string($xmlRes);␊
        foreach ($xml->logentry as $entry) {␊
             $rev = 'HEAD';␊
         }␊
         $res = array();␊
-        $cmd = $this->svnCmd(array('log', '--xml', '-v', '--limit', $n),␊
+        if ($n) {␊
+            $cmd = $this->svnCmd(array('log', '--xml', '-v', '--limit', $n),␊
                              $this->repo.'@'.$rev);␊
+        } else {␊
+            $cmd = $this->svnCmd(array('log', '--xml', '-v'),␊
+                $this->repo.'@'.$rev);␊
+        }␊
         $xmlRes = self::shell_exec('IDF_Scm_Svn::getChangeLog', $cmd);␊
         $xml = simplexml_load_string($xmlRes);␊
         foreach ($xml->logentry as $entry) {␊

Download the corresponding diff file

srchub

File differences

Branches