Merge pull request #333 from Starli0n/master

Add three features

Author: kemayo

Default.sublime-commands

@@ -54,6 +54,14 @@
         "caption": "Git: Diff Tool All",
         "command": "git_diff_tool_all"
     }
+    ,{
+        "caption": "Git: Diff Tool Current File Staged",
+        "command": "git_diff_tool_commit"
+    }
+    ,{
+        "caption": "Git: Diff Tool Staged",
+        "command": "git_diff_tool_commit_all"
+    }
     ,{
         "caption": "Git: Commit",
         "command": "git_commit"
@@ -159,7 +167,7 @@
         "command": "git_custom"
     }
     ,{
-        "caption": "Git Flow: Feature Start", 
+        "caption": "Git Flow: Feature Start",
         "command": "git_flow_feature_start"
     }
     ,{
@@ -226,4 +234,12 @@
         "caption": "Git: Commit history",
         "command": "git_commit_history"
     }
+    ,{
+        "caption": "Git: Open Config File",
+        "command": "git_open_config_file"
+    }
+    ,{
+        "caption": "Git: Open Config Url",
+        "command": "git_open_config_url", "args": { "url_param": "remote.origin.url" }
+    }
 ]

Git.sublime-settings

@@ -39,4 +39,7 @@
 	// Symbols for quick git status in status bar
 	,"statusbar_status": true
 	,"statusbar_status_symbols" : {"modified": "≠", "added": "+", "deleted": "×", "untracked": "?", "conflicts": "‼", "renamed":"R", "copied":"C", "clean": "√", "separator": " "}
+
+	// Use diff tool configured in Git config
+	,"diff_tool": false
 }

Main.sublime-menu

@@ -51,6 +51,8 @@
                             ,{ "caption": "Amend Last Commit", "command": "git_commit_amend" }
                             ,{ "caption": "-" }
                             ,{ "caption": "Open...", "command": "git_open_file" }
+                            ,{ "caption": "Open Config", "command": "git_open_config_file" }
+                            ,{ "caption": "Open Url", "command": "git_open_config_url", "args": { "url_param": "remote.origin.url" } }
                         ]
                     }
                     ,{

config.py

@@ -0,0 +1,34 @@
+import os
+import re
+
+import sublime
+from git import GitWindowCommand, git_root
+
+
+class GitOpenConfigFileCommand(GitWindowCommand):
+    def run(self):
+        working_dir = git_root(self.get_working_dir())
+        config_file = os.path.join(working_dir, '.git/config')
+        if os.path.exists(config_file):
+            self.window.open_file(config_file)
+        else:
+            sublime.status_message("No config found")
+
+
+class GitOpenConfigUrlCommand(GitWindowCommand):
+    def run(self, url_param):
+        self.run_command(['git', 'config', url_param], self.url_done)
+
+    def url_done(self, result):
+        results = [r for r in result.rstrip().split('\n') if r.startswith("http")]
+        if len(results):
+            url = results[0]
+            user_end = url.index('@')
+            if user_end > -1:
+                # Remove user and pass from url
+                user_start = url.index('//') + 1
+                user = url[user_start+1:user_end+1]
+                url = url.replace(user, '')
+            self.window.run_command('open_url', {"url": url})
+        else:
+            sublime.status_message("No url to open")

diff.py

@@ -80,6 +80,16 @@ def run(self):
         self.run_command(['git', 'difftool'])
 
 
+class GitDiffToolCommit(GitTextCommand):
+    def run(self, edit=None):
+        self.run_command(['git', 'difftool', '--cached', '--', self.get_file_name()])
+
+
+class GitDiffToolCommitAll(GitWindowCommand):
+    def run(self):
+        self.run_command(['git', 'difftool', '--cached'])
+
+
 class GitGotoDiff(sublime_plugin.TextCommand):
     def run(self, edit):
         v = self.view

git.py

@@ -306,19 +306,25 @@ def get_window(self):
 class GitCustomCommand(GitWindowCommand):
     may_change_files = True
 
-    def run(self):
-        self.get_window().show_input_panel("Git command", "",
+    def run(self, command=None):
+        if command is None:
+            self.get_window().show_input_panel("Git command", "",
             self.on_input, None, None)
+        else:
+            self.on_input(command)
+
 
     def on_input(self, command):
         command = str(command)  # avoiding unicode
         if command.strip() == "":
             self.panel("No git command provided")
             return
         import shlex
-        command_splitted = ['git'] + shlex.split(command)
-        print command_splitted
-        self.run_command(command_splitted)
+        cmds = [c.strip() for c in command.split(';') if c.strip() != '']
+        for cmd in cmds:
+            command_splitted = ['git'] + shlex.split(cmd)
+            print command_splitted
+            self.run_command(command_splitted)
 
 
 class GitGuiCommand(GitTextCommand):

status.py

@@ -43,11 +43,16 @@ def panel_followup(self, picked_status, picked_file, picked_index):
         s = sublime.load_settings("Git.sublime-settings")
         root = git_root(self.get_working_dir())
         if picked_status == '??' or s.get('status_opens_file') or self.force_open:
-            if(os.path.isfile(os.path.join(root, picked_file))):
-                self.window.open_file(os.path.join(root, picked_file))
+            file_name = os.path.join(os.path.realpath(root), picked_file)
+            if os.path.isfile(file_name):
+                self.window.open_file(file_name)
         else:
-            self.run_command(['git', 'diff', '--no-color', '--', picked_file.strip('"')],
-                self.diff_done, working_dir=root)
+            if s.get('diff_tool'):
+                self.run_command(['git', 'difftool', '--', picked_file.strip('"')],
+                    working_dir=root)
+            else:
+                self.run_command(['git', 'diff', '--no-color', '--', picked_file.strip('"')],
+                    self.diff_done, working_dir=root)
 
     def diff_done(self, result):
         if not result.strip():