Commits
- Commit:
e0380e3dfa71712eaaf9642b4d86b53e6a986653
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
special case 'got fetch -b <branch>' to only fetch <branch>
As discussed on irc, this drops the implicit remote HEAD fetch when -b is used.
got.1 has been updated to make the new fetch behaviour clear.
ok stsp@
- Commit:
83389425cc9afb887c5428f2db3299a1b049d71e
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: use timestamp and emptiness to validate log message
As suggested by naddy: consider commit log messages valid provided the temp
file time stamp has changed and the file is not empty. This heuristic
provides the desired behaviour (i.e., reusing cherrypicked/backed-out log
messages) that's currently provided but is simpler to grok.
Improved by and ok stsp@
- Commit:
75a8c854e063f97e5a2605f5256a1ce15ffb2f24
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make edits made to comments count as a log message modification
This supports use of cherrypick/backout without requiring the user
to modify the log message of the original commit.
ok jamsek, op
- Commit:
e012cf94a2ba4c30e3b5842aacd715b5f5e420f9
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got import' -I option match directory names with a trailing slash
reported by Lucas on IRC, who sent a patch which this commit was based on
ok jamsek
- Commit:
8d0dceb3d76a815a8fbae32091159f8db5672d86
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
improve 'got fetch' behaviour when work tree's branch is not on server
Only fetch the work tree's branch if the -b option is not specified.
This keeps -b functional as an override when invoked in a work tree.
Our previous changes did not consider that got.conf is also a source
of lists of branches to fetch, and that -b is supposed to work as an
override of any default behaviour. We were implicitly appending the
work tree's branch as if it was mentioned as an override on the
command line, which was wrong and based on a misunderstanding of
the intended behaviour.
Without -b on the command line we obtain a list of branches to fetch
from got.conf and use this list if it is not empty. The repository's
HEAD will be fetched only if neither the -b option, nor got.conf, nor
a work tree tell us what to fetch.
Make the man page more clear by moving the explanation of the default
behaviour into the main section of 'got fetch', leaving the -a and -b
option descriptions free of such details.
ok jamsek
- Commit:
0ac95f6598177311dd7c3f16f1da85854f0437dc
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix missed doc update of new 'got fetch' behaviour
ok stsp@
- Commit:
38c5cf99cb18843b733401b41376c563a266641f
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: make fetch default to the work tree's current branch
As per stsp's todo item, if invoked in a work tree, make 'got fetch' default
to fetching the work tree's current branch instead of the branch pointed to
by the remote repository's HEAD.
ok stsp@ and op@
- 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:
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:
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:
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:
bd15e8743449326cd8804a431fae3c2183344ea1
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sort ENVIRONMENT entries in got.1 and tog.1
ok jamsek
- 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:
7fc9410615d293f182da728eb3576f2e228cbfcb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: Add example which lists recently modified branches. I use this a lot.
- 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:
8bcebf69377a87cb57378dd59d494c7338b0d399
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
in got.1, update list of commands which refuse to run during rebase/histedit
- 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
- Commit:
772fcad51433f2ecbfaea38a78e02d07ed1eef7f
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: implement diffstat for got log and tog diff view
Add new got_diff_blob_cb() implementation to compute added/removed line metrics
for a given diff. This enables displaying a diffstat with 'got log -d'. As per
suggestion from stsp, change tog diff view to display the diffstat by default.
ok stsp@
- Commit:
85c360aaa1efe49063956a1fdfd7e46d8e5a92b3
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
farewell, gotweb. you served us well. rm gotweb, ok stsp@
- Commit:
86f8a176f07f038b900de4be6e5b8fa6b0ae6221
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add missing full-stop; patch by Josiah Frentsos
- Commit:
ef899790595636e3d4729e14971ad2843156dba9
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
provide a diff of changes in a temp file while editing a commit log message
ok landry@
- Commit:
0a58e7222f591acd7479040f317f1e0e0e9d132e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync usage with reality
The -h and -V/--version flags must be given before the command; with
those flags the command is actually optional, but don't over-complicate
the usage string with these nitpicks.
ok/improvements stsp@
- Commit:
e9424ba1b8bca2f931b594e9afef1192ad5cce27
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add gotadmin init -b <branch> to specify repo head ref
Similar to `git init -b`. Includes a change to `got import` behaviour such that
"main" is no longer hardcoded by default; instead, we import to the branch
resolved via the repository's HEAD reference unless `got import -b` is used,
and only if HEAD cannot be resolved to a branch do we fallback to "main".
includes fix plus ok from stsp@
- Commit:
8dbcf3885ae920e0fd38a455e7577824989a605f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
forbid rebase of references outside the refs/heads/ namespace
ok jrick