Merge branch 'develop'

Release 0.3:
- General bug fixes.
- UI improvements (made some messages more clear, consistent).
- Allow the user to branch out from certain commit point.
- Improvements in gl diff: now it outputs a message if the file is ignored or
if there are no diffs to show.
- pre-commit hooks now work fine.

Author: spderosso

README.md

@@ -12,14 +12,11 @@ More info, downloads and documentation @
 About
 -----
 
-Gitless is an experimental version control system built on top of Git. We are
-exploring what conceptual integrity means with the goal of building a rigorous
-foundation for concept design. We encourage you to try out the current version
-of Gitless and send feedback. Keep in mind that Gitless might change in
-non-retrocompatible ways (so don't script around it just yet) as we seek to
-answer the fundamental question that drives this software project: if we were
-to challenge the very core concepts in version control systems, what would
-version control look like?
+Gitless is an experimental version control system built on top of Git. Keep in
+mind that Gitless might change in non-retrocompatible ways (so don't script
+around it just yet) as we seek to answer the fundamental question that drives
+this software project: if we were to challenge the very core concepts in
+version control systems, what would version control look like?
 
 In its current state, Gitless is a distributed version control system that
 supports all of the most commonly used Git features. We are missing some things
@@ -40,3 +37,32 @@ Documentation
 -------------
 
 TODO
+
+
+Installing
+----------
+
+Note that the installation **won't interfere** with your Git installation in any
+way, you can keep using Git, and switch between Git and Gitless seamleslly.
+
+You need to have Python and Git installed. If you don't, search for their
+official websites, install them and come back.
+
+The easiest way to install Gitless is using the Python Package Manager `pip`. If
+you don't have `pip`, just search the web for it, and you'll find installation
+instructions on their website. Now, once you have `pip` installed just do:
+
+    $> pip install gitless
+
+You should now be able to start executing the `gl` command.
+
+
+
+Contributing
+------------
+
+We only have two branches, `master` and `develop`. We code in `develop` and
+merge the changes onto `master` when the changes are stable and we're ready to
+cut a new release. So you'll find on `develop` the latest changes.
+
+To contribute: fork project, make changes, send pull request.

RELEASE_NOTES.md

@@ -1,6 +1,17 @@
 Gitless's Release Notes
 =======================
 
+28th Oct 2013 - kendall.0.3
+---------------------------
+
+* General bug fixes.
+* UI improvements (made some messages more clear, consistent).
+* Allow the user to branch out from certain commit point.
+* Improvements in gl diff: now it outputs a message if the file is ignored or if
+  there are no diffs to show.
+* pre-commit hooks now work fine.
+
+
 4th Sept 2013 - kendall.0.2.1
 -----------------------------
 

gitless/cli/commit_dialog.py

@@ -49,8 +49,11 @@ def _show(files):
   pprint.sep(p=cf.write)
   pprint.msg(
       'Please enter the commit message for your changes above. Lines starting '
-      'with \'#\' will be ignored, and an empty message aborts the commit.',
+      'with', p=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)
   pprint.exp('You can add/remove files to this list', p=cf.write)
   for f in files:
@@ -142,7 +145,9 @@ def _extract_info():
     msg += l
     l = cf.readline()
   # We reached the separator, this marks the end of the commit msg.
-  # We exhaust the two following lines so that we get to the file list.
+  # We exhaust the following lines so that we get to the file list.
+  cf.readline()
+  cf.readline()
   cf.readline()
   cf.readline()
   cf.readline()

gitless/cli/file_cmd.py

@@ -0,0 +1,66 @@
+# Gitless - a version control system built on top of Git.
+# Copyright (c) 2013  Santiago Perez De Rosso.
+# Licensed under GNU GPL, version 2.
+
+"""Helper module for gl_{track, untrack, resolve}."""
+
+
+import pprint
+
+from gitless.core import file as file_lib
+
+
+VOWELS = ('a', 'e', 'i', 'o', 'u')
+
+
+def parser(help_msg, subcmd):
+  def f(subparsers):
+    p = subparsers.add_parser(
+        subcmd, help=help_msg)
+    p.add_argument(
+      'files', nargs='+', help='the file(s) to {}'.format(subcmd))
+    p.set_defaults(func=main(subcmd))
+  return f
+
+
+def main(subcmd):
+  def f(args):
+    success = True
+
+    for fp in args.files:
+      ret = getattr(file_lib, subcmd)(fp)
+      if ret == file_lib.FILE_NOT_FOUND:
+        pprint.err('Can\'t {} a non-existent file: {}'.format(subcmd, fp))
+        success = False
+      elif ret is file_lib.FILE_ALREADY_UNTRACKED:
+        pprint.err('File {} is already untracked'.format(fp))
+        success = False
+      elif ret is file_lib.FILE_ALREADY_TRACKED:
+        pprint.err('File {} is already tracked'.format(fp))
+        success = False
+      elif ret is file_lib.FILE_IS_IGNORED:
+        pprint.err('File {} is ignored. Nothing to {}'.format(fp, subcmd))
+        pprint.err_exp(
+            'edit the .gitignore file to stop ignoring file {}'.format(fp))
+        success = False
+      elif ret is file_lib.FILE_IN_CONFLICT:
+        pprint.err('Can\'t {} a file in conflict'.format(subcmd))
+        success = False
+      elif ret is file_lib.FILE_NOT_IN_CONFLICT:
+        pprint.err('File {} has no conflicts'.format(fp))
+        success = False
+      elif ret is file_lib.FILE_ALREADY_RESOLVED:
+        pprint.err(
+            'Nothing to resolve. File {} was already marked as resolved'.format(
+                fp))
+        success = False
+      elif ret is file_lib.SUCCESS:
+        pprint.msg(
+            'File {} is now a{} {}{}d file'.format(
+                fp, 'n' if subcmd.startswith(VOWELS) else '', subcmd,
+                '' if subcmd.endswith('e') else 'e'))
+      else:
+        raise Exception('Unexpected return code {}'.format(ret))
+
+    return success
+  return f

gitless/cli/gl.py

@@ -38,6 +38,7 @@
 
 def main():
   parser = argparse.ArgumentParser()
+  parser.add_argument('--version', action='version', version=GL_VERSION)
   subparsers = parser.add_subparsers(dest='subcmd_name')
 
   sub_cmds = {

gitless/cli/gl_branch.py

@@ -18,6 +18,10 @@ def parser(subparsers):
   branch_parser.add_argument(
       'branch', nargs='?',
       help='switch to branch (will be created if it doesn\'t exist yet)')
+  branch_parser.add_argument(
+      'divergent_point', nargs='?',
+      help='the commit from where to \'branch out\' (only relevant if a new '
+      'branch is created; defaults to HEAD)', default='HEAD')
   branch_parser.add_argument(
       '-d', '--delete', nargs='+', help='delete branch(es)', dest='delete_b')
   branch_parser.add_argument(
@@ -28,8 +32,8 @@ def parser(subparsers):
 
 def main(args):
   if args.branch:
-    exists, is_current, unused_tracks = branch_lib.status(args.branch)
-    if exists and is_current:
+    b_st = branch_lib.status(args.branch)
+    if b_st.exists and b_st.is_current:
       pprint.err(
           'You are already in branch %s. No need to switch.' % args.branch)
       pprint.err_exp('to list existing branches do gl branch')
@@ -47,11 +51,14 @@ def main(args):
           '-- this will be implemented in the future)')
       return False
 
-    if not exists:
-      ret = branch_lib.create(args.branch)
+    if not b_st.exists:
+      ret = branch_lib.create(args.branch, dp=args.divergent_point)
       if ret is branch_lib.INVALID_NAME:
         pprint.err('Invalid branch name')
         return False
+      elif ret == branch_lib.INVALID_DP:
+        pprint.msg('Invalid divergent point {}'.format(args.divergent_point))
+        return False
       elif ret is branch_lib.SUCCESS:
         pprint.msg('Created new branch %s' % args.branch)
       else:
@@ -77,11 +84,11 @@ def _do_list():
       'use gl branch -su <upstream> to set an upstream for the current branch')
   pprint.exp('* = current branch')
   pprint.blank()
-  for name, is_current, upstream, upstream_in_remote in branch_lib.status_all():
+  for name, is_current, upstream, upstream_exists in branch_lib.status_all():
     current_str = '*' if is_current else ' '
     upstream_str = ''
     if upstream:
-      np_str = ' --not present in remote yet' if not upstream_in_remote else ''
+      np_str = ' --not present in remote yet' if not upstream_exists else ''
       upstream_str = '(upstream is %s%s)' % (upstream, np_str)
     pprint.item('%s %s %s' % (current_str, name, upstream_str))
 
@@ -90,12 +97,12 @@ def _do_delete(delete_b):
   errors_found = False
 
   for b in delete_b:
-    exists, is_current, unused_tracks = branch_lib.status(b)
-    if not exists:
+    b_st = branch_lib.status(b)
+    if not b_st.exists:
       pprint.err('Can\'t remove non-existent branch %s' % b)
       pprint.err_exp('to list existing branches do gl branch')
       errors_found = True
-    elif exists and is_current:
+    elif b_st.exists and b_st.is_current:
       pprint.err('Can\'t remove current branch %s' % b)
       pprint.err_exp(
           'use gl branch <b> to create or switch to another branch b and then '
@@ -115,11 +122,11 @@ def _do_set_upstream(upstream):
     pprint.err(
         'Invalid upstream branch. It must be in the format remote/branch')
     return True
-  upstream_remote, upstream_branch = upstream.split('/')
 
-  ret = branch_lib.set_upstream(upstream_remote, upstream_branch)
-  errors_found = False
+  ret = branch_lib.set_upstream(upstream)
 
+  errors_found = False
+  upstream_remote, upstream_branch = upstream.split('/')
   if ret is branch_lib.REMOTE_NOT_FOUND:
     pprint.err('Remote %s not found' % upstream_remote)
     pprint.err_exp('do gl remote show to list all available remotes')

gitless/cli/gl_checkout.py

@@ -5,8 +5,6 @@
 """gl checkout - Checkout committed versions of files."""
 
 
-import os
-
 from gitless.core import file as file_lib
 
 import pprint
@@ -47,7 +45,9 @@ def _checkout_file(fp, cp):
   conf_msg = (
       'You have uncomitted changes in %s that could be overwritten by the '
       'checkout' % fp)
-  if file_lib.is_tracked_modified(fp) and not pprint.conf_dialog(conf_msg):
+  f = file_lib.status(fp)
+  if f.type == file_lib.TRACKED and f.modified and not pprint.conf_dialog(
+      conf_msg):
     pprint.err('Checkout aborted')
     return False