[Python-apps-commits] r8501 - in packages/hg-git/trunk/debian (4 files)

[fqj1994-guest at users.alioth.debian.org]

    Date: Friday, April 20, 2012 @ 13:12:47
  Author: fqj1994-guest
Revision: 8501

hg-git - backport a patch from upstream to fix bug 636879

Added:
  packages/hg-git/trunk/debian/patches/
  packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff
  packages/hg-git/trunk/debian/patches/series
Modified:
  packages/hg-git/trunk/debian/changelog

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2012-04-20 11:59:41 UTC (rev 8500)
+++ packages/hg-git/trunk/debian/changelog	2012-04-20 13:12:47 UTC (rev 8501)
@@ -1,3 +1,9 @@
+hg-git (0.3.2-2) unstable; urgency=low
+
+  * Backport a patch from upstream to fix bug (closes: 636879).
+
+ -- Qijiang Fan <fqj1994 at gmail.com>  Fri, 20 Apr 2012 21:03:19 +0800
+
 hg-git (0.3.2-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff
===================================================================
--- packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff	2012-04-20 13:12:47 UTC (rev 8501)
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Sean Farley <sean at mcs.anl.gov>
+# Date 1333220106 18000
+# Node ID 797a3584c78f8b2c35c47d77ef37af4c0471e842
+# Parent  163ac98569d35d36cee4e5737ae6772b41f5d1d3
+git_handler: fix line.split error when bad data from a rebase is in the log
+
+diff -r 163ac98569d35d36cee4e5737ae6772b41f5d1d3 -r 797a3584c78f8b2c35c47d77ef37af4c0471e842 hggit/git_handler.py
+--- a/hggit/git_handler.py	Thu Feb 23 13:49:07 2012 -0500
++++ b/hggit/git_handler.py	Sat Mar 31 13:55:06 2012 -0500
+@@ -1065,6 +1065,8 @@
+                 if line == '':
+                     continue
+ 
++                if ' : ' in line:
++                    break
+                 command, data = line.split(" : ", 1)
+ 
+                 if command == 'rename':

Added: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/series	2012-04-20 13:12:47 UTC (rev 8501)
@@ -0,0 +1 @@
+000-fix-line-split-error-on-bad-data-from-rebase.diff