Merge branch 'develop'

Author: spderosso

.travis.sh

@@ -2,7 +2,7 @@
 
 cd ~
 
-git clone --depth=1 -b maint/v0.23 https://github.com/libgit2/libgit2.git
+git clone --depth=1 -b maint/v0.24 https://github.com/libgit2/libgit2.git
 cd libgit2/
 
 mkdir build && cd build

.travis.yml

@@ -1,11 +1,11 @@
 language: python
 
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 
 env: LIBGIT2=~/libgit2/_install/ LD_LIBRARY_PATH=~/libgit2/_install/lib

README.md

@@ -53,10 +53,10 @@ the Python Package Index).
 
 ### Installing from source
 
-To install from source you need to have Python (2.6, 2.7, 3.2+ or pypy)
+To install from source you need to have Python (2.7, 3.2+ or pypy)
 installed.
 
-Additionaly, you need to [install pygit2 (v0.23.0)](
+Additionaly, you need to [install pygit2](
 http://www.pygit2.org/install.html "pygit2 install").
 
 Then, [download the source code tarball](http://gitless.com "Gitless's website")
@@ -69,9 +69,9 @@ and do:
 
 If you are a Python fan you might find it easier to install
 Gitless via the Python Package Index. To do this, you need to have
-Python (2.6, 2.7, 3.2+ or pypy) installed.
+Python (2.7, 3.2+ or pypy) installed.
 
-Additionaly, you need to [install pygit2 (v0.23.0)](
+Additionaly, you need to [install pygit2](
 http://www.pygit2.org/install.html "pygit2 install").
 
 Then, just do:
@@ -114,4 +114,4 @@ Gitless's code so that your edits are consistent with the codebase
 
 - Finally, if you don't want [Travis](
     https://travis-ci.org/sdg-mit/gitless "Travis") to
-be mad at you, check that tests pass in python 2.6, 2.7 and 3.2+
+be mad at you, check that tests pass in Python 2.7 and 3.2+

gitless/cli/commit_dialog.py

@@ -68,8 +68,13 @@ def _launch_editor(fp, repo):
   except KeyError:
     editor = os.environ['EDITOR'] if 'EDITOR' in os.environ else 'vim'
 
-  if subprocess.call([editor, fp]) != 0:
-    raise Exception('Call to editor {0} failed'.format(editor))
+  try:
+    ret = subprocess.call([editor, fp])
+    if ret != 0:
+      pprint.err('Call to editor {0} failed'.format(editor))
+  except OSError:
+    pprint.err('Couldn\'t launch editor {0}'.format(editor))
+    pprint.err_exp('change the value of git\'s core.editor setting')
 
 
 def _extract_msg(repo):

gitless/cli/gl.py

@@ -29,15 +29,18 @@
 INTERNAL_ERROR = 3
 NOT_IN_GL_REPO = 4
 
-VERSION = '0.8.3'
+VERSION = '0.8.4'
 URL = 'http://gitless.com'
 
 
 repo = None
 try:
   repo = core.Repository()
-  colored.DISABLE_COLOR = (repo.config['color.ui'] in
-                           ['false', '0', 'off', 'no', 'never'])
+  try:
+    colored.DISABLE_COLOR = not repo.config.get_bool('color.ui')
+  except pygit2.GitError:
+    colored.DISABLE_COLOR = (
+        repo.config['color.ui'] in ['no', 'never'])
 except (core.NotInRepoError, KeyError):
   pass
 

gitless/cli/gl_commit.py

@@ -48,6 +48,15 @@ def main(args, repo):
   if args.p:
     partials = _do_partial_selection(commit_files, curr_b)
 
+  if not repo.config['user.name']:
+    pprint.err('Missing name for commit author')
+    pprint.err_exp('change the value of git\'s user.name setting')
+    return False
+  if not repo.config['user.email']:
+    pprint.err('Missing email for commit author')
+    pprint.err_exp('change the value of git\'s user.email setting')
+    return False
+
   msg = args.m if args.m else commit_dialog.show(commit_files, repo)
   if not msg.strip():
     if partials:

setup.py

@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-VERSION = '0.8.3'
+VERSION = '0.8.4'
 
 
 # Build helper
@@ -54,9 +54,6 @@
 
 More info, downloads and documentation @ `Gitless's
 website <http://gitless.com>`__.
-
-Questions or comments about Gitless can be sent to the `Gitless users
-mailing list <https://groups.google.com/forum/#!forum/gl-users>`__.
 """
 
 setup(