From 4fa48ea3e53f05fa2a7a84a43be4cd9088cd762b Mon Sep 17 00:00:00 2001
From: Marius Mathiesen <marius@shortcut.no>
Date: Thu, 16 Jul 2009 14:29:30 +0200
Subject: [PATCH] Add information about how to update merge requests to the
 owner

---
 app/views/merge_requests/show.html.erb | 9 +++++++++
 config/locales/en.rb                   | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/app/views/merge_requests/show.html.erb b/app/views/merge_requests/show.html.erb
index 0b7045ff..7a9ffc61 100644
--- a/app/views/merge_requests/show.html.erb
+++ b/app/views/merge_requests/show.html.erb
@@ -33,13 +33,21 @@
 <% if logged_in? && @merge_request.resolvable_by?(current_user) && !@merge_request.possible_next_states.blank? -%>
 <% help_box(:left) do -%>
 <p>
+  <%- if @merge_request.user == current_user -%>
+  <%= t("views.merges.help_for_owners").call(url_for(:action => :edit)) -%>
+  <%- else -%>
   <%= t("views.merges.help") %> 
+  <%- end -%>
   <small>
     <%= link_to_function(t("views.merges.example"), 
           "$('detailed_merge_request_help').toggle()", :class => "more_info") -%>
   </small>
 </p>
 <pre id="detailed_merge_request_help" style="display:none;">
+<%- if @merge_request.user == current_user -%>
+git push <%= @merge_request.target_repository.push_url -%> \
+  <%= @merge_request.source_branch -%>:<%= @merge_request.merge_branch_name -%>
+<%- else -%>
   git checkout master
   git remote add <%= @merge_request.source_repository.user.login -%> <%= @merge_request.source_repository.clone_url %>
   git fetch <%= @merge_request.source_repository.user.login %>
@@ -51,6 +59,7 @@
   git checkout <%= @merge_request.target_branch || 'master' %>
   git merge <%= @merge_request.source_repository.user.login -%>/<%= @merge_request.source_branch || 'master' %>
   git push origin <%= @merge_request.target_branch || 'master' -%>
+<%- end -%>
 </pre>
 <% end -%>
 <% end -%>
diff --git a/config/locales/en.rb b/config/locales/en.rb
index 12cf31bf..08dbb6a2 100644
--- a/config/locales/en.rb
+++ b/config/locales/en.rb
@@ -465,6 +465,10 @@
                   "branch for review, verifying the changes and then merge to back " + 
                   "to master. Your project may or may not use another method for " +
                   "integrating merge requests.",
+        :help_for_owners => lambda{|edit_link| "To make updates to your merge requests," +
+          "you can either edit it from <a href='#{edit_link}'>this link</a> or push your changes through git. "+
+          "Either way, a new version of your merge request will be created, up until the last commit you push. " +
+          "You may make as many updates as you like; the last one will always be displayed by default."},
         :example => "Show example workflow",
         :commits_to_merged => "Commits that would be merged",
         :commits => "Commits",