Rename repo feature

Dmitriy Zaporozhets
1 parent 7ef1c99d
Showing 5 changed files with 48 additions and 3 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/projects_controller.rb
app/models/project.rb
app/observers/project_observer.rb
app/views/projects/edit.html.haml
@@ -69,7 +69,7 @@ class ApplicationController &lt; ActionController::Base
       @project
     else
       @project = nil
-      render_404
+      render_404 and return
     end
   end
  
@@ -33,12 +33,12 @@ class ProjectsController &lt; ProjectResourceController
   end
  
   def update
-    status = ::Projects::UpdateContext.new(project, current_user, params).execute
+    status = ::Projects::UpdateContext.new(@project, current_user, params).execute
  
     respond_to do |format|
       if status
         flash[:notice] = 'Project was successfully updated.'
-        format.html { redirect_to edit_project_path(project), notice: 'Project was successfully updated.' }
+        format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
         format.js
       else
         format.html { render action: "edit" }
@@ -423,4 +423,28 @@ class Project &lt; ActiveRecord::Base
   def forked?
     !(forked_project_link.nil? || forked_project_link.forked_from_project.nil?)
   end
+
+  def rename_repo
+    old_path_with_namespace = File.join(namespace_dir, path_was)
+    new_path_with_namespace = File.join(namespace_dir, path)
+
+    if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
+      # If repository moved successfully we need to remove old satellite
+      # and send update instructions to users.
+      # However we cannot allow rollback since we moved repository
+      # So we basically we mute exceptions in next actions
+      begin
+        gitlab_shell.rm_satellites(old_path_with_namespace)
+        send_move_instructions
+      rescue
+        # Returning false does not rolback after_* transaction but gives
+        # us information about failing some of tasks
+        false
+      end
+    else
+      # if we cannot move namespace directory we should rollback
+      # db changes in order to prevent out of sync between db and fs
+      raise Exception.new('repository cannot be renamed')
+    end
+  end
 end
@@ -12,6 +12,7 @@ class ProjectObserver &lt; BaseObserver
  
   def after_update(project)
     project.send_move_instructions if project.namespace_id_changed?
+    project.rename_repo if project.path_changed?
   end
  
   def after_destroy(project)
@@ -11,6 +11,8 @@
           %li.active
             = link_to 'Settings', '#tab-settings', 'data-toggle' => 'tab'
           %li
+            = link_to 'Rename repo', '#tab-rename', 'data-toggle' => 'tab'
+          %li
             = link_to 'Transfer', '#tab-transfer', 'data-toggle' => 'tab'
           %li
             = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
@@ -137,6 +139,24 @@
             - else
               %p.nothing_here_message Only project owner can transfer a project
  
+          .tab-pane#tab-rename
+            .ui-box.ui-box-danger
+              %h5.title Rename repository
+              .errors-holder
+              .form-holder
+                = form_for(@project) do |f|
+                  .control-group
+                    = f.label :path do
+                      %span Path
+                    .controls
+                      .clearfix
+                        = f.text_field :path
+                      %ul
+                        %li Be careful. Rename of project repo can have unintended side effects
+                        %li You will need to update your local repositories to point to the new location.
+                  .form-actions
+                    = f.submit 'Rename', class: "btn btn-remove"
+
           .tab-pane#tab-remove
             - if can?(current_user, :remove_project, @project)
               .ui-box.ui-box-danger
...	...	@@ -69,7 +69,7 @@ class ApplicationController < ActionController::Base
69	69	@project
70	70	else
71	71	@project = nil
72		- render_404
	72	+ render_404 and return
73	73	end
74	74	end
75	75
...	...
...	...	@@ -33,12 +33,12 @@ class ProjectsController < ProjectResourceController
33	33	end
34	34
35	35	def update
36		- status = ::Projects::UpdateContext.new(project, current_user, params).execute
	36	+ status = ::Projects::UpdateContext.new(@project, current_user, params).execute
37	37
38	38	respond_to do \|format\|
39	39	if status
40	40	flash[:notice] = 'Project was successfully updated.'
41		- format.html { redirect_to edit_project_path(project), notice: 'Project was successfully updated.' }
	41	+ format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
42	42	format.js
43	43	else
44	44	format.html { render action: "edit" }
...	...
...	...	@@ -423,4 +423,28 @@ class Project < ActiveRecord::Base
423	423	def forked?
424	424	!(forked_project_link.nil? \|\| forked_project_link.forked_from_project.nil?)
425	425	end
	426	+
	427	+ def rename_repo
	428	+ old_path_with_namespace = File.join(namespace_dir, path_was)
	429	+ new_path_with_namespace = File.join(namespace_dir, path)
	430	+
	431	+ if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
	432	+ # If repository moved successfully we need to remove old satellite
	433	+ # and send update instructions to users.
	434	+ # However we cannot allow rollback since we moved repository
	435	+ # So we basically we mute exceptions in next actions
	436	+ begin
	437	+ gitlab_shell.rm_satellites(old_path_with_namespace)
	438	+ send_move_instructions
	439	+ rescue
	440	+ # Returning false does not rolback after_* transaction but gives
	441	+ # us information about failing some of tasks
	442	+ false
	443	+ end
	444	+ else
	445	+ # if we cannot move namespace directory we should rollback
	446	+ # db changes in order to prevent out of sync between db and fs
	447	+ raise Exception.new('repository cannot be renamed')
	448	+ end
	449	+ end
426	450	end
...	...
...	...	@@ -12,6 +12,7 @@ class ProjectObserver < BaseObserver
12	12
13	13	def after_update(project)
14	14	project.send_move_instructions if project.namespace_id_changed?
	15	+ project.rename_repo if project.path_changed?
15	16	end
16	17
17	18	def after_destroy(project)
...	...
...	...	@@ -11,6 +11,8 @@
11	11	%li.active
12	12	= link_to 'Settings', '#tab-settings', 'data-toggle' => 'tab'
13	13	%li
	14	+ = link_to 'Rename repo', '#tab-rename', 'data-toggle' => 'tab'
	15	+ %li
14	16	= link_to 'Transfer', '#tab-transfer', 'data-toggle' => 'tab'
15	17	%li
16	18	= link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
...	...	@@ -137,6 +139,24 @@
137	139	- else
138	140	%p.nothing_here_message Only project owner can transfer a project
139	141
	142	+ .tab-pane#tab-rename
	143	+ .ui-box.ui-box-danger
	144	+ %h5.title Rename repository
	145	+ .errors-holder
	146	+ .form-holder
	147	+ = form_for(@project) do \|f\|
	148	+ .control-group
	149	+ = f.label :path do
	150	+ %span Path
	151	+ .controls
	152	+ .clearfix
	153	+ = f.text_field :path
	154	+ %ul
	155	+ %li Be careful. Rename of project repo can have unintended side effects
	156	+ %li You will need to update your local repositories to point to the new location.
	157	+ .form-actions
	158	+ = f.submit 'Rename', class: "btn btn-remove"
	159	+
140	160	.tab-pane#tab-remove
141	161	- if can?(current_user, :remove_project, @project)
142	162	.ui-box.ui-box-danger
...	...