From 20cf261a8e2cc7cdd2e79acfb7fa4c20ab5dc75e Mon Sep 17 00:00:00 2001
From: dickmao <dick.r.chiang@gmail.com>
Date: Fri, 9 Nov 2018 14:50:16 -0500
Subject: [PATCH] fixes #399

---
 Makefile          |  2 +-
 lisp/ein-query.el | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4393a2b..2bb4c1c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifeq ($(TRAVIS_PULL_REQUEST_BRANCH),)
 TRAVIS_PULL_REQUEST_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 endif
 ifeq ($(TRAVIS_PULL_REQUEST_SHA),)
-TRAVIS_PULL_REQUEST_SHA := $(shell git rev-parse origin/$(TRAVIS_PULL_REQUEST_BRANCH))
+TRAVIS_PULL_REQUEST_SHA := $(shell if git show-ref --quiet --verify origin/$(TRAVIS_PULL_REQUEST_BRANCH) ; then git rev-parse origin/$(TRAVIS_PULL_REQUEST_BRANCH) ; fi))
 endif
 
 .DEFAULT_GOAL := test-compile
diff --git a/lisp/ein-query.el b/lisp/ein-query.el
index 19d1f3c..26d76b6 100644
--- a/lisp/ein-query.el
+++ b/lisp/ein-query.el
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(require 'request)
 (require 'request-deferred)
 (require 'url)
 
@@ -154,6 +155,14 @@ variable to a reasonable value you can avoid this situation."
   :group 'ein
   :type 'integer)
 
+(defsubst ein:query-enforce-curl ()
+  (when (not (eq request-backend 'curl))
+    (ein:display-warning 
+     (format "request-backend: %s unsupported" request-backend))
+    (if (executable-find "curl")
+        (setq request-backend 'curl)
+      (ein:display-warning "The 'curl' program was not found"))))
+
 (defun* ein:query-singleton-ajax (key url &rest settings
                                       &key
                                       (timeout ein:query-timeout)
@@ -161,6 +170,7 @@ variable to a reasonable value you can avoid this situation."
   "Cancel the old process if there is a process associated with
 KEY, then call `request' with URL and SETTINGS.  KEY is compared by
 `equal'."
+  (ein:query-enforce-curl)
   (with-local-quit
     (ein:query-gc-running-process-table)
     (when timeout
@@ -191,7 +201,8 @@ KEY, then call `request' with URL and SETTINGS.  KEY is compared by
                                 &key
                                 (timeout ein:query-timeout)
                                 &allow-other-keys)
-  ""
+  "Appears to be used by ein-jupyterhub only"
+  (ein:query-enforce-curl)
   (apply #'request-deferred (url-encode-url url)
          (ein:query-prepare-header url settings)))