From afae55ccad86f1959709eae4b1603a0aa0562ade Mon Sep 17 00:00:00 2001 From: Junghyun Kim Date: Mon, 10 Jul 2017 12:25:30 +0900 Subject: [PATCH] change delimiter. PROBLEM: I used '|||' and '||||' as delimiters, but they are found in the commit log. SOLUTION: Use more sophisticated delimiters. Change-Id: I6139350b26bb93b35856210b032e101fd03c77fc Signed-off-by: Junghyun Kim --- snapdiff/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snapdiff/__init__.py b/snapdiff/__init__.py index 2bbf605..c64cbb7 100644 --- a/snapdiff/__init__.py +++ b/snapdiff/__init__.py @@ -94,15 +94,15 @@ def diff_to_json(old_url, new_url, **kwargs): f = io.open(log_filename, 'w', encoding='utf-8', errors='ignore') subprocess.call(['git', '--git-dir='+git_dir+'.git', 'log', revision_range, - '--pretty="format:||||%H|||%cN<%cE>|||%cD|||%s%n%b||||"'], stdout=f) + '--pretty="format:<-=^$>%H<$^=->%cN<%cE><$^=->%cD<$^=->%s%n%b<-=^$>"'], stdout=f) #'--pretty="format:||||%H|||%aN<%aE>%n%s%n%b||||"'], stdout=f) f.close() f = io.open(log_filename, 'r', encoding='utf-8', errors='ignore') contents = escape_html(f.read()) - sp = contents.split("||||") + sp = contents.split("<-=^$>") data = [] for idx in range(1, len(sp), 2): - l = sp[idx].split("|||") + l = sp[idx].split("<$^=->") data.append({"commit_id": l[0], "committer": l[1], "commit_date": l[2], -- 2.34.1