jazzdotdev / gut Goto Github PK

https://www.reddit.com/r/lua/comments/qwf28k/whats_the_difference_between_colon_and_period_in/

Ignore patterns are applied to file basename and there is no way to match full path.
For example, current .gut ignore ^\.gut$ will match any .gut file in repository root and its subfolders.

https://en.wikipedia.org/wiki/Patch_(computing)
https://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/
https://wiki.winehq.org/Submitting_Patches
https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/content/docs/ddCVS_cvsglossary.html.ko

http://wiki.c2.com/?PatchesWelcome
"prs welcome" 33,800 results
"pull requests welcome" 28,600 results
"patches welcome" 46,800 results

https://github.com/foundpatterns/gut/blob/e4c77d2a7d7502a30ddb681217f0a4c62cdf2213/gut.lua#L164-L167

https://github.com/foundpatterns/torchbear/blob/master/src/bindings/text/patch.rs

revert?
https://github.com/foundpatterns/gut/blob/e4c77d2a7d7502a30ddb681217f0a4c62cdf2213/gut.lua#L273-L276

https://github.com/foundpatterns/gut/blob/e4c77d2a7d7502a30ddb681217f0a4c62cdf2213/gut.lua#L66-L111

https://github.com/foundpatterns/torchbear/blob/b97e699b4895a0626857317408b0c1ab42a08d1e/src/bindings/system/fs.rs#L198-L206

using https://github.com/foundpatterns/torchbear/blob/master/src/bindings/crypto/checksumdir.rs

Gut makes it easy to create and manage patches. This makes it easy to keep track of any changes you're working on and to integrate them across many development paths. It does this by saving your project files and allowing you to freely edit them while being sure that you can jump back to your last saved version or add your new changes on top of it to take its place as the latest revision.

When you want to start working on a new change, you can see how it fits into your plans while working on new patches for it, and editing the change's notes along the way. Once you have a group of changes and their patches, you can send those files to another Gut user, to easily drop them into their .gut/ directory and work with these collaborators.

When you want to make multiple lines of development with several changes in them, just add a new line while you have that current version. From there, you can see what other changes have already been started, and use them, or you can start making your own change with new patches.

Terms

• patch: lines added and removed to one file or a group of files in a project
• change: work done/todo, reference to an ordered list of patches, see change management about workflow
• line: a way to have multiple histories simultaneously which can themselves also go in other directions before merging back to prime or becoming a new prime line
• prime: a kind of line with the set of changes that takes an intial copy up to the current version - and likewise back to the original
• associate: a kind of line that start from any part of the prime line
• hash: blake2 of a file or dir
• .gutomit: leave out files or directories from your project (ignore/exclude)
• .gut/: directory that gut uses to run

How Gut Works

• gut start copies your current working directory to .gut/current/
• // edit your files //
• gut check: show what's changed compared to "last prime" patch or other picked line -- uses hashes, checks sanity before running
• gut diff: show differences
• gut patch: creates the patch and add it to current change
• gut change: a) show current change name and body (b) edit its name and body (c) show current patches (d) show which lines its on
• gut line: (a) show current (b) list available (c) graph where they come from and others associated (d) switch lines

• jazzdotdev/jazz#174 + further upstream: patchutils rust port
• jazzdotdev/jazz-libs#1 to replace one-off implementation

• Creating an interdiff | Drupal.org
• Creating an interdiff should be in Drupal.org Git tutorials [#2380231] | Drupal.org
• create interdiffs of patches automatically [#2454267] | Drupal.org
• Auto-generate interdiffs [#2233521] | Drupal.org
• Do something with interdiff.txt [#1939406] | Drupal.org
• Encourage multi-part interdiffs [#2317583] | Drupal.org
• git - Does increasing the number of unified diff context lines have any downsides? - Stack Overflow
• linux - Understanding of diff output - Unix & Linux Stack Exchange
• interdiff - show differences between two diff files - Linux Man Pages (1)

Lua Patterns is a powerfull and flexible regular strings language, but humankind deserves something a bit more readable.

convert git commits to diffs and branches to lines

trash = windows recycle bin
undo = go straight back to last patch, do not pass go

https://versionsapp.com/

https://kaleidoscope.app/

Meld

Gentoo portage ncurses 3 way merge

https://css-tricks.com/merge-conflicts-what-they-are-and-how-to-deal-with-them/

trust your gut
pick wisely
eat

https://github.com/foundpatterns/torchbear/blob/867088ce92451981c4bda167f72fbe84497c5038/src/bindings/text/splitdiff.rs

changes have patches and reference other changes that came before them when they build on them
they have a message that explains the work they do

https://github.com/foundpatterns/torchbear-libs

https://github.com/foundpatterns/gut/blob/e4c77d2a7d7502a30ddb681217f0a4c62cdf2213/gut.lua#L150-L156

https://github.com/foundpatterns/torchbear/blob/master/src/bindings/text/diff.rs

when it's ready

https://github.com/jazzdotdev/gut/search?q=snapshot

https://arialdomartini.wordpress.com/2011/10/10/event-sourcing-and-git/#comment-855

materialized views, so to speak

"all Databases have a file layout but in memory it can be whatever you want. and then its cachining and CQRS essentially" -Gerard

Currently repo:save properly ignores only top level entries. Files in subfolders are not properly handled.

might take a week or so