timcharper / git-tmbundle fork watch download tarball
public
Description: The Git TextMate Bundle
Homepage: http://tim.theenchanter.com/
Clone URL: git://github.com/timcharper/git-tmbundle.git 
removed "fix me" notice (it was fixed).  status listing on merge commit 
was being filtered down to the selected file or directory, when it should 
show the status for the whole project (since it's doing a whole commit)
timcharper (author)
Mon Mar 10 09:22:19 -0700 2008
commit  d4f85b67c116c49ff271fdd5b4a892a50da1a9cf
tree    7c5276570df2a352abb9cd5a9e090f6f3e027aec
parent  176589801dc21f4e8918c55af31aedef79b8b94c
0
Support/app/controllers/status_controller.rb 
...
1
2
3
 
4
5
6
 
...
1
2
 
3
4
5
6
 
0
@@ -1,6 +1,6 @@
0
 class StatusController < ApplicationController
0
   def index
0
-    file_or_path = params[:file_or_path] || git.paths.first
0
+    file_or_path = params[:path] || git.paths.first
0
     puts '<h2>Status for ' + file_or_path.map { |e| "‘#{htmlize(shorten(e))}’" }.join(', ') + '</h2>'
0
     @status_data = git.status(file_or_path)
0
     render "_status", :locals => {:status_data => @status_data}
0
Support/app/views/commit/merge_commit.html.erb 
...
1
2
3
4
5
6
7
8
...
13
14
15
16
17
18
19
20
 
 
 
 
...
1
2
 
 
 
3
4
5
...
10
11
12
 
 
13
14
15
16
17
18
 
0
@@ -1,8 +1,5 @@
0
 <h2>Resolve a merge conflict</h2>
0
 
0
-<%= render_component(:controller => "status", :action => "index", :layout => false, :path => git.git_base) %>
0
-<!-- # puts statuses(git_base).inspect -->
0
-
0
 <% if @status.any? {|status_options| status_options[:status][:short] == "C"} %>
0
   <p class='infobox'>You still have outstanding merge conflicts.  Resolve them, and try to commit again.</p>
0
 <% else %>
0
@@ -13,8 +10,9 @@
0
       <textarea id="commit_message" name='commit_message' cols="80" rows="20"><%= @message %></textarea>
0
     </div>
0
     
0
-    TODO - update me to work with dispatch.rb!
0
-    
0
     <input type="button" name="commit" value="Commit" onclick="$('commit_output').update(dispatch({controller: 'commit', action: 'merge_commit', message: $F('commit_message')}));"/>
0
   </div>
0
 <% end %>
0
+
0
+<% render_component(:controller => "status", :action => "index", :layout => false, :path => git.git_base) %>
0
+<!-- # puts statuses(git_base).inspect -->

Comments

    No one has commented yet.