Merge branch 'develop'

Release 0.4.1:

- Bug fixes (in diff and PyPI setup).

MANIFEST.in

@@ -0,0 +1 @@
+include README.md LICENSE.md

RELEASE_NOTES.md

@@ -1,10 +1,17 @@
 Gitpylib's Release Notes
 ========================
 
+
+6th Dec 2013 - 0.4.1
+--------------------
+
+* Bug fixes (in diff and PyPI setup).
+
+
 23rd Nov 2013 - 0.4
 -------------------
 
-* machine-friendly output of diff command.
+* Machine-friendly output of diff command.
 
 
 (No notes for previous releases)

gitpylib/file.py

@@ -186,13 +186,14 @@ def _process_diff_output(diff_out):
 
   for line in diff_out:
     # @@ -(start of old),(length of old) +(start of new),(length of new) @@
-    new_hunk_regex = "^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@"
+    new_hunk_regex = "^@@ -([0-9]+)[,]?([0-9]*) \+([0-9]+)[,]?([0-9]*) @@"
     new_hunk_info = re.search(new_hunk_regex, line)
     if new_hunk_info:
-      old_line_number = int(new_hunk_info.group(1))
-      old_diff_length = int(new_hunk_info.group(2))
-      new_line_number = int(new_hunk_info.group(3))
-      new_diff_length = int(new_hunk_info.group(4))
+      get_info_or_zero = lambda g: 0 if g == '' else int(g)
+      old_line_number = get_info_or_zero(new_hunk_info.group(1))
+      old_diff_length = get_info_or_zero(new_hunk_info.group(2))
+      new_line_number = get_info_or_zero(new_hunk_info.group(3))
+      new_diff_length = get_info_or_zero(new_hunk_info.group(4))
       resulting.append(
           LineData(line, DIFF_INFO, old_line_number, new_line_number))
       max_line_digits = max([old_line_number + old_diff_length,

setup.py

@@ -5,20 +5,19 @@
 
 setup(
     name='gitpylib',
-    version='0.4',
+    version='0.4.1',
     description='A Python library for Git',
     long_description=open('README.md').read(),
     author='Santiago Perez De Rosso',
     author_email='[email protected]',
-    url='http://github.com/spderosso/gitpylib',
+    url='http://github.com/sdg-mit/gitpylib',
     packages=['gitpylib'],
     license='GPLv2',
     classifiers=(
-      'Development Status :: 2 - Pre-Alpha',
-      'Intended Audience :: Developers',
-      'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
-      'Natural Language :: English',
-      'Programming Language :: Python',
-      'Topic :: Software Development :: Libraries',
-      'Topic :: Software Development :: Version Control',
-      ))
+        'Development Status :: 2 - Pre-Alpha',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
+        'Natural Language :: English',
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: Software Development :: Version Control'))