Merge branch 'develop'

Release kendall.0.4.3:
  * Bug fixes

Author: spderosso

RELEASE_NOTES.md

@@ -2,6 +2,13 @@ Gitless's Release Notes
 =======================
 
 
+15th Jan 2014 - kendall.0.4.3
+-----------------------------
+
+* Fixed bug that occured when trying to commit after a conflicted rebase/merge.
+* Fixed bug that caused error msgs when a commit fails to be incorrect.
+
+
 15th Jan 2014 - kendall.0.4.2
 -----------------------------
 

gitless/cli/commit_dialog.py

@@ -61,7 +61,7 @@ def _show(files):
   pprint.sep(p=cf.write)
   cf.close()
   _launch_editor()
-  return _extract_info()
+  return _extract_info(5)
 
 
 def _show_merge(files):
@@ -79,8 +79,11 @@ def _show_merge(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 as part of the merge:',
       p=cf.write)
@@ -92,7 +95,7 @@ def _show_merge(files):
   pprint.sep(p=cf.write)
   cf.close()
   _launch_editor()
-  return _extract_info()
+  return _extract_info(5)
 
 
 def _show_rebase(files):
@@ -110,6 +113,7 @@ def _show_rebase(files):
   pprint.sep(p=cf.write)
   pprint.msg(
       'The commit will have the original commit message.', p=cf.write)
+  pprint.blank(p=cf.write)
   pprint.msg(
       'These are the files that will be commited as part of the rebase:',
       p=cf.write)
@@ -121,7 +125,7 @@ def _show_rebase(files):
   pprint.sep(p=cf.write)
   cf.close()
   _launch_editor()
-  return _extract_info()
+  return _extract_info(4)
 
 
 def _launch_editor():
@@ -130,9 +134,13 @@ def _launch_editor():
     raise Exception('Call to editor %s failed' % editor)
 
 
-def _extract_info():
+def _extract_info(exp_lines):
   """Extracts the commit msg and files to commit from the commit file.
 
+  Args:
+    exp_lines: the amount of lines between the separator and when the actual
+    file list begins.
+
   Returns:
     A tuple (msg, files) where msg is the commit msg and files are the files to
     commit provided by the user in the editor.
@@ -146,11 +154,8 @@ def _extract_info():
     l = cf.readline()
   # We reached the separator, this marks the end of the commit msg.
   # We exhaust the following lines so that we get to the file list.
-  cf.readline()
-  cf.readline()
-  cf.readline()
-  cf.readline()
-  cf.readline()
+  for i in range(0, exp_lines):
+    cf.readline()
 
   files = []
   l = cf.readline()

gitless/cli/gl_commit.py

@@ -131,8 +131,8 @@ def _valid_input(only_files, exc_files, inc_files):
 
   ret = True
   err = []
-  only_files = [file_lib.status(fp) for fp in only_files]
-  for f in only_files:
+  for fp in only_files:
+    f = file_lib.status(fp)
     if f == file_lib.FILE_NOT_FOUND:
       err.append('File %s doesn\'t exist' % fp)
       ret = False
@@ -141,8 +141,8 @@ def _valid_input(only_files, exc_files, inc_files):
           'File %s is a tracked file but has no modifications' % fp)
       ret = False
 
-  exc_files = [file_lib.status(fp) for fp in exc_files]
-  for f in exc_files:
+  for fp in exc_files:
+    f = file_lib.status(fp)
     # We check that the files to be excluded are existing tracked files.
     if f == file_lib.FILE_NOT_FOUND:
       err.append('File %s doesn\'t exist' % fp)
@@ -161,8 +161,8 @@ def _valid_input(only_files, exc_files, inc_files):
       err.append('You can\'t exclude a file that has been resolved')
       ret = False
 
-  inc_files = [file_lib.status(fp) for fp in inc_files]
-  for f in inc_files:
+  for fp in inc_files:
+    f = file_lib.status(fp)
     # We check that the files to be included are existing untracked files.
     if f == file_lib.FILE_NOT_FOUND:
       err.append('File %s doesn\'t exist' % fp)
@@ -210,7 +210,7 @@ def _compute_fs(only_files, exc_files, inc_files):
 
 def _auto_track(files):
   """Tracks those untracked files in the list."""
-  files = [file_lib.status(fp) for fp in files]
-  for f in files:
+  for fp in files:
+    f = file_lib.status(fp)
     if f.type == file_lib.UNTRACKED:
       file_lib.track(f.fp)

gitless/tests/test_e2e.py

@@ -60,6 +60,8 @@ def __read_file(self, name):
     f.close()
     return ret
 
+  # TODO(sperezde): add dialog related tests.
+
   def test_e2e(self):
     self.__success('init')
     self.__write_file('file1', 'Contents of file1')

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='gitless',
-    version='0.4.2',
+    version='0.4.3',
     description='A version control system built on top of Git',
     long_description=open('README.md').read(),
     author='Santiago Perez De Rosso',