From 625259d50c37b706091869a088e59350ed647cb6 Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Sun, 17 Feb 2019 12:01:46 +0100 Subject: [PATCH] save Merged Info --- gitLog2tikz.py | 6 ++++-- text-output.pdf | Bin 87084 -> 87084 bytes 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gitLog2tikz.py b/gitLog2tikz.py index 99051f1..bbced76 100644 --- a/gitLog2tikz.py +++ b/gitLog2tikz.py @@ -175,7 +175,7 @@ class Repo: self._children = {} self._parents = {} self._message= None - self._node_color = None + #self._node_color = None self._author = None self._date = None self._hash = Hash(hashes[0]) @@ -195,12 +195,14 @@ class Repo: elif info[0] == 'Date': tmp = ':'.join(info[1:]).strip().split(' ') self._date = tmp[2] + ' ' + tmp[1] + ' ' + tmp[4] + elif info[0] == 'Merge': + self._merge = info[1].strip().split(' ') elif line[0:4] == ' ': if(self._message): self._message = self._message + "\n" + line[4:] else: self._message = line[4:] - elif line.replace(' ','') == '' or info[0] == 'Merge': + elif line.replace(' ','') == '': NotImplemented else: raise ValueError('Unkown format: ' + line) diff --git a/text-output.pdf b/text-output.pdf index d686f0fca7ef84c8dcd69551b1dcb0df26f42ea7..b218bdd505258c9c3ba5bd52c5a8a519c35dddaf 100644 GIT binary patch delta 105 zcmZ3pf_2Rb)`l&NFa23eO%08vzx8L72eY;d1TgMpc6N5NG&6T|buqKFv@o}HcCs)u cbTx4^aW%3uH+D5Ow6IgKA*5uwKnSA@06Q8RJOBUy delta 105 zcmZ3pf_2Rb)`l&NFa23eEKJO&zx8L72eY;d1TgMpb~dwcHgGdGH!w4Ea<*`BG<9_{ cFfcTCa