Indefero Commit Details

Date:

2009-02-02 10:38:48 (15 years 10 months ago)

Author:

Loic d'Anterroches

Branch:

dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

6c83169f1ce4e99683e86c3c2398fd1b47050fd1

Parents:

088f426986be011f3cb9dfd2504ce95e03316f60

Message:

Fixed the submission of a code review and the display.

The display of a code review was crashing when a new file was added in
the diff.
The form to submit a review now proposes directly a choice of commits.

Changes:

File differences

-59
60 60
61 61
62
63
64
65
66
67
68
69
62 70
63 71
64 72
65 73
74
66 75
67 
76
68 77
69 78
70 79
+                                                       'rows' => 7,␊
                                                                    ),␊
                                            ));␊
        $commits = Pluf::factory('IDF_Commit')->getList(array('order' => 'creation_dtime DESC',␊
                                                              'nb' => 10));␊
        $choices = array();␊
        foreach ($commits as $c) {␊
            $id = (strlen($c->scm_id) > 10) ? substr($c->scm_id, 0, 10) : $c->scm_id;␊
            $ext = (mb_strlen($c->summary) > 50) ? mb_substr($c->summary, 0, 47).'...' : $c->summary;␊
            $choices[$id.' - '.$ext] = $c->scm_id;␊
        }␊
        $this->fields['commit'] = new Pluf_Form_Field_Varchar(␊
                                      array('required' => true,␊
                                            'label' => __('Commit'),␊
                                            'initial' => '',␊
                                            'widget' => 'Pluf_Form_Widget_SelectInput',␊
                                            'widget_attrs' => array(␊
                                                       'size' => 42,␊
                                                       'choices' => $choices,␊
                                                                    ),␊
                                            ));␊
        $upload_path = Pluf::f('upload_issue_path', false);␊
                                                        'rows' => 7,␊
                                                                     ),␊
                                             ));␊
+        $commits = Pluf::factory('IDF_Commit')->getList(array('order' => 'creation_dtime DESC',␊
+                                                              'nb' => 10));␊
+        $choices = array();␊
+        foreach ($commits as $c) {␊
+            $id = (strlen($c->scm_id) > 10) ? substr($c->scm_id, 0, 10) : $c->scm_id;␊
+            $ext = (mb_strlen($c->summary) > 50) ? mb_substr($c->summary, 0, 47).'...' : $c->summary;␊
+            $choices[$id.' - '.$ext] = $c->scm_id;␊
+        }␊
         $this->fields['commit'] = new Pluf_Form_Field_Varchar(␊
                                       array('required' => true,␊
                                             'label' => __('Commit'),␊
                                             'initial' => '',␊
+                                            'widget' => 'Pluf_Form_Widget_SelectInput',␊
                                             'widget_attrs' => array(␊
-                                                       'size' => 42,␊
+                                                       'choices' => $choices,␊
                                                                     ),␊
                                             ));␊
         $upload_path = Pluf::f('upload_issue_path', false);␊

-208
209 209
210 210
211 
212 211
213 212
214 213
... ...
216 215
217 216
218 217
219 
218
220 219
221 220
222 221
+        $reviewers = array();␊
        foreach ($diff->files as $filename => $def) {␊
            $fileinfo = $scm->getFileInfo($filename, $patch->get_commit()->scm_id);␊
␊
            $sql = new Pluf_SQL('cfile=%s', array($filename));␊
            $cts = $patch->get_filecomments_list(array('filter'=>$sql->gen(),␊
                                                'order'=>'creation_dtime ASC'));␊

                $reviewers[] = $ct->get_submitter();␊
            }␊
            if (count($def['chunks'])) { ␊
                $orig_file = $scm->getBlob($fileinfo);␊
                $orig_file = ($fileinfo) ? $scm->getBlob($fileinfo) : '';␊
                $files[$filename] = array(␊
                                          $diff->fileCompare($orig_file, $def, $filename),␊
                                          $form->f->{md5($filename)},␊
 ...
         $reviewers = array();␊
         foreach ($diff->files as $filename => $def) {␊
             $fileinfo = $scm->getFileInfo($filename, $patch->get_commit()->scm_id);␊
-␊
             $sql = new Pluf_SQL('cfile=%s', array($filename));␊
             $cts = $patch->get_filecomments_list(array('filter'=>$sql->gen(),␊
                                                 'order'=>'creation_dtime ASC'));␊
                 $reviewers[] = $ct->get_submitter();␊
             }␊
             if (count($def['chunks'])) { ␊
-                $orig_file = $scm->getBlob($fileinfo);␊
+                $orig_file = ($fileinfo) ? $scm->getBlob($fileinfo) : '';␊
                 $files[$filename] = array(␊
                                           $diff->fileCompare($orig_file, $def, $filename),␊
                                           $form->f->{md5($filename)},␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags