[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 80cd448 011/133: Merge branch 'master' of ht
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 80cd448 011/133: Merge branch 'master' of https://github.com/cjohansson/emacs-ssh-deploy |
Date: |
Sat, 27 Mar 2021 14:48:33 -0400 (EDT) |
branch: externals/ssh-deploy
commit 80cd4488eeacbd05f11dad2631a5f42c5068f52a
Merge: 6fbc09f b93b944
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Merge branch 'master' of https://github.com/cjohansson/emacs-ssh-deploy
---
README.md | 10 ++++++++++
ssh-deploy.el | 9 +++++++++
2 files changed, 19 insertions(+)
diff --git a/README.md b/README.md
index 7929a0f..9e2e2a3 100644
--- a/README.md
+++ b/README.md
@@ -34,18 +34,28 @@ Here is a list of other variables you can set globally or
per directory:
* `ssh-deploy-automatically-detect-remote-changes` Enables automatic detection
of remote changes *(integer)*
* `ssh-deploy-on-explicit-save` Enabled automatic uploads on save *(integer)*
* `ssh-deploy-exclude-list` A list defining what paths to exclude from
deployment *(list)*
+<<<<<<< HEAD
* `ssh-deploy-async` Enables asynchronous transfers (you need to have
`(make-thread)` or `async.el` installed as well) *(integer)*
+=======
+* `ssh-deploy-async` Enables asynchronous transfers (you need to have
`(make-thread)` or `async.el` installed as well) *(boolean)*
+>>>>>>> b93b94469ef7f00c87367b16c371596683065343
* `ssh-deploy-remote-sql-database` Default database when connecting to remote
SQL database *(string)*
* `ssh-deploy-remote-sql-password` Default password when connecting to remote
SQL database *(string)*
* `ssh-deploy-remote-sql-port` - Default port when connecting to remote SQL
database *(integer)*
* `ssh-deploy-remote-sql-server` Default server when connecting to remote SQL
database *(string)*
* `ssh-deploy-remote-sql-user` Default user when connecting to remote SQL
database *(string)*
* `ssh-deploy-remote-shell-executable` Default remote shell executable when
launching shell on remote host *(string)*
+<<<<<<< HEAD
* `ssh-deploy-verbose` Show messages in message buffer when starting and
ending actions, default t *(integer)*
* `ssh-deploy-script` - Your custom lambda function that will be called using
(funcall) when running deploy script handler *(function)*
* `ssh-deploy-async-with-threads` - Whether to use threads (make threads)
instead of processes (async-start) for asynchronous operations, default nil
*(integer)*
When integers are used as booleans, above zero equals true and otherwise it's
false.
+=======
+* `ssh-deploy-verbose` Show messages in message buffer when starting and
ending actions, default t *(boolean)*
+* `ssh-deploy-script` - Your custom lambda function that will be called using
(funcall) when running deploy script handler
+* `ssh-deploy-async-with-threads` - Whether to use threads (make threads)
instead of processes (async-start) for asynchronous operations, default nil
*(boolean)*
+>>>>>>> b93b94469ef7f00c87367b16c371596683065343
## Deployment configuration examples
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 55e3e78..834a29f 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -61,6 +61,9 @@
;; - To enable mode line to this:
;; (ssh-deploy-line-mode)
;;
+;; - To enable mode line to this:
+;; (ssh-deploy-line-mode)
+;;
;; - To set key-bindings do something like this:
;; (global-set-key (kbd "C-c C-z f") 'ssh-deploy-upload-handler-forced)
;; (global-set-key (kbd "C-c C-z u") 'ssh-deploy-upload-handler)
@@ -223,6 +226,12 @@
(put 'ssh-deploy-async-with-threads 'permanent-local t)
(put 'ssh-deploy-async-with-threads 'safe-local-variable 'integerp)
+(defcustom ssh-deploy-async-with-threads nil
+ "Boolean variable if asynchronous method should use threads if available,
nil by default."
+ :type 'boolean)
+(put 'ssh-deploy-async-with-threads 'permanent-local t)
+(put 'ssh-deploy-async-with-threads 'safe-local-variable 'booleanp)
+
(defcustom ssh-deploy-revision-folder "~/.ssh-deploy-revisions/"
"String variable with file name to revisions with trailing slash."
:type 'string)
- [elpa] externals/ssh-deploy 947a3c7 024/133: Improved usability with pre-defined hooks, (continued)
- [elpa] externals/ssh-deploy 947a3c7 024/133: Improved usability with pre-defined hooks, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 20ce7f2 026/133: Created a pred-fined prefix map and hydra map, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy a12e59f 027/133: Updated comments, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy c1f8837 029/133: Updated documentation with pre-defined hydra and pre-fix map, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d548011 036/133: Fixed bug with constant definition, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d853e2f 040/133: Fixed issue with passing local variables to diff-mode, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 98c00bb 042/133: Fixed bug with synchronous forced uploads, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 103588b 050/133: Running custom script asynchronously loads ssh-deploy library, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 2b3a531 012/133: Updated date, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d7a42fe 015/133: Replaced (concat) with (expand-file-name), Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 80cd448 011/133: Merge branch 'master' of https://github.com/cjohansson/emacs-ssh-deploy,
Stefan Monnier <=
- [elpa] externals/ssh-deploy 861f1c7 013/133: Updated documentation, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 2e3cf30 016/133: Fixed issue with directory differences, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d5386ab 018/133: Renamed internal argument with-threads to async-with-threads, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy cb4c6ff 020/133: Using (expand-file-name) instead of (concat), Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy e0bd19c 022/133: Removed obsolete arguments from directory-diff operations, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 102943f 028/133: Added pre-defined prefix key map, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy afbcc70 030/133: mode-line now shows whether current file is under deployment, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 0e7c608 031/133: Deployment menu only shows when current buffer is deployment, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 8dadac5 032/133: Made menu-bar feature optional, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy b409812 033/133: Started on implementing changes to diff-mode, Stefan Monnier, 2021/03/27