Indefero Commit Details

Date:

2011-10-31 17:19:57 (13 years 6 months ago)

Author:

Gert van Valkenhoef

Branch:

develop, feature.wiki-default-page, release-1.2, release-1.3

Commit:

8397d86313b6c9963a279b43bfeb5fdb43d80ebd

Parents:

b0ac05b608c0566562f2df23b5a8db7da70c012f

Message:

No longer fail to remove a non-existing post-update hook on repository creation (fixes issue 752)

Changes:

File differences

-53
54 54
55 55
56
57
56 58
57 59
58 60
+- Source links without a specific revision did not work due to a wrong regex␊
  (issue 730)␊
- Avatar URL generation use correctly the configuration (issue 732)␊
- The SyncGit plugin no longer fails to remove a non-existing post-update hook␊
  on repository creation (issue 752)␊
- The error detection and reporting in the SyncMonotone plugin has been improved␊
- The branch links users of the Subversion frontend get when they enter a wrong␊
  revision are fixed; this list is now also only displayed (for any SCM) if␊
 - Source links without a specific revision did not work due to a wrong regex␊
   (issue 730)␊
 - Avatar URL generation use correctly the configuration (issue 732)␊
+- The SyncGit plugin no longer fails to remove a non-existing post-update hook␊
+  on repository creation (issue 752)␊
 - The error detection and reporting in the SyncMonotone plugin has been improved␊
 - The branch links users of the Subversion frontend get when they enter a wrong␊
   revision are fixed; this list is now also only displayed (for any SCM) if␊

-210
211 211
212 212
213 
213
214
214 215
215 216
216 
217
217 218
218 219
219 220
220 221
221 222
222 223
223 
224
224 225
225 226
226 227
227 228
228 
229
229 230
230 231
231 232
+        // Indefero's one.␊
        $p = realpath(dirname(__FILE__).'/../../../../scripts/git-post-update');␊
        $p = Pluf::f('idf_plugin_syncgit_post_update', $p);␊
        if (!@unlink($fullpath.'/hooks/post-update')) {␊
        $post_update_hook = $fullpath.'/hooks/post-update';␊
        if (file_exists($post_update_hook) && !@unlink($post_update_hook)) {␊
            Pluf_Log::warn(array('IDF_Plugin_Git_Serve::initRepository', ␊
                                 'post-update hook removal error.', ␊
                                 $fullpath.'/hooks/post-update'));␊
                                 $post_update_hook));␊
            return;␊
        }␊
        $out = array();␊
        $res = 0;␊
        exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', ␊
                     escapeshellarg($p), ␊
                     escapeshellarg($fullpath.'/hooks/post-update')),␊
                     escapeshellarg($post_update_hook)),␊
             $out, $res);␊
        if ($res != 0) {␊
            Pluf_Log::warn(array('IDF_Plugin_Git_Serve::initRepository', ␊
                                 'post-update hook creation error.', ␊
                                 $fullpath.'/hooks/post-update'));␊
                                 $post_update_hook));␊
            return;␊
        }␊
        Pluf_Log::debug(array('IDF_Plugin_Git_Serve::initRepository', ␊
         // Indefero's one.␊
         $p = realpath(dirname(__FILE__).'/../../../../scripts/git-post-update');␊
         $p = Pluf::f('idf_plugin_syncgit_post_update', $p);␊
-        if (!@unlink($fullpath.'/hooks/post-update')) {␊
+        $post_update_hook = $fullpath.'/hooks/post-update';␊
+        if (file_exists($post_update_hook) && !@unlink($post_update_hook)) {␊
             Pluf_Log::warn(array('IDF_Plugin_Git_Serve::initRepository', ␊
                                  'post-update hook removal error.', ␊
-                                 $fullpath.'/hooks/post-update'));␊
+                                 $post_update_hook));␊
             return;␊
         }␊
         $out = array();␊
         $res = 0;␊
         exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', ␊
                      escapeshellarg($p), ␊
-                     escapeshellarg($fullpath.'/hooks/post-update')),␊
+                     escapeshellarg($post_update_hook)),␊
              $out, $res);␊
         if ($res != 0) {␊
             Pluf_Log::warn(array('IDF_Plugin_Git_Serve::initRepository', ␊
                                  'post-update hook creation error.', ␊
-                                 $fullpath.'/hooks/post-update'));␊
+                                 $post_update_hook));␊
             return;␊
         }␊
         Pluf_Log::debug(array('IDF_Plugin_Git_Serve::initRepository', ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags