Merge ac1a55b into f4c97be

Default (Linux).sublime-keymap

@@ -54,6 +54,15 @@
             { "key": "setting.git_savvy.diff_view.disable_stage", "operator": "equal", "operand": false }
         ]
     },
+    {
+        "keys": ["ctrl+z"],
+        "command": "gs_diff_undo",
+        "context": [
+            { "key": "setting.command_mode", "operator": "equal", "operand": false },
+            { "key": "setting.git_savvy.diff_view", "operator": "equal", "operand": true },
+            { "key": "setting.git_savvy.diff_view.disable_stage", "operator": "equal", "operand": false }
+        ]
+    },
 
     //////////////////
     // STAGE_DIFF VIEW //
@@ -174,6 +183,17 @@
             { "key": "selector", "operator": "equal", "operand": "git-savvy.diff" }
         ]
     },
+    {
+        "keys": ["ctrl+,"],
+        "command": "edit_settings",
+        "args": {
+            "base_file": "${packages}/GitSavvy/syntax/diff_view.sublime-settings",
+            "default": "// Override settings for diff syntax-specific.\n{\n\t$0\n}\n"
+        },
+        "context": [
+            { "key": "selector", "operator": "equal", "operand": "git-savvy.diff_view" }
+        ]
+    },
     {
         "keys": ["ctrl+,"],
         "command": "edit_settings",

Default (OSX).sublime-keymap

@@ -54,6 +54,15 @@
             { "key": "setting.git_savvy.diff_view.disable_stage", "operator": "equal", "operand": false }
         ]
     },
+    {
+        "keys": ["super+z"],
+        "command": "gs_diff_undo",
+        "context": [
+            { "key": "setting.command_mode", "operator": "equal", "operand": false },
+            { "key": "setting.git_savvy.diff_view", "operator": "equal", "operand": true },
+            { "key": "setting.git_savvy.diff_view.disable_stage", "operator": "equal", "operand": false }
+        ]
+    },
 
     //////////////////
     // STAGE_DIFF VIEW //
@@ -174,6 +183,17 @@
             { "key": "selector", "operator": "equal", "operand": "git-savvy.diff" }
         ]
     },
+    {
+        "keys": ["super+,"],
+        "command": "edit_settings",
+        "args": {
+            "base_file": "${packages}/GitSavvy/syntax/diff_view.sublime-settings",
+            "default": "// Override settings for diff syntax-specific.\n{\n\t$0\n}\n"
+        },
+        "context": [
+            { "key": "selector", "operator": "equal", "operand": "git-savvy.diff_view" }
+        ]
+    },
     {
         "keys": ["super+,"],
         "command": "edit_settings",

Default (Windows).sublime-keymap

@@ -54,6 +54,15 @@
             { "key": "setting.git_savvy.diff_view.disable_stage", "operator": "equal", "operand": false }
         ]
     },
+    {
+        "keys": ["ctrl+z"],
+        "command": "gs_diff_undo",
+        "context": [
+            { "key": "setting.command_mode", "operator": "equal", "operand": false },
+            { "key": "setting.git_savvy.diff_view", "operator": "equal", "operand": true },
+            { "key": "setting.git_savvy.diff_view.disable_stage", "operator": "equal", "operand": false }
+        ]
+    },
 
     //////////////////
     // STAGE_DIFF VIEW //
@@ -174,6 +183,17 @@
             { "key": "selector", "operator": "equal", "operand": "git-savvy.diff" }
         ]
     },
+    {
+        "keys": ["ctrl+,"],
+        "command": "edit_settings",
+        "args": {
+            "base_file": "${packages}/GitSavvy/syntax/diff_view.sublime-settings",
+            "default": "// Override settings for diff syntax-specific.\n{\n\t$0\n}\n"
+        },
+        "context": [
+            { "key": "selector", "operator": "equal", "operand": "git-savvy.diff_view" }
+        ]
+    },
     {
         "keys": ["ctrl+,"],
         "command": "edit_settings",

Default.sublime-keymap

@@ -607,8 +607,7 @@
     },
     {
         "keys": ["tab"],
-        "command": "gs_diff_toggle_setting",
-        "args": { "setting": "in_cached_mode" },
+        "command": "gs_diff_toggle_cached_mode",
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.diff_view", "operator": "equal", "operand": true }

common/util/view.py

@@ -36,18 +36,26 @@ def decorated_run(self, *args, **kwargs):
 # NEW-VIEW HELPER FUNCTIONS #
 #############################
 
-def get_scratch_view(context, name, read_only=True):
+def create_scratch_view(window, name, read_only=True):
     """
-    Create and return a read-only view.
+    Create and return a scratch view.
     """
-    window = context.window if hasattr(context, "window") else context.view.window()
     view = window.new_file()
-    view.settings().set("git_savvy.{}_view".format(name), True)
+    view.settings().set("git_savvy.{}".format(name), True)
     view.set_scratch(True)
     view.set_read_only(read_only)
     return view
 
 
+def get_scratch_view(context, name, read_only=True):
+    """
+    Create and return a scratch view.
+    Given `name` gets expanded to `{name}_view`.
+    """
+    window = context.window if hasattr(context, "window") else context.view.window()
+    return create_scratch_view(window, "{}_view".format(name), read_only=read_only)
+
+
 def get_is_view_of_type(view, typ):
     """
     Determine if view is of specified type.

core/commands/commit_compare.py

@@ -101,15 +101,13 @@ def run_async(self):
                 "base_commit": target_commit,
                 "target_commit": base_commit,
                 "file_path": file_path,
-                "disable_stage": True,
                 "title": "DIFF: {}..{}".format(target_commit, base_commit)
             })
         else:
             self.view.window().run_command("gs_diff", {
                 "base_commit": base_commit,
                 "target_commit": target_commit,
                 "file_path": file_path,
-                "disable_stage": True,
                 "title": "DIFF: {}..{}".format(base_commit, target_commit)
             })