Merge pull request #784 from divmain/release/2.16.3

Release/2.16.4

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+If you encounter a bug, please check for an open issue that already captures the problem you've run into.  If it doesn't exist yet, create it!
+
+Please include the following information when filing a bug:
+
+- Sublime Text version number
+- Git version number
+- OS type and version
+- Console error output
+- A description of the problem.
+- Steps to reproduce, if possible
+- If the bug is caused by a failing command, [include a debug log](docs/debug.md#providing-a-debug-log).

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+Hotfixes should be submitted to `master` branch and the changes are published
+automatically whenever a pull request is merged.  As part of the PR process,
+you will be asked to provide the information necessary to make that happen.
+
+Pull requests on new features should be submitted to `dev` branch and will be
+regularly merged into `master` after evaluations over an extended period of
+time.

.maintainerd

@@ -25,7 +25,7 @@ commit:
     mustMatch: !!js/regexp /^(Fix|Enhancement|Feature|Internal|Other|Release):\s.*/
     mustNotMatch: !!js/regexp /^fixup!/
   message:
-    enforceEmptySecondLine: true
+    enforceEmptySecondLine: false
     linesMustHaveLengthBetween: [0, 72]
 issue:
   onLabelAdded:

CONTRIBUTING.md

@@ -19,7 +19,6 @@ Some other things to remember:
 - Include docstrings for all classes and functions, unless functionality is obvious at a glance.
 - Include descriptions for issues and PRs.
 
-I'm busy and travel sometimes for work - so if I don't respond immediately, please be patient.  I promise to reply!
 
 ## Commit message structure
 
@@ -50,8 +49,6 @@ Please include the following information when filing a bug:
 - Steps to reproduce, if possible
 - If the bug is caused by a failing command, [include a debug log](docs/debug.md#providing-a-debug-log).
 
-If you're interested in tackling a bug, please say so and I can assign it to you.
-
 
 # Documentation
 
@@ -64,4 +61,10 @@ Check the implementation details of the [tests](docs/testing.md).
 
 # Publishing
 
-All changes are published automatically whenever a pull request is merged.  As part of the PR process, you will be asked to provide the information necessary to make that happen.
+Hotfixes should be submitted to `master` branch and the changes are published
+automatically whenever a pull request is merged.  As part of the PR process,
+you will be asked to provide the information necessary to make that happen.
+
+Pull requests on new features should be submitted to `dev` branch and will be
+regularly merged into `master` after evaluations over an extended period of
+time.

Default.sublime-commands

@@ -92,6 +92,10 @@
         "caption": "github: add fork as remote",
         "command": "gs_add_fork_as_remote"
     },
+    {
+        "caption": "github: create fork",
+        "command": "gs_create_fork"
+    },
     {
         "caption": "github: create pull request",
         "command": "gs_create_pull_request"
@@ -365,5 +369,35 @@
     {
         "caption": "flow: hotfix publish",
         "command": "gs_git_flow_hotfix_publish"
-    }
+    },
+    {
+        "caption": "git: stash save",
+        "command": "gs_stash_save"
+    },
+    {
+        "caption": "git: stash save including untracked files",
+        "command": "gs_stash_save",
+        "args" : { "include_untracked": true }
+    },
+    {
+        "caption": "git: stash save staged changes only",
+        "command": "gs_stash_save",
+        "args" : { "stash_of_indexed": true }
+    },
+    {
+        "caption": "git: stash apply",
+        "command": "gs_stash_apply"
+    },
+    {
+        "caption": "git: stash pop",
+        "command": "gs_stash_pop"
+    },
+    {
+        "caption": "git: stash show",
+        "command": "gs_stash_show"
+    },
+    {
+        "caption": "git: stash drop",
+        "command": "gs_stash_drop"
+    },
 ]

Default.sublime-keymap

