Merge branch 'develop'

.travis.sh

@@ -8,3 +8,6 @@ cd libgit2/
 mkdir build && cd build
 cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DBUILD_CLAR=OFF  # don't build unit tests
 cmake --build . --target install
+ls -la ..
+
+cd ~

.travis.yml

@@ -8,16 +8,15 @@ python:
   - "3.4"
   - "pypy"
 
-before_install:
-  - sudo apt-get install cmake
-  - "./.travis.sh"
-  - git config --global user.name "travis-test"
-  - git config --global user.email "travis@test.com"
+env: LIBGIT2=~/libgit2/_install/ LD_LIBRARY_PATH=~/libgit2/_install/lib
 
-install:
-  - pip install .
+before_install: "./.travis.sh"
 
-env: LIBGIT2=~/libgit2/_install/ LD_LIBRARY_PATH=~/libgit2/_install/lib
+install: pip install .
+
+before_script:
+  - git config --global user.name "travis-test"
+  - git config --global user.email "travis@test.com"
 
 script:
   - nosetests

README.md

@@ -11,14 +11,14 @@ people complain that Git is hard to use. We think the problem lies deeper than
 the user interface, in the concepts underlying Git. Gitless is an experiment to
 see what happens if you put a simple veneer on an app that changes the
 underlying concepts. Because Gitless is implemented on top of Git (could be
-considered what Git pros call a 'porcelain' of Git), you can always fall
+considered what Git pros call a "porcelain" of Git), you can always fall
 back on Git. And of course your coworkers you share a repo with need never know
 that you're not a Git aficionado.
 
 More info, downloads and documentation @ [Gitless's website](
     http://gitless.com "Gitless's website").
 
-Questions or comments about Gitless can be sent to the [
+Questions or comments can be sent to the [
   Gitless users mailing list](
       https://groups.google.com/forum/#!forum/gl-users
       "Gitless users mailing list").
@@ -34,9 +34,9 @@ We currently require Git (1.7.12+) to be installed (but this requirement is
 going to disappear soon once we finish with our migration to pygit2).
 
 Note to Windows users: we currently have no binary release for Windows. If you
-are having trouble getting v0.7 to work in Windows (we now depend on pygit2 in
-addition to `git`), you can try v0.6.2 instead (which depends only on
-`git`) and people have managed to get it working.
+are having trouble getting the latest version to work (we now depend
+on pygit2 in addition to `git`), you can try v0.6.2 instead (which depends only
+on `git`) and people have managed to get it working.
 
 
 ### Binary releases
@@ -51,7 +51,7 @@ gl binary, so to install simply do:
     $ cp path-to-downloaded-gl-binary /usr/local/bin/gl
 
 You can put the binary in other locations as well, just be sure to update your
-PATH.
+`PATH`.
 
 If for some reason this doesn't work (maybe you are running an old version of
 your OS?), try one of the other options (installing from source code or via
@@ -91,16 +91,14 @@ Contribute
 
 There are several ways you can contribute to the project:
 
-- Design: if you have any feedback about Gitless's design we would love to
-hear from you. You can create an issue in the project with your
-feedback/questions/suggestions or shoot us an email.
 - Reporting bugs: did you find a bug? create an issue for it and we'll fix it
 ASAP.
 - Code: you can browse through the open issues and see if there's something
 there you would like to hack on. Is something missing? feel free to propose it!
+- Design: if you have any feedback about Gitless's design we would love to
+hear from you. You can create an issue in the project with your
+feedback/questions/suggestions or shoot us an email.
 
-After you've contributed you can send us a pull request adding yourself to the
-AUTHORS file if you want to.
 
 If you're planning on submitting code here are some useful things to know:
 
@@ -116,6 +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 the tests pass in python 2.6, 2.7, 3.2 and 3.3 and
-that you don't have any pylint *errors* (warnings and refactor suggestions are
-ok).
+be mad at you, check that tests pass in python 2.6, 2.7 and 3.2+.

gitless/cli/commit_dialog.py

@@ -39,26 +39,24 @@ def show(files, repo):
     cf = io.open(_commit_file(repo), mode='wb')
   else:
     cf = io.open(_commit_file(repo), mode='w', encoding=ENCODING)
-  if repo.current_branch.merge_in_progress:
+
+  curr_b = repo.current_branch
+  if curr_b.merge_in_progress or curr_b.fuse_in_progress:
     merge_msg = io.open(
         _merge_msg_file(repo), mode='r', encoding=ENCODING).read()
     cf.write(merge_msg)
-  elif repo.current_branch.rebase_in_progress:
-    pprint.msg(
-        'The commit will have the original commit message', p=cf.write)
   cf.write('\n')
-  pprint.sep(p=cf.write)
+  pprint.sep(stream=cf.write)
   pprint.msg(
-      'Please enter the commit message for your changes above. Lines starting '
-      'with', p=cf.write)
+      'Please enter the commit message for your changes above, an empty '
+      'message aborts', stream=cf.write)
+  pprint.msg('the commit.', stream=cf.write)
+  pprint.blank(stream=cf.write)
   pprint.msg(
-      '\'#\' will be ignored, and an empty message aborts the commit.',
-      p=cf.write)
-  pprint.blank(p=cf.write)
-  pprint.msg('These are the files that will be commited:', p=cf.write)
+      'These are the files whose changes will be commited:', stream=cf.write)
   for f in files:
