From 65ef09d8042439853e2aa295e441cf2c4f7102f4 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Sun, 10 Mar 2019 15:34:13 +0300 Subject: [PATCH] everything moved to sysbystem Diff, removed patch utility, blackbox commands and algorithms are separated, fixed linux version --- Dev/Mod/Diff.odc | Bin 34580 -> 0 bytes Diff/Mod/Base.odc | Bin 0 -> 19672 bytes Diff/Mod/Main.odc | Bin 0 -> 12272 bytes Diff/Mod/Old/Patch.odc | Bin 0 -> 10006 bytes Diff/Mod/Sys.odc | Bin 0 -> 2196 bytes Diff/Mod/SysLinux.odc | Bin 0 -> 2310 bytes Diff/Mod/SysWin32.odc | Bin 0 -> 2467 bytes Diff/Mod/Utils.odc | Bin 0 -> 8947 bytes Diff/Script/build-linux.sh | 13 +++++++++++++ Odctool/Mod/Linux.odc | Bin 2290 -> 0 bytes Odctool/Mod/Main.odc | Bin 10664 -> 0 bytes Odctool/Mod/Sys.odc | Bin 2207 -> 0 bytes Odctool/Mod/Win32.odc | Bin 2470 -> 0 bytes README | 32 ++++++++++++-------------------- 14 files changed, 25 insertions(+), 20 deletions(-) delete mode 100644 Dev/Mod/Diff.odc create mode 100644 Diff/Mod/Base.odc create mode 100644 Diff/Mod/Main.odc create mode 100644 Diff/Mod/Old/Patch.odc create mode 100644 Diff/Mod/Sys.odc create mode 100644 Diff/Mod/SysLinux.odc create mode 100644 Diff/Mod/SysWin32.odc create mode 100644 Diff/Mod/Utils.odc create mode 100755 Diff/Script/build-linux.sh delete mode 100644 Odctool/Mod/Linux.odc delete mode 100644 Odctool/Mod/Main.odc delete mode 100644 Odctool/Mod/Sys.odc delete mode 100644 Odctool/Mod/Win32.odc diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc deleted file mode 100644 index ecba41ca8079e6d0796619842710b8c599a5e10a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34580 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 IMy>XL0qA;ya{vGU diff --git a/Diff/Mod/Base.odc b/Diff/Mod/Base.odc new file mode 100644 index 0000000000000000000000000000000000000000..4d455076ba2dcf5cf3e94203c5ac0432156b7172 GIT binary patch literal 19672 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 RSLE*-2mR9D-uPar^nZoO*x~>H literal 0 HcmV?d00001 diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc new file mode 100644 index 0000000000000000000000000000000000000000..04c0728fae0af4790bc12c133cda0074ea5d28d3 GIT binary patch literal 12272 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 literal 0 HcmV?d00001 diff --git a/Diff/Mod/Old/Patch.odc b/Diff/Mod/Old/Patch.odc new file mode 100644 index 0000000000000000000000000000000000000000..d8440f5a5b6da23b17f29334e7fde641b7690511 GIT binary patch literal 10006 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 Z#g2OVedj0tdW^r{>mEA4TY1lM{sZS=Kgs|A literal 0 HcmV?d00001 diff --git a/Diff/Mod/Sys.odc b/Diff/Mod/Sys.odc new file mode 100644 index 0000000000000000000000000000000000000000..13f03ec4c15022cbafe0a73ddb92e070459d33a3 GIT binary patch literal 2196 zcmbVOOHUI~6ut#tBTjrKzBborLR)KtumedfGXpk22d7gA5@WC(u(5QKnOlLKfvpRd zY>XzXj4Sv47=MCv#ll3-x#!M|tHZM6&X_?#8+;~!QCP2?@23{TB(CuEu zsjBOg43|5WVLK+bDkiGy+G5Fpz0nNDAq-_pl5C!DbV9*5{oplU4f$%YUg!Cot}QsW zVVO0@;@L*ZD#sy6!|$}k1D?%|a}09Eatgd+Efsi41pwH()(85{%JV;i&v*jx0lFPS zgOjK({k)tQCqNmUAb=hbr%WNAh?Y*e>Y-V_Cwa(g%9<%x@UE&=%W<;}ewSCua|J#+ zlEaEZjrsT_Z|E8npA(9#MiOUKKmbn)*asPq6!yar0(UI8=2STNC`KSzxGMA%oqK#y zJ;77odj6|ZLd&+5PdXm=*jsi=G%EXlIPC?DlJ0ZGJ<(WOO#$xf(4~_XDir~Jg2ktu zrjSZ1Gc<$m5(}$7+amQn?D2u$YT*!pW@?B)HGk}-X<JAd zkXjjv%IQP_Ns2sTL`slwyMxO53+y-`_UTMhBEhMO?H0{HIX+@R#O=~>A!BTl&xlmx zLFu0~9+WP-hXhRoAV$6t$Q6-cA7RX+AQJw4ucs-2z_>0P((~x^3L83PkJEn~dTV`& gOyXY}_HdL%-%ryh{ty_vByo9+UZl6ig~zxSIrAJ3j2P8mLD zFZ}6fcAVzCbYecPUi`EiG0k*Q?@e>QpXF&$Iy+hVL^_kCz5f~WX^|2r4#I=d(eoDm z&fgZ|xt3yUI!-4NO2gN*LM$Ckqf!Ku^jHKgUKgm0{f;>dlz*dK^qjp&(m9tDahglk zOLeVVye4DBKLL~yGW76_sdA(U6>E#6c(U%$cF`zX(Fl+QC7BqtT-a$aN)XFM%0 z&g7==kFE_N-9scPeTBNew?cor z7l5A~9K@$(FUx21j%ga*tw9(i5bwrGuw}#jw8+zm4QTIW4@WkjFSOUIu#Rb%h8OnZ z#59cK{rO;@KZ13*-MaIsFeST#04;u2q$AuXr)V35-F^~8kc1EgUKsgcA*NHiG|}JK zFAhg-Ajgd$LL{L%Y3spm6uG+)-XlhiTO5i#j-El^rvTH~aU&eZSb5-TqpBIu+iNq}rJ z#SyHn(;O7GAvq6eZhIH`AuK5cuF>s#){$5ZRZ^kJNP`NK{zSpZ+cd7MDK3pSo#h;? z=4C~Uf@C}Dt7=KmDguH31$QIm=m^$wX%JuE3m9IllpDuElvp`@j1a zXu*}k>FA_RhWVc4B{TjfD{od5c-_`}PE34-nAlv8@vy8=hIzX>YR-TcaT0Z)Y=hkE z)%l`5zln#`+jP;4ckpF(rOinRY*1lhVso*TGzf+Z(8aq#dI>EwuRTX#|zbN==Ro)OZk;{beXBbT(Q;7=p%I- zQ$y08hGZ4ZDnde%8HtfHEVYYkD*9&}sUMc=<$qN}Qoig439<*F(E3G!e8?N@8Gcxhp)&sez9gF&0n_u|OZi*-X~^Dv$?oc( oDyy~rK!()+^78^;MbV$$FB#l?&c6BU9r61(e8hgd^^~!H0DUTHH2?qr literal 0 HcmV?d00001 diff --git a/Diff/Mod/SysWin32.odc b/Diff/Mod/SysWin32.odc new file mode 100644 index 0000000000000000000000000000000000000000..8a632fecf0ed7e4d9c6f89b9f9adccd340228487 GIT binary patch literal 2467 zcma)8&yU+g6rKeH7_g{T98gbls8qWIE4y$?c2Qm1-A2vEk?q~EM2nOr-mO=OT{%wJ zy;a+5B{=p5Qco2p?))(vIntbZK!W$)jGalA1uP{q^L~8qn>Ww%?6`i$;JJM5X2aPe zPK&7(7Nc_E#?v8FRI73)ON&90#`)AbOyci^G0v3rA7PQ@F@nNC78nkn_u$7hnm$uP z>}R8RET9y8MM~4DrATB5ZyZm^aq$kJGM2v27)CgOk)F%fQG8wqim=Tk>!rAoE#8t& zI3U>@0_7QDNEQI15J8kH^cL?*oSQKD80MR$fW1PE;3VDbqR5j+vm&0Z?&NlfAxE}> zlRNCU=QLqI(C|C_Z(J_)(nyXs%k`Smue3u-)+6*JUf+YUm~B?FZ$b9gzV9BiJ?T;rg(pCmO7ro6FRdNp-T*BrkSM!Kd= z2It*D@tE)Ot@`$tq>7HZ9%$SokB3k&7oh9Y|85ZFiDzmJS8J3pmj2TQNxqJyp-+5wECByRv)8DD6+f$w4Pozjd#w&c2N%qglu4uXzMrT{HH z0Qg^U;b_5-8)=0K_-ajqdl|$ILobMolz#;$RO8!qN_QpQk>NoD2MgO#NzMD|vEU^l z{wFJEmgmqvs&|JrzD5jR5}s7doBRn}0N2vTvOt3xmsbUmqa(yt$zCPl!QP>58xUn_Y*d6km&?P7jp-l?3E9N(2BxA2l^(g}qz zX2$@bsbdwXSE(i10Jgk58;`N4LT_=3T=qh2Evj-kztSuJNmXL5>8eioiEI&~AD8_C znh7<#U{(^MnTUvtq+%&uye)lyh7p_QOR*MBbBPlc7h~}`uo|G0F3`7puz1YCEu2u(!%6)Y0kTfkKTyi&Z|EA@D01Gen+k6`i5|+ g{>zUN`b1$b9!?p*{gOTX^8@;Q>OW>b-Fd;--%J*e!~g&Q literal 0 HcmV?d00001 diff --git a/Diff/Mod/Utils.odc b/Diff/Mod/Utils.odc new file mode 100644 index 0000000000000000000000000000000000000000..53777a73f525f3c5650f89fc2690f6e92917dac4 GIT binary patch literal 8947 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 RpU?33)%L0J?#erc@js9eSIPhY literal 0 HcmV?d00001 diff --git a/Diff/Script/build-linux.sh b/Diff/Script/build-linux.sh new file mode 100755 index 0000000..270ca31 --- /dev/null +++ b/Diff/Script/build-linux.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +set -e +DIR="$(dirname $0)" +cd "$DIR/../.." + +./blackbox <Izycu-h|@b%s#7d0t&l*;F2dMmH)=MHZ0}Y}w4gLGTd%SdX-@N&F_WZD5_*^{ki|OJt z&3Wa-d{%e-w3;%_bXo5eIiF;CT2{_Mmfn}nBx(IWV_uXgfnp;(XgGRa#kY7(h!3EPJMD^!G+#l)&w@%+t9Is2^l^r#8gr6?C_2ckJ~{!!*2b7$>G-oKBXb3BL#1 zaIk}nz0T2JmWSD zgFEDh@sQbYV#7Smbuym?JN+R#pr18!km{MOQbnC9d;mAwJrI^DrAww!*m{tWrbGC5 zcKew647PL!@Iy2iCykeZgHvY^46QZL**H78)+Q8<1?mJ>Nq}r}h!fb_ra35VLvkL| z+>S2uLs(J@T%$kqtP`;sDy2e`kp>keeMG{@+cd7sDK3pyEOHK3`*}%>f@D7$s%%Nn zIs$?J1$QUq=m^$&X%JuE3m9InlpDuElvp`@g1NWhR!5|+(Qc{X(Sj?7)6q$tjq@YP zOOE)Tth_~8;!WG^IWh4KVq$ZBgNJ2&%rjFYGbRTt!5ug@3l`CUAp-mXh$ zqn;#fM}o9LIf|()#paO**f~!5^#06>591`*a}L~rrH-~53{SW;xqf6-k*dktW=<%HinlmLSxF}*D;+w4J+X{&N-4BZ**0mb z>35VPZ&j)wWig*qiNdSeyBm9XVLv8&3HAogN0;cE9r}EwUY0Tbu%0AV9OEz=;whU>$@>c@8 bBIyrrR}8K{X5aqxx_I9U@39|mJY?)2fHY%F diff --git a/Odctool/Mod/Main.odc b/Odctool/Mod/Main.odc deleted file mode 100644 index b23c3b8f470f72c5acdc3a5aa21657f50cb4c7c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10664 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 diff --git a/Odctool/Mod/Sys.odc b/Odctool/Mod/Sys.odc deleted file mode 100644 index 4a9c244bb031a18f57417e8a7fa991b32fa8d793..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2207 zcmbVO%}*0S6rbW}m8wzWcj6dKXe%~|7Xy-5wktM3x6W=cNIXEh!D{IyyHkOifvX3P z+$7;-JbCwz@lTMRIGE^r^Y)8nG3q4SdGkJg?_+k~t5z`_25WP#;xv1!c2{~OQ?`Ob z#rB#kCOXL1oUUAIcWu`z&A06}QbsCv{$WbTwGk9HrGf5nor34qX+>_uT+BHwyF*Yh z{1{h}UMa@$UFaQqRT=h=D^$kbfR8ND%jgT&=ALD*O9~OvjG~U%A+J9`HtH7v1_@ppu1Y_rcJ_kFkM;X{DCf}?qrQ2TaN!vS^$*^y6!`~TNvLgHb zK@seu+IE1K+3e>~25W>imS%+dWONm^Zo)GVSt1KpnkDkTsoJQ^y939}bz~|Gm8=e@ zflJ7{hm_(qkWv<7ArAv2>10S1kW#h}L*8wm*bpAo%~pZ>HD^>BvpP3gP3brtbHkg+ z<+9bex*;q+W4m3ugA8k-uIIAZvb&;Q?joP$b)#CdbiplymxU-VaN{Z0o|VM}=vCUT z4S4QGQgO<(L|L=A&^1F;xL&KEdM-O(7O=P4?l=!^Ns=$})t)E$n&ZCZOCDcxSDL(7 z$Ytxo(DX_}=se$wSrs@0sX4u_ywCH6agISw>tcl0^cN$%><0kYxoisbyTw<32A{Si z-~)6wga#);UDCW987Dw#J=cX^5vEKbABh%E+O*NEm`EP-n$oAMHM}d+)PEJwpzN$&rp99!dA zFNyRgg|C0qr0{jwT_k8Y05STNKrYG*`vemo1%dGI+dd5p1jaSEPtW7ei|p(^dlLT- kk*xIvG6{ca?!!?PeS5}Ze0Z0=|9M6|*NoR}r?}17ZzQB6mjD0& diff --git a/Odctool/Mod/Win32.odc b/Odctool/Mod/Win32.odc deleted file mode 100644 index c62f898472afb8f814f4d0ebeb7203b1d05897ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2470 zcma)8&yU+g6rKeH7_dMEB!q-C5|wI~U}YCh$u7d!?lx*Rj%@FSZM2or#M*k5*k$5` z-5c6ok>J=HNIg}Yxbw$w=R$Mp0SVrFGj^P816WFC=Kc8IH*cQj*>U}h!E^b{&4#l{ zoaR$2%tyt-ji*CaQLW0IEX@Z=8jGoQl*HdkW1Lmie};J`Vg!YOEHE5CufgwQji!$( zAr7)pJeE)u{EC#OQ>!9TA-r)sA;-llgv!`AuQP@b5*X>Zd=|y$xugi&T(Vw@OWEQj z<%9#0eOID9A`Ha>Kq^EK>kMeKJeYcw#WU^ zFwe4aFG)Y!Y3jPxI_UaA#KYq-@(ybJPAt-RT;rg(A0{;(UQBsoukeCZQ`dCO@jGFp zYuaRR-W}u*_#WS`?|e?G=(y{F#!W;Ffy4#qx_+w@c>#}n9(ax)xZD6Bt28meUK@zh zVS}ULz83%zN#>2JvmFHXG52pFDa#h8RPSKvbzF4NwIe%#ag>M#FTtgz8~Bdr9tIva zMir&WTWONlc*pCZo%GjW+h;XCj?)_7#7d^e3gXIBK`@zDY_7&Oz(TSnd)SvTvd~Kk z`6qnaY;qC}5eQVnCQoo$#{j+CEvS)%?~;bQKFGAQQmsK!aMAWU7-`;5POeiRZ5at< zlsp*={Uzub-`&HcDo{=G>SMA`6cxb36%x_3R>v{Us5I31k|aTi5}c!(N>@7@4#u}c z92>Hdts}c_C>`YgC`(3^g1HF*;7 zm>mOzrjAuqy-h9I39##lY&^!c3hl+og=&Y`U8>6E{7Sogk*dI4)0NHgJ=HB_OI8c) zC)DqPSwVYJftzK;PoQ)_YeiRtRls zn1$nYoKSPbN&Qy|axLFtKf#9&DhlQQ@0+sOA|5_(J(s`Tr+xP3bM|HRQ))fe??{*O gzxXbpuN3z9&Xn;RPuO>Vy+OYZ{0Hpkn~xd$2d^HIYybcN diff --git a/README b/README index 81432a6..5c03ad5 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ BlackBox diffutils -------------------- -Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary Compound Document format. +Clone of diff and diff3 utilites from *nix for BlackBox and its binary Compound Document format. Commands @@ -9,38 +9,31 @@ Commands To use tools within Blackbox just compile DevDiff. -DevDiff.Compare (guard TextCmds.FocusGuard) +DiffUtils.Compare (guard TextCmds.FocusGuard) Compare texts from two windows. - Can directly replace DevSearch.Compare in Dev/Rsrc/Menus.odc. + You can directly replace DevSearch.Compare with it in Dev/Rsrc/Menus.odc. -^Q DevDiff.CompareThis [">" ] +^Q DiffUtils.CompareThis [">" ] Compare two files and produce patch in unified diff format. -^Q DevDiff.ApplyPatch +^Q DiffUtils.MergeThis [">" ] - Read unified diff format and apply changes from it. - - -^Q DevDiff.MergeThis [">" ] - - Read three files and do three-way merge like. + Read three files and do three-way merge like diff3. Dedicated tool -------------------- You can read, create diffs and merge documents from command line using odctool. -To build open OdctoolMain and execute commanders at the end of document. -Call `odctoll.exe help` to learn how to use it. - -Warning: It tested only with wine and NOT tested on windows or native linux. +To build it, open DiffMain and execute commanders at the end of document. +Call `odctool help` to learn how to use it. -Integration with GIT +Integration with Git -------------------- It is possible to integrate three-way merge with git. @@ -49,7 +42,7 @@ It is possible to integrate three-way merge with git. [merge "odctool"] name = BlackBox Compound Document merge driver - driver = /full/path/to/odctool merge -P %P %A %O %B %A + driver = /full/path/to/odctool merge -p %P -o %A %A %O %B 2. Open/create .git/info/attributes and add this line: @@ -62,6 +55,5 @@ Checked not only text, but also views and formatting. Current state -------------------- -This is NOT final version of module DevDiff and Odctool. It is NOT well tested, you are warned! -Also, program and user interfaces can be changed later. -Todo list see at the and of sources and build tools. +This is NOT final version of subsustem Diff and odctool. It is NOT well tested, you are warned! +Also, program and user interface are not stable yet, so it can be changed in future. -- 2.29.2