change delimiter. 30/137830/1
authorJunghyun Kim <jh0822.kim@samsung.com>
Mon, 10 Jul 2017 03:25:30 +0000 (12:25 +0900)
committerJunghyun Kim <jh0822.kim@samsung.com>
Mon, 10 Jul 2017 03:25:30 +0000 (12:25 +0900)
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 <jh0822.kim@samsung.com>
snapdiff/__init__.py

index 2bbf605081a641eb128a96698b87d5904d7d2587..c64cbb76db49b6d63996c488dab83f9480a678a0 100644 (file)
@@ -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],