public
Description: The Git TextMate Bundle
Homepage: http://tim.theenchanter.com/
Clone URL: git://github.com/timcharper/git-tmbundle.git
git-tmbundle / Support / app / controllers / branch_controller.rb
100644 180 lines (156 sloc) 6.889 kb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
require ENV['TM_SUPPORT_PATH'] + '/lib/ui.rb'
 
class BranchController < ApplicationController
  layout "application", :except => [:create, :delete]
  def switch
    locals = git.branch.list_names(:local)
    remotes = git.branch.list_names(:remote)
    current = git.branch.current_name
    
    items = ([current] + locals + remotes).uniq
    
    if items.length == 0
      puts "Current branch is '#{current}'. There are no other branches."
    else
      target_branch = TextMate::UI.request_item(:title => "Switch to Branch", :prompt => "Current branch is '#{current}'.\nSelect a new branch to switch to:", :items => items)
      if target_branch.blank?
        exit_discard
      end
      
      if locals.include?(target_branch)
        switch_local(target_branch)
      else
        switch_remote(target_branch)
      end
    end
  end
  
  def create
    if name = TextMate::UI.request_string(:title => "Create Branch", :prompt => "Enter the name of the new branch:")
      puts git.branch.create_and_switch(name)
    end
  end
  
  def delete
    locals = git.branch.list_names(:local)
    remotes = git.branch.list_names(:remote)
    current = git.branch.current_name
    
    all = locals + remotes
    
    if all.length == 1
      TextMate::UI.alert(:warning, "Error!", "There's only one branch, and you can't delete all of the branches", 'OK')
      return false
    end
 
    if all.length == 0
      puts "Current branch is '#{current}'. There are no other branches."
    else
      target = TextMate::UI.request_item(:title => "Delete Branch", :prompt => "Select the branch to delete:", :items => locals + remotes)
      if target.blank?
        return exit_discard
      end
      
      if target == current
        TextMate::UI.alert(:warning, "Error!", "You cannot delete the branch you are currently on (switch first)", 'OK')
        return false
      end
      
      if remotes.include?(target)
        delete_remote(target)
      elsif
        delete_local(target)
      end
    end
  end
  
  def merge
    # prompt for which branch to merge from
    c_branch = git.branch.current_name
    all_branches = git.branch.list_names - [c_branch]
    all_branches << "" # keep the dialog from auto-selecting if there's only one other branch
    merge_from_branch = TextMate::UI.request_item(:title => "Merge", :prompt => "Merge which branch into '#{c_branch}':", :items => all_branches)
 
    if merge_from_branch.blank?
      puts "Aborted"
      abort
    end
 
    puts "<h2>Merging #{merge_from_branch} into #{c_branch}</h2>"
    flush
 
    result = git.merge(merge_from_branch)
    # run the merge
    puts "<pre>"
    puts result[:text]
    puts "</pre>"
 
    unless result[:conflicts].empty?
      puts "<h2>Conflicts - resolve each of the following then commit:</h2>"
      result[:conflicts].each do |conflicted_file|
        full_path = File.join(git.git_base, conflicted_file)
        puts "<div><a href='txmt://open?url=file://#{e_url full_path}'>#{conflicted_file}</a></div>"
      end
    end
    rescan_project
  end
    
  protected
    def switch_remote(target)
      remote_alias, remote_branch_name = target.split("/")
    
      repeat = false
      begin
        new_branch_name = TextMate::UI.request_string(:title => "Switch to remote branch", :prompt => "You must set up a local tracking branch to work on '#{target}'.\nWhat would you like to name the local tracking branch?", :default => remote_branch_name)
        new_branch_name = new_branch_name.to_s.strip
        if new_branch_name.blank?
          return exit_discard
        end
      
        if git.branch.list_names(:local).include?(new_branch_name)
          response = TextMate::UI.alert(:warning, "Branch name already taken!", "The branch name '#{new_branch_name}' is already in use.\nVery likely this is the branch you want to work on.\nIf not, pick another name.", "Pick another name", "Switch to it", "Cancel")
          return exit_discard if response == "Cancel"
          return switch_local(new_branch_name) if response == "Switch to it"
          repeat = true
        end
      end while repeat
    
      output = git.command("branch", "--track", new_branch_name, target)
      puts htmlize(output)
      switch_local(new_branch_name)
    end
  
    def delete_local(target)
      result = git.branch.delete(target)
      case result[:outcome]
      when :success
        TextMate::UI.alert(:informational, "Success", result[:output], 'OK')
      when :unmerged
        return false if TextMate::UI.alert(:warning, "Warning", "Branch '#{target}' is not an ancestor of your current HEAD (it has unmerged changes)\nReally delete it?", 'Yes', 'No') != 'Yes'
        result = git.branch.delete(target, :force => true)
        if result[:outcome] == :success
          TextMate::UI.alert(:informational, "Deleted branch", result[:output], 'OK')
        else
          TextMate::UI.alert(:informational, "Still couldn't delete branch", "Git said:\n#{result[:output]}", 'OK')
          return false
        end
      else
        TextMate::UI.alert(:warning, "Hmmm", "I didn't understand's git's response, perhaps you can make sense of it?\n#{result[:output].to_s}", 'Ok')
        return false
      end
      true
    end
  
    def delete_remote(target)
      # detect remote
      result = git.branch.delete(target)
      case result[:outcome]
      when :success
        TextMate::UI.alert(:informational, "Success", "Deleted remote branch #{target}.", "OK")
        return true
      when :branch_not_found
        TextMate::UI.alert(:warning, "Delete branch failed!", "The source '#{result[:remote]}' reported that the branch '#{result[:branch]}' does not exist.\nTry running the prune remote stale branches command?", "OK")
        return false
      else
        TextMate::UI.alert(:informational, "Delete remote branch", "I couldn't make sense of this. Perhaps you can?\n#{result[:output]}", 'OK')
      end
    end
    
    def switch_local(target_branch)
      output = git.branch.switch(target_branch)
      case output
      when /fatal: you need to resolve your current index first/
        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")
        exit_discard
      when /fatal: Entry '(.+)' not uptodate\. Cannot merge\./
        response = TextMate::UI.alert(:informational, "Conflict detected if you switch", "There are uncommitted changes that will cause conflicts by this switch (#{$1}).\nSwitch anyways?", "No", "Yes")
        if response=="Yes"
          output = git.command("checkout", "-m", target_branch)
          puts htmlize(output)
          output_show_html and return
        else
          output_discard and return
        end
      else
        puts htmlize(output)
        output_show_html and return
      end
    end
  
end