Commits
- 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:
ed611b60fe058e4f6bd245b9bc55cd450763c6ad
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
update todo list
- Commit:
1156c6910ddd7bed913285ce4e68f6930c08518a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
bump version number
- Commit:
cf5c27d11e3dd346606aa4ec316f9aef259525bb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
CHANGES for 0.83
- Commit:
3f4f8b5a3d0950ef4dbea41b036b4ad6f9cd7a45
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: commit coverage for the new logmsg ref feature
This tests we correctly:
- use multiple logmsg refs in one commit;
- use only relevant refs involving affected paths;
- use refs when some of the affected paths are reverted;
- neither use nor remove refs if all affected paths are omitted
from the commit;
- use refs when previously excluded paths are later committed.
- remove corresponding temp merged_log 'got-logmsg-*' files
hints and 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:
414c3236cf1d6213d1377c0691908380c6761bc2
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotsh.1: show how to set up anonymous public read-only repository access
- Commit:
afe4b8089ddc1958d7cac842c90a5651dbfab4b1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use VISUAL instead of EDITOR in histedit_mesg_filemode_change
VISUAL is preferred and relying on EDITOR may cause test
failures in some environments.
pointed out by op and jamsek
- Commit:
b5b4dc30da5b0d78463ce7a7488ea9b5dfc8a1be
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
simplify file content comparison in a regress test; suggested by op@
- Commit:
630fc61f66dc259068303613f6f3cfc39f1d267f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix histedit -m on a commit which only changes filemode bits
The commit was being miscategorized as a no-op change and dropped.
Now the commit is retained and its log message is updated as expected.
ok op, jamsek
- Commit:
5d0e507d72eb3e7e37b2117812bbc39c7852b22d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove TODO item regarding 'got send -d' support in gotd
- Commit:
95e6f77e2d30d9c6339f365844d53501d9f07daf
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: editing merged log messages is no longer optional, tweak related wording
- Commit:
7e710171ff462556367f78cf01da0ca2b0dca532
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos
- 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:
52d3950d946675a5906325e0b89bda875160ff4c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
clarify documentation of cherrypick/backout log message recording
ok jamsek
- 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:
a9020babcc81b07cd3b2a94d3a79b0e4af588a34
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
extend test_delete_branch
- try to delete using git
- try to delete multiple branches in one go
- verify the ref-list reported by the server before and after
the deletion
suggested / ok stsp
- Commit:
49563dfbdbb8d9325ae207c0b1400dc6939fef40
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotd: implement the delete-refs capability
Allow clients to run "got send -d" against gotd. Clients will send a
zero-id as new id for a reference and, in the special but more common
case of just deleting and not updating, no pack file will be sent.
ok and tweaks by stsp@
- Commit:
7c82d1d5588eee8ccc87b8258d5aa8d59f460a68
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress for new backout/cherrypick logmsg references
Tests only cover the -lX interface to list and delete logmsg refs created
by previous backout and cherrypick operations. Further tests are needed
for revert and commit coverage to ensure that the correct log messages of
bo/cy commits are loaded into the editor when 'got commit' is run, and that
only the refs used to populate the editor for the new commit are deleted.
Potential printf issues observed by op remain in the diff; noted here as a
reminder to do a sweep at some point in the future as there are other such
instances in cherrypick.sh and possibly elsewhere in regress.
Reviewed as part of previous commit introducing logmsg ref support for
backed-out/cherrypicked commits.
ok stsp@