summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-10-09Merge branch 'diff'HEADv0.2masterMalf Furious4-3/+73
2018-10-09Add -d option to status opMalf Furious1-2/+8
`systrunk status -d` will now display a shortdiff in the status output. This is off by default since worktrees for system drives probabally won't want it all the time.
2018-10-09Add diff / shortdiff opsMalf Furious3-1/+65
2017-09-13Write README filev0.1Malf Furious1-0/+62
2017-09-13Add clone opMalf Furious2-0/+26
2017-09-13Add reset opMalf Furious2-0/+66
2017-09-06Fix stdin stream for interactive mergeMalf Furious1-3/+3
Needed to rework how I was handling conflicting files w.r.t. interactive prompts. As it turns out, piping in find to the containing while loop was cutting-off standard in from getting to the interactive read prompts.
2017-09-06Fix rsync suffix bugMalf Furious1-2/+2
Files were being suffixed with extra characters.
2017-09-06Integrate merge and commit opsMalf Furious1-2/+14
Setup for prebaked commit message and merge-commit meta-data.
2017-09-06Spawn merge helper routines in a subshellMalf Furious1-2/+2
This is to prevent those functions from overwriting variables used by the merge function.
2017-09-06Export merge operations from main()Malf Furious1-0/+8
2017-09-06Move merge pointer cleanup into systr_merge_finishMalf Furious1-4/+6
This is to not break things if the user leaves interactive resolution and has to use systrunk apply-merge.
2017-09-06Update make scriptMalf Furious1-1/+1
2017-09-06Update action opsMalf Furious2-0/+2
Now clearing the MERG ptr if checking out or committing
2017-09-06Add merge opMalf Furious1-0/+178
2017-09-05Update systrunk statusMalf Furious1-6/+7
Cleaned up text output.
2017-09-05Fix control flow in main()Malf Furious1-3/+9
Enable init to be run from outside worktrees. and also fixed some error messages.
2017-09-05Update make scriptMalf Furious1-1/+2
2017-09-05Rewrite main modMalf Furious1-12/+18
Reflect recent changes in the main function
2017-09-05Setup worktree timestamp logicMalf Furious3-0/+3
Added logic to update the 'updated' timestamp whenever the worktree is checked out or committed. systrunk status now displays this timestamp.
2017-09-05Update init_wktreeMalf Furious1-0/+1
create MERG file, init'd to NULL
2017-09-05Rewrite commit op to drop remote supportMalf Furious1-23/+26
2017-09-04Move status op into repo-access modMalf Furious2-44/+45
2017-09-04Rewrite repo-mutate mod to drop remote supportMalf Furious1-58/+31
2017-09-03Rewrite checkout mod to drop remote supportMalf Furious2-59/+37
Also, refactored repo check to the repo-access mod.
2017-09-01Add functions to support the merge implementationMalf Furious1-0/+84
Including commit distance, shortlog, and merge-base locator.
2017-09-01Rewrite rsync mod to drop remote supportMalf Furious1-19/+84
Also added some helpers for the merge implementation.
2017-09-01Rewrite repo-access mod to drop remote supportMalf Furious1-43/+53
Also added init op
2017-08-30Add log opMalf Furious2-0/+38
2017-08-29Fix err message in main()Malf Furious1-1/+1
$1 goes out of scope (kind of) should use $cmd to reference the command name when displaying it in the error message.
2017-08-29Add tag opMalf Furious2-0/+19
2017-08-29Update commit formatMalf Furious1-0/+1
Added datetime metadata
2017-08-29Fix commit to new branch bugMalf Furious1-1/+2
Squeltched "X not a revision" message and now printing "Creating new branch X" instead.
2017-08-29Update commit opMalf Furious1-1/+15
Disallow commits to any reserved names except for HEAD
2017-08-29Update checkout opMalf Furious1-1/+8
Catch when trying to checkout various reserved commit names, TRAC and BASE needed special attention.
2017-08-28Fix bug in ref resolverMalf Furious1-1/+1
Pipe err message to stderr since stdout is captured from this function by the caller.
2017-08-28Fix bug in ref resolverMalf Furious1-3/+1
Fixing problem with control flow -- if one of the trivial cases at the top are hit, then there is no need to hit the repository.
2017-08-28Fix bug in commit opMalf Furious1-1/+7
If we're making the initial commit, then there isn't any --link-dest to fall back on.
2017-08-28Update rsync normalMalf Furious1-1/+1
Fixed bug with --link-dest parameter
2017-08-27Rewrite commit moduleMalf Furious2-57/+47
Updated the commit command and brought it into the make script
2017-08-27Update function systr_repo_finish_commitMalf Furious1-6/+16
Moved logic for reading author information into this function
2017-08-27Update status commandMalf Furious2-3/+3
Brought forward the status command... now using resolve_reference function instead of the old 'get_commit'. Added this file to the make script.
2017-05-01Fix bug in ref resolver functionMalf Furious1-1/+1
2017-05-01Rewrite main moduleMalf Furious2-9/+24
2017-04-30Add build filesMalf Furious2-0/+5
2017-04-30Rm old contentMalf Furious2-124/+0
2017-04-30Rewrite function systr_checkout()Malf Furious1-33/+16
2017-04-30Add functions systr_init_wktree() and systr_check_repo()Malf Furious1-0/+62
2017-04-30Add repo-access moduleMalf Furious1-0/+48
2017-04-30Add repo-mutate moduleMalf Furious1-0/+114
cgit-1.2.3-r5 | srcnode v0.4.0