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 
spec for branch-switching warning-override mechanism discovered that my 
addition of a parenthesis caused the dialog to show "error" where the 
filenames should have been.  fixed
timcharper (author)
Thu Apr 24 16:34:56 -0700 2008
commit  8d48cd8530bdb72ec4f975cf710ee92c729e1b84
tree    a37dca00f783b9c0eed5ed84230b3c83d2f66fa6
parent  f6ee94f6d9dc3d52387ff07d6f3d37fd0e3ffdaa
0
Support/app/controllers/branch_controller.rb 
...
150
151
152
153
 
154
155
156
 
...
150
151
152
 
153
154
155
156
 
0
@@ -150,7 +150,7 @@ class BranchController < ApplicationController
0
         TextMate::UI.alert(:warning, "Error - couldn't switch", "Git said:\n#{output}\nYou're probably in the middle of a conflicted merge, and need to commit", "OK")
0
         exit_discard
0
       when /(fatal|error): Entry '(.+)' not uptodate\. Cannot merge\./
0
-        response = TextMate::UI.alert(:informational, "Conflicts may happen if you switch", "There are uncommitted changes that might cause conflicts by this switch (#{$1}).\nSwitch anyways?", "No", "Yes")
0
+        response = TextMate::UI.alert(:informational, "Conflicts may happen if you switch", "There are uncommitted changes that might cause conflicts by this switch (#{$2}).\nSwitch anyways?", "No", "Yes")
0
         if response=="Yes"
0
           output = git.command("checkout", "-m", target_branch)
0
           puts htmlize(output)
0
Support/spec/controllers/branch_controller_spec.rb 
...
71
72
73
74
 
75
76
77
 
...
71
72
73
 
74
75
76
77
 
0
@@ -71,7 +71,7 @@ describe BranchController do
0
       
0
       it "should ask you if you'd like to force when uncommitted files exist" do
0
         @set_branch_to_choose.call("task")
0
-        Git.command_response["checkout", "task"] = %{fatal: Entry 'branch_spec.rb' not uptodate. Cannot merge.\n}
0
+        Git.command_response["checkout", "task"] = %{error: Entry 'branch_spec.rb' not uptodate. Cannot merge.\n}
0
         TextMate::UI.should_receive(:alert).with(:informational, "Conflicts may happen if you switch", "There are uncommitted changes that might cause conflicts by this switch (branch_spec.rb).\nSwitch anyways?", "No", "Yes").and_return("Yes")
0
         
0
         Git.command_response["checkout", "-m", "task"] = <<-EOF

Comments

    No one has commented yet.