From: Peter Schaefer Date: Sun, 17 Feb 2019 15:15:06 +0000 (+0100) Subject: minor fixes X-Git-Tag: v1.2~2 X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=4a177b0f5c7245fe31f0b12fff3601cfa96487cf;p=tex_tools.git minor fixes --- diff --git a/generic/git2.tex b/generic/git2.tex index 26fe976..ab5bc03 100644 --- a/generic/git2.tex +++ b/generic/git2.tex @@ -1,22 +1,15 @@ \begin{tabular}{!{\color{lightgray}\vline}c!{\color{lightgray}\vline}c!{\color{lightgray}\vline}c!{\color{lightgray}\vline}} \arrayrulecolor{lightgray}\hline Date & Changes & Author\\ -17 Feb 2019&started table output&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -17 Feb 2019&-o functioniert (traumhaft)&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ +17 Feb 2019&[doc] new generic directory&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -17 Feb 2019&-o functioniert (traumhaft)&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -17 Feb 2019&branches get loaded correctly&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ +17 Feb 2019&started table output&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -17 Feb 2019&! fix for messages&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ +17 Feb 2019&-o functioniert (traumhaft)&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline 17 Feb 2019&fixed some issues&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -3 Jan 2019&Merge branch 'develop' into feature/python2&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -3 Jan 2019&[py] better color function&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline 3 Jan 2019&[doc] lsting Hooks&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline 3 Jan 2019&[doc] Hook2 test&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ @@ -28,28 +21,10 @@ Date & Changes & Author\\ 3 Jan 2019&[doc] Features/Bugs [py] reversed changed&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -3 Jan 2019&[py] 2new git order&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -3 Jan 2019&[py] new git order&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline 3 Jan 2019&[doc] neuer Branch&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -3 Jan 2019&[doc] hooktest 2&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -3 Jan 2019&[doc] hook test&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline 2 Jan 2019&[doc] neues Hooks&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline -2 Jan 2019&[doc] test&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -2 Jan 2019&[py] fixed order&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -2 Jan 2019&[py] fixed automatic colors&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -2 Jan 2019&[py] minor fix&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline -2 Jan 2019&[py]minor bugfix&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ -\arrayrulecolor{lightgray}\hline 2 Jan 2019&[py] Export copy finished&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ \arrayrulecolor{lightgray}\hline 2 Jan 2019&[doc] kleine änderrung&\href{mailto:schaeferpm@gmail.com}{Peter Schaefer}\\ diff --git a/gitLog2tikz.py b/gitLog2tikz.py index fcdef7c..cee16e2 100644 --- a/gitLog2tikz.py +++ b/gitLog2tikz.py @@ -80,7 +80,7 @@ class Repo: def add_commitlog(self,log): for line in log.split("\n"): - if not line == "": + if not line == "" and line.strip() != "...": node_pos = -1 message_pos = -1 @@ -110,7 +110,8 @@ class Repo: def resolve_parents(self): for commit in self._commits.values(): for key_p in commit._parents.keys(): - commit.update_parent(self._commits[key_p]) + if key_p in self._commits: + commit.update_parent(self._commits[key_p]) def add_branchlog(self,log): #read all branches @@ -130,6 +131,7 @@ class Repo: out("\\begin{tabular}{!{\\color{lightgray}\\vline}c!{\\color{lightgray}\\vline}c!{\\color{lightgray}\\vline}c!{\\color{lightgray}\\vline}}") out("\\arrayrulecolor{lightgray}\\hline") out("Date & Changes & Author\\\\") + out("\\arrayrulecolor{lightgray}\\hline") for commit in self._commits.values(): commit.export_commit2table() out("\\arrayrulecolor{lightgray}\\hline") @@ -264,14 +266,14 @@ r = Repo() # extract Commits if options.path: - cmd = "git log --graph --parents -- " + options.path + cmd = "--graph --parents -- " + options.path else: - cmd = "git log --graph --parents --branches" + cmd = "--graph --parents --branches" if options.log_opts: - cmd = cmd + ' ' + options.log_opts + cmd = options.log_opts + ' ' + cmd -r.add_commitlog(check_output(cmd, shell=True, encoding='utf-8')) +r.add_commitlog(check_output('git log ' + cmd, shell=True, encoding='utf-8')) # extract Branches cmd = "git branch -va" # | cut -b 3-" diff --git a/text-output.pdf b/text-output.pdf index 699f8b6..f939bdb 100644 Binary files a/text-output.pdf and b/text-output.pdf differ diff --git a/text-output.tex b/text-output.tex index 47a272f..27f8173 100644 --- a/text-output.tex +++ b/text-output.tex @@ -38,6 +38,7 @@ \begin{itemize} \item Sonderzeichen (deutsch) : gelöst mit -o output \item Branches verdeckt + \item follow for multiple path (unlinked git history) \end{itemize} \section{python-latex}