From 225650924d55bd158c28ffb19598a73bb9413dab Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Wed, 2 Jan 2019 23:23:56 +0100 Subject: [PATCH] [py] fixed automatic colors --- git-log-to-tikz.py | 4 ++-- git1.tex | 41 ++++++++++++++++++++++------------------- text-output.pdf | Bin 54832 -> 54975 bytes 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/git-log-to-tikz.py b/git-log-to-tikz.py index 426c0a5..d6b7ce2 100755 --- a/git-log-to-tikz.py +++ b/git-log-to-tikz.py @@ -45,7 +45,7 @@ class Commit: child._children[self._hash] = self def export_to_tikz(self, ypos): - print("\\node[commit, " + "blue" + ", fill=" + "blue" + "] (" + self._hash + ") at (" + str(.5 * self._node_pos) + "," + str(ypos) + ") {};") + print("\\node[commit, " + colors[self._node_pos] + ", fill=" + colors[self._node_pos] + "] (" + self._hash + ") at (" + str(.5 * self._node_pos) + "," + str(ypos) + ") {};") print("\\node[right,xshift=10] (label_" + self._hash + ") at (" + self._hash + ".east) {\\verb!" + self._hash + ": " + self._message + "!};") #for child in self._children.itervalues(): # print("\\path[" + "blue" +"] (" + self._hash + ") to[out=90,in=-90] (" + child._hash + ");") @@ -101,7 +101,7 @@ class Repo: for commit in self._commits.values(): for child in commit._children.values(): - print("\\path[" + "blue" +"] (" + commit._hash + ") to[out=90,in=-90] (" + child._hash + ");") + print("\\path[" + colors[commit._node_pos] +"] (" + commit._hash + ") to[out=90,in=-90] (" + child._hash + ");") for branch in self._branches: print("\\node[branch,right,xshift=10] (" + branch._name + ") at (label_" + branch._hash + ".east) {\\lstinline{" + branch._name +"}};") diff --git a/git1.tex b/git1.tex index 05533e8..d486e88 100644 --- a/git1.tex +++ b/git1.tex @@ -4,34 +4,37 @@ \tikzstyle{branch}=[draw,rectangle,rounded corners=3,fill=white,inner sep=2pt,minimum size=5pt] \node[commit, blue, fill=blue] (69be133) at (0.5,0) {}; \node[right,xshift=10] (label_69be133) at (69be133.east) {\verb!69be133: [py]minor bugfix!}; -\node[commit, blue, fill=blue] (7ac7de4) at (0.0,-0.5) {}; +\node[commit, black, fill=black] (7ac7de4) at (0.0,-0.5) {}; \node[right,xshift=10] (label_7ac7de4) at (7ac7de4.east) {\verb!7ac7de4: Merge branch 'master' into feature/python!}; -\node[commit, blue, fill=blue] (da268ea) at (0.0,-1.0) {}; +\node[commit, black, fill=black] (da268ea) at (0.0,-1.0) {}; \node[right,xshift=10] (label_da268ea) at (da268ea.east) {\verb!da268ea: [py] Export copy finished!}; -\node[commit, blue, fill=blue] (3dbbd41) at (0.0,-1.5) {}; +\node[commit, black, fill=black] (3dbbd41) at (0.0,-1.5) {}; \node[right,xshift=10] (label_3dbbd41) at (3dbbd41.east) {\verb!3dbbd41: [py] commit & branch läuft!}; -\node[commit, blue, fill=blue] (afd6f5a) at (0.0,-2.0) {}; +\node[commit, black, fill=black] (afd6f5a) at (0.0,-2.0) {}; \node[right,xshift=10] (label_afd6f5a) at (afd6f5a.east) {\verb!afd6f5a: [py] Commit funktioniert!}; -\node[commit, blue, fill=blue] (9ebee64) at (0.0,-2.5) {}; +\node[commit, black, fill=black] (9ebee64) at (0.0,-2.5) {}; \node[right,xshift=10] (label_9ebee64) at (9ebee64.east) {\verb!9ebee64: [py] init & git shell!}; -\node[commit, blue, fill=blue] (d78896f) at (0.0,-3.0) {}; +\node[commit, black, fill=black] (d78896f) at (0.0,-3.0) {}; \node[right,xshift=10] (label_d78896f) at (d78896f.east) {\verb!d78896f: [doc] kleine änderrung!}; -\node[commit, blue, fill=blue] (a6f6d74) at (0.0,-3.5) {}; +\node[commit, black, fill=black] (a6f6d74) at (0.0,-3.5) {}; \node[right,xshift=10] (label_a6f6d74) at (a6f6d74.east) {\verb!a6f6d74: Grober Latex Test!}; -\node[commit, blue, fill=blue] (e5c3cd5) at (0.0,-4.0) {}; +\node[commit, black, fill=black] (e5c3cd5) at (0.0,-4.0) {}; \node[right,xshift=10] (label_e5c3cd5) at (e5c3cd5.east) {\verb!e5c3cd5: added Ruby Skript!}; -\node[commit, blue, fill=blue] (1af283b) at (0.0,-4.5) {}; +\node[commit, black, fill=black] (8a5d531) at (0.0,-4.5) {}; +\node[right,xshift=10] (label_8a5d531) at (8a5d531.east) {\verb!8a5d531: [py] minor fix!}; +\node[commit, black, fill=black] (1af283b) at (0.0,-5.0) {}; \node[right,xshift=10] (label_1af283b) at (1af283b.east) {\verb!1af283b: [py] some comments!}; \path[blue] (69be133) to[out=90,in=-90] (7ac7de4); -\path[blue] (da268ea) to[out=90,in=-90] (69be133); -\path[blue] (da268ea) to[out=90,in=-90] (1af283b); -\path[blue] (3dbbd41) to[out=90,in=-90] (da268ea); -\path[blue] (afd6f5a) to[out=90,in=-90] (3dbbd41); -\path[blue] (9ebee64) to[out=90,in=-90] (afd6f5a); -\path[blue] (d78896f) to[out=90,in=-90] (e5c3cd5); -\path[blue] (a6f6d74) to[out=90,in=-90] (d78896f); -\path[blue] (e5c3cd5) to[out=90,in=-90] (9ebee64); -\path[blue] (1af283b) to[out=90,in=-90] (7ac7de4); -\node[branch,right,xshift=10] (feature/python) at (label_7ac7de4.east) {\lstinline{feature/python}}; +\path[black] (7ac7de4) to[out=90,in=-90] (8a5d531); +\path[black] (da268ea) to[out=90,in=-90] (69be133); +\path[black] (da268ea) to[out=90,in=-90] (1af283b); +\path[black] (3dbbd41) to[out=90,in=-90] (da268ea); +\path[black] (afd6f5a) to[out=90,in=-90] (3dbbd41); +\path[black] (9ebee64) to[out=90,in=-90] (afd6f5a); +\path[black] (d78896f) to[out=90,in=-90] (e5c3cd5); +\path[black] (a6f6d74) to[out=90,in=-90] (d78896f); +\path[black] (e5c3cd5) to[out=90,in=-90] (9ebee64); +\path[black] (1af283b) to[out=90,in=-90] (7ac7de4); +\node[branch,right,xshift=10] (feature/python) at (label_8a5d531.east) {\lstinline{feature/python}}; \node[branch,right,xshift=10] (master) at (label_69be133.east) {\lstinline{master}}; \end{tikzpicture} diff --git a/text-output.pdf b/text-output.pdf index 6c09098769bedf3fc74f6b3b515a135e3cba1366..88f8ce26e2d8129547df56b82d3cd314db73e40d 100644 GIT binary patch delta 2524 zcmV<22_yEftOLKT1F+)(12Q!-ld;bzf2EpBbK5o$fbaelJhjPz2;Pq#(@8VaX%B9E z>+~Q?l&y&#jx0};f8Pa($AY9JR-8#}V!hbK0v~||Kw3RjwEBEU!*2#ZX~il=IkB!X zoD*%TC&n3@br{i>n`|VMy%Vn+=l&6aRHQ0Ez{MOz`nk7GS@AG#}yg|8yv5r%<5EgJsg=jE>IhN!cEjCy0yQjJaB zS83Gm<0vApfs~*->REt^< ztLpD}+C4V#hhN^;imP{jzx?=Tx7i<#UGeelX}$UW{-1~6?>;@`e(KrjVoa?G0i}5E zs~mSAGrtSt!Z^}(8pRzJ25#c$*BG=^01WDZMm;c64}JNXS(@<6#xQNUf8<#ms0{6l z`g`{8IxXYT zM4khm!!fr+NNo#@xhBpqf6g<PB9f5U5pn223s}>$R zhp~V`jY{WOna?HC|ouTUJdT8dW-u5GhGlWh0& z>HEv!c

)hnF7#+s%IS`rNF}0gD~@=g>rcaJc>A_KonBF>Y2Tx2QS~aY3Mn`s1sh~AU>!G2#@2+6ge{jMjS9pdsf(T_oG93#T z)hHVp8F3Xs&9Pp>wAIqLW18zv#1vwYa&|%>0SA6HAqZM6rmlHx8Z8Hy!pdLHuTQZI z3Bh)Ime$;Y5n6MQb7-|NM@uTp+0_ca&#^M|YGI9&&V<=Dl?q;yv>qC&hYky3EyTn$ z;?=^!B3MkCe^Ut)n}mHUqrM`tIN(drwtBZSo2pMl7J|`C%|%v#SEa5Y8??F{)>!NG zIwHF|ECaJ&x6NiBc4hljb3DH7pU#4s{f>Z|Lz@GtgLi=mTY~Bg>|-oPpgP#talrzp zsZ@ZPr1j8HJ#<(e98gM>brK&OP)OXVjQMgd7Doq3e>yZZ>N4_*9+Y|!eG0ln5M6KC1a$HQY24z~VSoSN_5<3sa$J`2b`$BqVaT(i!& z7%ZsPfSclwi*eYrePAe4;x?-_+)D^|`h_QOaZHXqpl)|i+w z=VHNaf0B;a8uyw`y>Jg)Joai8XCw&7z*Kns!5uYo;iZN!Ev~^Ev|4x@wG_*h3h*vg zt7g?b{`K}44hp_}J#Jpk!<&7M!JFfn1uuuSRny+4i*XIx8AZ`_%eeCUnZ!^kmhdKV zJz}gLaa+R6Eorwy$f5v$iU}V4reeWvk`7IcfBQ`6;`lG3>lKxofo?W16>4>dyulcG0^}yx32CvBHTs9;F ze^beYumrVp$u+Pq*8Cc|L8~Q~E!NzM#{s#ohh3A;z?%K(^(?*F=@`8^u#VnuW7m@C zvQ=B>+7U`JSju55Bg5?z%#GZ7%keJCY9U%izVwGQy$Io!Oj;pZ(_SDXq_sSflllN$Wwf4f~+f;pu^7uUUAod4TCn+eTTlK4ooSw;ORC`<|6sk0?o zI3d$%HizVYf>~{$;|$GaHRM^+*kD$3Vqvw=>9|o?q4agLuq_v`%-U?$5#}t_e{sq7 zhYT*3fHi6io6xzii&9+JY}W~YZ>$5fjuEDu(rE*4gr{Qy!Z7&GaAa5eorw;EX06}9 zE0<2Pl+tdBU4Vf~$+B6PZk>rIaFQrS)2ngzg+t3y{LKL>q1!__<~J5hNZoyX0V7Y_ z>^#f2UhdmWox*Ykqst*V5nc!{f3adcnVQCOTuLtNs@299QvI3-64|08|b;>3cD+Wv2Cs8ERUgVd*To^c9yzlw2#9VAvo;V zxNhz1eFvib>AwgQpS^M8%C!N?MVCMcn>VgZ;bq9H8L6tM)hV zpcb`S0J{$=uJYEa+UG3bmGVRU66C`39kFflnWF)%VRGcq%?<<3$D zQZYD1Lqsq(F+?&(H#0;wGcYnkG%-OiGeSf)L^wG)H$EUdF*rp-L@+inL^4J!fklS(}OYk$o( mS{v?*wdHwOJDGV!@Y(PK_CO1elL*!x3N|w}3MC~)Peuy8iMsIs delta 2352 zcmV-03D5Swtpl*E1F+)(12Hi$lRwZXf3=!RZ`(K!$M5+RI&ISfS-u~8?4ny>v3uw? zx1tBfmJ_3~ojMM-{q{Q)-=+*JwF9)ZI3?%Lp?)Mslt_2ik?!La3BMHnB^~W3Vc6JC z3x>Jw=Ig8P9n|^Q4Hd5l=GMsWzs{LI5C77^KD6E41tp4@H#zKeR`U2r5-# zS8}!3+w7@~2in|2v*;^?_$=n=U7U((A>h13g_kh&DFa<83(|yC6;zK%Pv-n zwQd&OmuqEjd-#vv-y+H6^_Rz=U)QV6cIS(?&v(n!kGEfM{<`{blgH`6kB>3+CIpn? z`PAjOFG6qR0Hu4pE{%bz$ObAgOa*`hH8oJ<1hrbOWws_bv$K-LTyi8ge^pvPqk8vl zB_MUY6L?N7&Ig)w+0zN0Avj@tkXqPZ1e#hHD{!Kj#EQ{lK!<9v)&R7g&Gn)e0qB4F z-CZAG-pw}idw>0AJ$u^syEneH+U&RfYT3{B&%6HJM zxlpD8pDAoLWh|2q-852Bf9g?8rHcJzMXe*$=vDADnEs6MVjXsK-@v68jD-^YXltE} zX+`jhaHnza8(f0>>}ewR5TS*!JCl1@l7uj)xDT}k?iVwrOg}3Ya)0&V$K!Ul_t*37 zdDx+8C8p{mmyDs-M6>|?Ag;q z*da!y%(<`|jwxZMU=Oth*k{XyTFQ1k|D%9?`MmkIUu`$5es`SkEImSaj_&mc*Rba+ zUGc3fTv1W*tze(kD$TmV3!a?)GIj5I(Wu2A`@<4n-x}v6+D$H!jl!Xj!-LDF>WAYstUr5#*)*R z{-;vOcrqS(e;L(^ke2~Z!`!vt7fDvKr-_(Dh>D(_tiaX^BX$b&P|N4z+8C>r5%a}% z9ytH@(62V(nRK)0cf04!-BGx+?g-pDwAX{%!UjRPso{pC$$+hZ+rmRH<21mXN)_D6 zidsjg6|4_h2*J`=Q697qiZu~2_s_-Zs3lojSEG`VfAKQzX^amo*d-Xxo~E9)5Vvlq zb0OyzyL)j0@=(hsDQc+}IM(nq#=T%jPi8dY z42{UvxHHJ!+@oOOk%OM3oCV!ftY}Zx*44OXe}cV?eOU#fwK}tR0r9WCQ<@ zyo&Iy1*l`jd5&*hV5ac_*U!~ZkLtuDawQe4Me7KQ#8fCDidU1cS}{Vns@_)muAQOe ze}p(yk$FvBmP=Hg0!$KVUZUVOR!&%sg~PBDO5)+Xz(Psrv@bb5rC$^Rq^52hvVerV zN(&J>EewXuor`o(${-hekpMi{QLRZ9P_Uf|ZGwPe*uZpB>3oVCF4ao};AxA)DrK^O z#nhTK>2k$Os+d={lyH2 z!EDeheEUMEJc3@V7HbXg`Huijv3A(>Fq;WMq!>JH@MqJNIo{!yUnqR~h4Qywqx}}x zx{OM>V+`MIcC5$$1G%bx6SLR~cEkcPIFnG%Ap$Wtvvbc<22w*pIWj>)H8w^xHbOK) zK}JSJG%`XkFhV&tHZ?{#Fhf2dJVQb`GC@K$HbyiyLNr1_Mn*+6GD0vgLOC`zHAXlv zLq1&!FHB`_XLM*FI5{97lRwZXR~5)P6@Wk#L(yc|hkX%+2sA*C3WT6#XlT(v3Hil6 z?<4>|2Omo!sZc<)PEd -- 2.47.3