From 07f5e5e8f13dd1ca647e642c3a9e8810d6be82cb Mon Sep 17 00:00:00 2001 From: Erik Osheim Date: Tue, 27 Mar 2012 23:21:47 -0400 Subject: [PATCH] improve git-blame parsing --HG-- branch : pmacs2 --- method/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/method/git.py b/method/git.py index 95652e8..b118988 100644 --- a/method/git.py +++ b/method/git.py @@ -177,7 +177,7 @@ class GitBlame(VcBlame): # rev, user, date, [time], [timezone], [date-str], content num_fields = 3 #line_re = re.compile(r'^\^*([0-9a-f]+) \(([a-zA-Z0-9_ ]+|Not Committed Yet) +([-0-9]+) [:0-9]+ +[-\+]\d{4} +\d+\) (.*)\n$') - line_re = re.compile(r'^\^*([0-9a-f]+) .+ +\(([a-zA-Z0-9_ ]+|Not Committed Yet) +([-0-9]+) [:0-9]+ +[-\+]\d{4} +\d+\) (.*)\n$') + line_re = re.compile(r'^\^*([0-9a-f]+) +\(([a-zA-Z0-9_ ]+|Not Committed Yet) +([-0-9]+) [:0-9]+ +[-\+]\d{4} +\d+\) (.*)\n$') prefix_fmt = '[g:d:*]%*s [c:d:*]%-*s [b:d:*]%*s[d:d:*]' pretest_err_msg = 'Git is not installed' _is_method = True