From: DeaDDooMER Date: Sun, 16 Dec 2018 19:59:34 +0000 (+0300) Subject: Added dedicated utility - odctool X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=0ca83c247bc68e4844d5d35e356abbc5cbcd813d;p=bbdiff.git Added dedicated utility - odctool --- diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc index 507ce85..ecba41c 100644 Binary files a/Dev/Mod/Diff.odc and b/Dev/Mod/Diff.odc differ diff --git a/Odctool/Mod/Linux.odc b/Odctool/Mod/Linux.odc new file mode 100644 index 0000000..945981f Binary files /dev/null and b/Odctool/Mod/Linux.odc differ diff --git a/Odctool/Mod/Main.odc b/Odctool/Mod/Main.odc new file mode 100644 index 0000000..b23c3b8 Binary files /dev/null and b/Odctool/Mod/Main.odc differ diff --git a/Odctool/Mod/Sys.odc b/Odctool/Mod/Sys.odc new file mode 100644 index 0000000..4a9c244 Binary files /dev/null and b/Odctool/Mod/Sys.odc differ diff --git a/Odctool/Mod/Win32.odc b/Odctool/Mod/Win32.odc new file mode 100644 index 0000000..c62f898 Binary files /dev/null and b/Odctool/Mod/Win32.odc differ diff --git a/README b/README index e1a4e4f..81432a6 100644 --- a/README +++ b/README @@ -1,24 +1,67 @@ BlackBox diffutils -------------------- -Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary document format. +Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary Compound Document format. -Building + +Commands +-------------------- + +To use tools within Blackbox just compile DevDiff. + +DevDiff.Compare (guard TextCmds.FocusGuard) + + Compare texts from two windows. + Can directly replace DevSearch.Compare in Dev/Rsrc/Menus.odc. + + +^Q DevDiff.CompareThis [">" ] + + Compare two files and produce patch in unified diff format. + + +^Q DevDiff.ApplyPatch + + Read unified diff format and apply changes from it. + + +^Q DevDiff.MergeThis [">" ] + + Read three files and do three-way merge like. + + +Dedicated tool -------------------- -Just compile module DevDiff. +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. + -Usage +Integration with GIT -------------------- -See sources. Documentation not writed yet. -Coomand DevDiff.Compare compare texts from two windows (link DevSearchCompare). -Command DevDiff.CompareThis compare two files and produce patch in unified diff format. -Command DevDiff.PatchThis read patch in unified diff format and apply changes from it. -Command DevDiff.MergeThis read three files and do thee-way merge. +It is possible to integrate three-way merge with git. + +1. Open .git/config and add this lines: + + [merge "odctool"] + name = BlackBox Compound Document merge driver + driver = /full/path/to/odctool merge -P %P %A %O %B %A + +2. Open/create .git/info/attributes and add this line: + + *.odc merge=odctool + +Now when conflict occurs, it marked like diff3 directly in odc file. +Checked not only text, but also views and formatting. + Current state -------------------- -This is NOT final version of module DevDiff. It is NOT well tested, but it works. You are warned! -Todo list see at the and of sources. +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.