-    pprint.item(f, p=cf.write)
-  pprint.sep(p=cf.write)
+    pprint.item(f, stream=cf.write)
+  pprint.sep(stream=cf.write)
   cf.close()
   _launch_editor(cf.name, repo)
   return _extract_msg(repo)

gitless/cli/file_cmd.py

@@ -7,20 +7,18 @@
 
 from __future__ import unicode_literals
 
-import os
-
 from . import helpers, pprint
 
 
 VOWELS = ('a', 'e', 'i', 'o', 'u')
 
 
 def parser(help_msg, subcmd):
-  def f(subparsers):
+  def f(subparsers, repo):
     p = subparsers.add_parser(subcmd, help=help_msg)
     p.add_argument(
         'files', nargs='+', help='the file(s) to {0}'.format(subcmd),
-        action=helpers.PathProcessor)
+        action=helpers.PathProcessor, repo=repo)
     p.set_defaults(func=main(subcmd))
   return f
 
@@ -30,16 +28,15 @@ def f(args, repo):
     curr_b = repo.current_branch
     success = True
 
-    root = repo.root
     for fp in args.files:
       try:
-        getattr(curr_b, subcmd + '_file')(os.path.relpath(fp, root))
-        pprint.msg(
+        getattr(curr_b, subcmd + '_file')(fp)
+        pprint.ok(
             'File {0} is now a{1} {2}{3}d file'.format(
               fp, 'n' if subcmd.startswith(VOWELS) else '', subcmd,
               '' if subcmd.endswith('e') else 'e'))
       except KeyError:
-        pprint.err('Can\'t {0} a non-existent file: {1}'.format(subcmd, fp))
+        pprint.err('Can\'t {0} non-existent file {1}'.format(subcmd, fp))
         success = False
       except ValueError as e:
         pprint.err(e)

gitless/cli/gl.py

@@ -18,7 +18,7 @@
 
 from . import (
     gl_track, gl_untrack, gl_status, gl_diff, gl_commit, gl_branch,
-    gl_checkout, gl_merge, gl_resolve, gl_rebase, gl_remote, gl_publish,
+    gl_checkout, gl_merge, gl_resolve, gl_fuse, gl_remote, gl_publish,
     gl_switch, gl_init, gl_history)
 from . import pprint
 
@@ -29,7 +29,7 @@
 INTERNAL_ERROR = 3
 NOT_IN_GL_REPO = 4
 
-VERSION = '0.7'
+VERSION = '0.8'
 URL = 'http://gitless.com'
 
 
@@ -56,10 +56,10 @@ def main():
 
   sub_cmds = [
       gl_track, gl_untrack, gl_status, gl_diff, gl_commit, gl_branch,
-      gl_checkout, gl_merge, gl_resolve, gl_rebase, gl_remote, gl_publish,
+      gl_checkout, gl_merge, gl_resolve, gl_fuse, gl_remote, gl_publish,
       gl_switch, gl_init, gl_history]
   for sub_cmd in sub_cmds:
-    sub_cmd.parser(subparsers)
+    sub_cmd.parser(subparsers, repo)
 
   args = parser.parse_args()
   try:
@@ -73,8 +73,8 @@ def main():
     return SUCCESS
   except core.NotInRepoError as e:
     pprint.err(e)
-    pprint.err_exp('do gl init to make this directory a repository')
-    pprint.err_exp('do gl init remote_repo for cloning an existing repository')
+    pprint.err_exp('do gl init to turn this directory into an empty repository')
+    pprint.err_exp('do gl init remote_repo to clone an existing repository')
     return NOT_IN_GL_REPO
   except (ValueError, pygit2.GitError, core.GlError) as e:
     pprint.err(e)
@@ -83,9 +83,9 @@ def main():
     pprint.err(e.stderr)
     return ERRORS_FOUND
   except:
-    pprint.err(
-        'Oops...something went wrong (recall that Gitless is in beta). If you '
-        'want to help, see {0} for info on how to report bugs and include the '
-        'following information:\n\n{1}\n\n{2}'.format(
+    pprint.err('Some internal error occurred')
+    pprint.err_exp(
+        'If you want to help, see {0} for info on how to report bugs and '
+        'include the following information:\n\n{1}\n\n{2}'.format(
             URL, VERSION, traceback.format_exc()))
     return INTERNAL_ERROR