Commits
- Commit:
0b36e980db09c545b0b35d08521d1fd6bb3f2218
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rebase' work when the to-be-rebased branch has no parent commit
found by and ok op@, who also provided the test case
- Commit:
f35e52a986659efbb797f46df9798c4ad4f36381
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show worktree UUID in backout/cherrypick -l output
When run from the repository, display the UUID to help the user know which
logmsg refs belong to which work tree. Also, use "backout" or "cherrypick"
in the log message header to distinguish output from 'got log'.
Suggested by stsp on irc.
ok stsp@
- Commit:
54fdcaee61b11a4ba039fce945d3a7e59ef477fc
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add missed option conflict check for histedit -e and -f
Reviewed as part of previous commit adding histedit -d.
ok stsp@
- Commit:
070c80a59d5048ca05990df52d7993f3015c2ee4
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: add 'got histedit -d' flag to drop all commits
Like -f, except drop all commits. Discussed with op and stsp on irc.
ok stsp@
- Commit:
6f12304beddfa5b5c90fe733397f63a3e7432d75
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: don't leave tmp "got-logmsg-*" files in the work tree
Reported by stsp on irc, and reviewed as part of the following regress
commit covering the commit aspect of logmsg refs. Delete temp merge_log
files if created during commits involving backed-out/cherrypicked changes.
ok stsp@
- Commit:
c7d9bedcc682ecd8d2276eec2a87a2fd4072388e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
abort commit with merged log messages if the log message is left unmodified
ok op@
- Commit:
beb452e226a6110ef7ace94ab1c804f8e5287e04
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
avoid creation of temporary file if no merged log messages will be used
- Commit:
8279ab8c66b2cff381b52f3b30118c624c93088f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rename a variable for clarity
- Commit:
46f87436943043a275185ab51e86b849d9f27229
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
uppercase cherrypick/backout -X progress output
ok jamsek
- Commit:
eb5dc07888e8e878e5ef3fa2cf3ee77c4e902d13
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
improve heuristics for prepopulated log messages
Small tweak to cover the case where users specify paths to be committed such
that none of the paths modified by a backout or cherrypick operation are in
the commit. In this case, the logmsg ref will remain in refs/got/worktree to
be used when the user does run a commit involving the affected paths.
ok stsp@
- Commit:
bb723b7a6cfcf6937e16863096b630f9d5b324b1
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix invalid assumption in commit_path_changed_in_worktree()
Make sure we have a parent id first to avoid dereferencing a NULL pointer
with the got_object_open_as_commit() call.
ok op@ and stsp@
- Commit:
f6cd0243250112471da1212a1549007367cc32a7
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: load editor with backout/cherrypick commit log messages
Create new logmsg references used to populate the editor with the log messages
of backed-out and cherrypicked commits when 'got commit' is run. We use
versioned path state heuristics during revert and commit commands in an effort
to ensure the editor is only populated with the log messages of backed-out
and/or cherrypicked commits involving paths with local changes that are being
committed. This is an implementation of an initial idea and algorithm designed
by stsp.
inputs, improvments and ok stsp@
- Commit:
d4becbee8b30bfddd42b47a5d8cc47e3cfbc7077
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
cmd_tag: avoid unnecessary strdup of signer_id
ok jrick
- Commit:
370cf400336871636b72a1e09da3df3d31c79b8c
- From:
- Mikhail <mp39590@gmail.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got merge: call the right usage_*() function
Diff from Mikhail, thanks!
- Commit:
70f07862e9430765dc7788416a3718ddf6e14520
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: don't leak pathlist in commit and revert commands
ok stsp@
- Commit:
be97ab03efd83aac37b83f2df2dea936213b456c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
refactor got log -d and tog diffstat to compute diff once
This eliminates the previous performance cost by making 'got log -d' and tog
diff view compute the diffstat while building the diff in a temp file like we
do with 'got diff -d'. Also, keep the current 'got log -d' UI as per stsp's
suggestion.
ok stsp@
- Commit:
5c24b9c1a40292f6b5b88d32a9945dd3440b2ed2
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
don't use plural noun after 1 in diffstat total
Use singular form when appropriate; for example, turn the top into the bottom:
1 file changed, 1 insertions(+), 1 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
ok op@
- Commit:
e643a76a2e696177d9ba6c2dcf6c13bfaa717570
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: set error on asprintf() failure
ok op@
- Commit:
c0ce8a2bcad97c245acf33698ddcc903a46fce22
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
catch a few missed got_pathlist_append() error checks
ok stsp@
- Commit:
42de9bd19210157b96f7ec4a7727af30e8d54b73
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: zap dead variable in add_branch()
ok stsp@ op@
- Commit:
21c2d8be42605670e7037d011fea06c5efd5f725
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: minor refactor of got_pathlist_free() API
Accept flag parameter to optionally specify which pointers to free. This saves
callers looping through the list to free pointers.
ok + fix stsp@
- Commit:
53d03f970a594ed205147f847c825c9b4752c3fd
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: expand diffstat -d option to 'got diff'
Like got log -d, add the switch to 'got diff' to display a diffstat of changes;
as per stsp's suggestion, we always include diff output with the diffstat.
Disabled in gotwebd (for now :) Includes tweaks from op@
ok stsp@
- Commit:
60db6857a08abeed5f82dd212d63734a5685ab94
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got rebase' not detecting an out-of-date work tree in some cases
ok jamsek, op
- Commit:
48830929110975bbf1aeab8dff472d33f50fa548
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show from: and via: headers on consecutive lines in 'got log' and 'tog log'
ok jamsek
- Commit:
f3ad4b0a2ba1fd3f0c3f54b3f506585b0570d1b1
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -d switch to log usage and sort lexicographically
patch by Josiah Frentsos