Commits
- Commit:
c2ba7aa6808a2583895c024f5c85fff03948494e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow modified files to be deleted during merges if content exists in the repo
This makes histedit folding work when a file is modified by commit A
and then deleted in commit B, with A being folded into B.
Problem reported by naddy@
- Commit:
7c67cf56d3e4bab38eebe16a51f0ffb790694738
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix occasional test failure in test_log_show_base_commit
Patch by jamsek with a request to commit. Thanks!
- Commit:
48bfa43b34c38fcf5e33c1e63dbe5dbd8c5865ce
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent ncurses signal handlers from being installed while using mock-io
Aborting tog regress with Ctrl-C would trigger a "tty" pledge violation
via the built-in ncurses handler for SIGINT, installed by newterm().
Install tog's own signal handlers earlier to fix this.
- Commit:
e07c178232d764c5a0518412c4a9348e6d24cfc1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
pass the right callback argument for check_mixed_commits
- Commit:
473418ff6b31540646354b031a2628bfc8e61f66
- From:
- Omar Polo <op@omarpolo.com>
- Date:
rename a few pop_id to pop_idx
leftover from 79c49d8454.
- Commit:
f6b8c3c2253c61e60153121cfa4da7c350787598
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix some non-idiomatic calls of the cancellation callback
This callback could return any error code. Do not mask all such
errors as cancellation.
- Commit:
cdbfe5d2325bd7ae7a197ce5e7a93fcdba9097cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add cancellation support to the mixed-commits checker in worktree.c
- Commit:
79c49d8454129776fe282b780f5836be20ea0052
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
regress: nix 'set -A' kshism from tests
As reported by naddy, this is a non-portable Korn shell construct.
Instead, use the one argument array then make faux space-delimited string
"arrays" for the other ids; they can still be indexed with pop_idx.
improved by + ok naddy@
- Commit:
99301cec42290cd26b9757c17eaaab5d70781bf1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
load tog's worktree base commit marker in the log thread for startup speed
Walking the whole file index can take some time. Avoid delaying the perceived
start-up time of tog by reading the file index in the background log thread.
Problem pointed out by op@
with fixes from + ok jamsek
- Commit:
ccdddf69864eb9ac5c10c0f5d58b68df1cf26ea1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
simplify SUBDIR+=cvg handling; ok stsp jamsek
- Commit:
9e0b562498af93589bef778858099a8a1a33e252
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: change base commit marker to the commit colour
The marker annotates the commit, so it makes more sense to visually tie it
to the log message than the author. Patch by stsp, I just removed a block.
ok stsp@
- Commit:
6ed9ffec8b7318ac6f69a138854afefc48bca2c0
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: plug leak in cmd_log() error path
ok op@
- Commit:
f47e2be5099a39b598f7b96d26b4fa08fdb62374
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
plug got_reference leak in cmd_update()
ok op@
- Commit:
863cc633e270c0edf587982ac9faccf7bb28f339
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: improve reporting accuracy in branch listing output
As suggested by stsp, show the out-of-date symbol for the work tree branch if
it is not only out of date in relation to the branch tip but also if it
contains mixed commits. Update regress and add new test to check for this case.
Also, explain the mixed commit condition of * and ~ markers denoting work
tree state in got(1) branch -l docs.
ok stsp@
- Commit:
c935fd512b9937ffefdd248a3a840d0530011a1e
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: show work tree base commit marker in log view
If tog is invoked in a work tree, prefix the base commit log message summary
line with a '*' if the work tree is up-to-date, and with a '~' if the base
commit is not up-to-date with respect to the branch tip or it contains mixed
commits. While here, plug a couple worktree leaks in cmd_ref() and cmd_tree().
ok stsp@
- Commit:
9c986b77d3f71b37ff5b5c6b4ec58b495ad8f312
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
tog regress: fix date seconds discrepancy in expected diff view
Fixes occasional test failures. Patch by jamsek
- Commit:
7ee43e4fb8c1b89b2cff391213f1a90051fac919
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
ea2cd47d415ccea6f97db959f1961ca3aa1b2f18
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.91
- Commit:
9332a003d76c710f143e8ff4b5d96f4c36dd7e43
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sync dist file list
- Commit:
0dba5d862f97a868d6190cc8071bd000351e1360
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
visit the cvg/ subdir during 'make clean' and 'make obj'
- Commit:
c4df265ebabf6993a1c217bb2bb59d5aeb3fe5e5
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: add support for commit keywords
Allow keywords as arguments to options and operands for the blame, diff, log,
and tree commands. Also, return 1 when exiting tog with error rather than 0
so regress can discern success from failure.
ok stsp@
- Commit:
df6221c7df42758252c508006201c3f66e6ae831
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a separate .cvg meta data directory for cvg(1) work trees
This prevents mixing the use of got and cvg clients in the same work tree.
Avoids confusion going forward while cvg differentiates itself further.
tog(1) and gotadmin(1) remain compatible with both work tree formats.
These tools only read work trees to locate the corresponding repository.
- Commit:
bff07ce328569d14e4638b7a32f4a92eb32ecc9e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove stray .Pp that I overlooked in my previous commit
- Commit:
fd220d9f8ebb7cb2c09804f0d8ed79dcfbe1d71a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
apply brevity tweaks for newly added keyword docs
- Commit:
4390d6c167c321d53ad289366248325c8e0bfcf5
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: enable more commands to accept commit keywords
More work adding commit keyword support to the blame, cat, ref, tag, and tree
commands. With this, all Got commands that take a <commit> option argument
or operand now support keywords. Regress flub saved by op!
fixes + ok op@