@@ -297,55 +297,61 @@
 
     {
         "keys": ["t", "a"],
-        "command": "gs_status_apply_stash",
+        "command": "gs_status_stash",
+        "args": { "action": "apply" },
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
         ]
     },
     {
         "keys": ["t", "p"],
-        "command": "gs_status_pop_stash",
+        "command": "gs_status_stash",
+        "args": { "action": "pop" },
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
         ]
     },
     {
         "keys": ["t", "c"],
-        "command": "gs_status_create_stash",
+        "command": "gs_stash_save",
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
         ]
     },
     {
         "keys": ["t", "u"],
-        "command": "gs_status_create_stash_with_untracked",
+        "command": "gs_stash_save",
+        "args": { "include_untracked": true },
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
         ]
     },
     {
         "keys": ["t", "g"],
-        "command": "gs_status_create_stash_of_indexed",
+        "command": "gs_stash_save",
+        "args": { "stash_of_indexed": true },
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
         ]
     },
     {
         "keys": ["t", "d"],
-        "command": "gs_status_discard_stash",
+        "command": "gs_status_stash",
+        "args": { "action": "drop" },
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
         ]
     },
     {
         "keys": ["t", "s"],
-        "command": "gs_status_show_stash",
+        "command": "gs_status_stash",
+        "args": { "action": "show" },
         "context": [
             { "key": "setting.command_mode", "operator": "equal", "operand": false },
             { "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
@@ -1689,7 +1695,7 @@
     /////////////////////////////////
 
     {
-        "keys": ["shift+control+p"],
+        "keys": ["shift+ctrl+p"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "pick" },
         "context": [
@@ -1698,7 +1704,7 @@
         ]
     },
     {
-        "keys": ["shift+control+r"],
+        "keys": ["shift+ctrl+r"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "reword" },
         "context": [
@@ -1707,7 +1713,7 @@
         ]
     },
     {
-        "keys": ["shift+control+e"],
+        "keys": ["shift+ctrl+e"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "edit" },
         "context": [
@@ -1716,7 +1722,7 @@
         ]
     },
     {
-        "keys": ["shift+control+s"],
+        "keys": ["shift+ctrl+s"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "squash" },
         "context": [
@@ -1725,7 +1731,7 @@
         ]
     },
     {
-        "keys": ["shift+control+f"],
+        "keys": ["shift+ctrl+f"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "fixup" },
         "context": [
@@ -1734,7 +1740,7 @@
         ]
     },
     {
-        "keys": ["shift+control+x"],
+        "keys": ["shift+ctrl+x"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "exec" },
         "context": [
@@ -1743,7 +1749,7 @@
         ]
     },
     {
-        "keys": ["shift+control+d"],
+        "keys": ["shift+ctrl+d"],
         "command": "gs_rebase_interactive_terminal",
         "args": { "type": "drop" },
         "context": [

GitSavvy.sublime-project

@@ -27,6 +27,10 @@
         {
             "name": "Reload GitSavvy",
             "target": "gs_reload_modules_debug"
+        },
+        {
+            "name": "Test GitSavvy",
+            "target": "unit_testing_current_package"
         }
     ]
 }

common/interwebs.py

@@ -4,7 +4,7 @@
 
 import http.client
 import json
-from urllib.parse import urlparse
+from urllib.parse import urlparse, urlencode  # NOQA
 from base64 import b64encode
 from functools import partial
 from collections import namedtuple

core/commands/__init__.py

@@ -15,6 +15,7 @@
 from .show_commit_info import *
 from .commit_compare import *
 from .log import *
+from .stash import *
 from .reflog import *
 from .merge import*
 from .changelog import *

core/commands/checkout.py

@@ -51,7 +51,9 @@ def run(self, base_branch=None):
 
     def run_async(self, base_branch=None):
         self.base_branch = base_branch
-        self.window.show_input_panel(NEW_BRANCH_PROMPT, base_branch or "", self.on_done, None, None)
+        v = self.window.show_input_panel(
+            NEW_BRANCH_PROMPT, base_branch or "", self.on_done, None, None)
+        v.run_command("select_all")
 
     def on_done(self, branch_name):
         match = _is_valid_branch_name.match(branch_name)