Commits
- Commit:
4bff57b4b66990d6829cb83645d1f1d478ae0cea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
backout got: always fetch remote HEAD except when -b is used
As pointed out by naddy, this behaviour is not ideal when users
want to limit their repository to a particular branch which will
diverge from HEAD over time, such as -stable branches.
See https://marc.gameoftrees.org/mail/1676388048.8632_0.html
- Commit:
2a19e2e21a876bbc4ae1999ca08ce4c8f2002158
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: always fetch remote HEAD except when -b is used
Rather than only fetch HEAD when there are no branches set in got.conf and
there is no branch to be inferred from a work tree, or said branches don't
exist on the server, always fetch HEAD unless 'got fetch -b branch' is used.
ok stsp@
- Commit:
e8049a88bfce89f411671eb3be9a949001534496
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got.1: tweak commit -A description. ok jamsek
- Commit:
0dd7613ce65424868ec86f0623e38eb70d9a9321
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
93436ccdaf0945f5fdb4b5cd2b90c9ac0bb14c83
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
91a3781a11d1b2c483221d9dca87d72aea17637b
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
49351f3bf4ab5a99f1b0653e176e01ab5988acde
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
ccbbf026bf5917a8d66564fcce9184b29412432b
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
66d2f9c8151ab2386b1b9369c63d9bbc500243b1
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
fix missed doc update of new 'got fetch' behaviour
ok stsp@
- Commit:
ddb2df58a374b7058f0d3044c25b821680bd3345
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
f1c9fe20d35f9b64cee89491805039b13c91c8de
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
8bf76af3f358c0ad73a45348c76647955efc78e8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: editing merged log messages is no longer optional, tweak related wording
- Commit:
555f1fe02608935b41d521bc76d298526e916229
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos
- Commit:
4c16511c12ddf2bf3af298a4b6cd295ff1ba1bd1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
clarify documentation of cherrypick/backout log message recording
ok jamsek
- Commit:
9587e6cc5169e6d39431fd1066097fd3f04e5d51
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
7713cc5e4f5544e81909670d592e89526ed86c9b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
sort ENVIRONMENT entries in got.1 and tog.1
ok jamsek
- Commit:
1f3405c91dec0b4eb48df5156751b5ef6add3f37
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
bfed0e200a721018cbc04abab4d86e4e700ad741
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: Add example which lists recently modified branches. I use this a lot.
- Commit:
a76e88e58fb716d5dded83442b153b60687283cb
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
dae92a245f6e4d18c4c75048d6ca667d78083cc4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in got.1, update list of commands which refuse to run during rebase/histedit
- Commit:
d651dcfa6fe871c93d967b1b741d2ad4bbb9e2c2
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add -d switch to log usage and sort lexicographically
patch by Josiah Frentsos
- Commit:
5191b70b5b2e123aadd88aeafe2e2cfc0958c327
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
0699137833e7cb9e377669787add963cafb545bc
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
farewell, gotweb. you served us well. rm gotweb, ok stsp@
- Commit:
9430e858d160f9d3dbd02b218b5c0a95e266a199
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add missing full-stop; patch by Josiah Frentsos
- Commit:
2a47b1e5852390eadc730c1dd2dd7caae011adfa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
provide a diff of changes in a temp file while editing a commit log message
ok landry@