Commits
- Commit:
37e7d69e10aa17ac243e96c3205d766f02cf58a0
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
Add initial read-only http fetch support using a got-http helper.
Currently we only support the smart protocol with a limited feature set.
ok stsp@ tobhe@
- Commit:
a6955b87407110ed6d51627190bbb4a514e885d1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
get rid of unnecessary "dns inet" pledge promises while fetching via git://
- Commit:
cd634f2d6d87577ed25d69f9b9a9d07c990a4223
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got status' display interrupted rebase, histedit, and merge operations
When an operation is interrupted add a trailing message to status output
which displays the operation and branches involved.
This information will be useful when diagnosing problem reports and it
helps new users with contextualizing multi-operation work tree state.
ok op@
- Commit:
fb077d79464b5f22bd16cb8b0ce4069c749115dd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
forgot to unveil the log message file passed to got commit -F
found by op's regress builder
- Commit:
dada399a5c3d460b46744b7270bb9b07b44c42c8
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fold some long lines
- Commit:
7d119a7cb849b6e7d08ef4db9b4e410607a086e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
call unveil earlier in 'got tag'
We now know that unveil(2) will never traverse exec.
No need to wait with unveil until the editor has been run.
ok op@
- Commit:
587493911b4239248b609d7d874fa37435b1da70
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
call unveil earlier in 'got histedit'
We now know that unveil(2) will never traverse exec.
No need to wait with unveil until the editor has been run.
ok op@
- Commit:
95bb542a095f9ba20454e45a2a3156789b1f040e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
call unveil earlier in 'got commit'
We now know that unveil(2) will never traverse exec.
No need to wait with unveil until the editor has been run.
ok op@
- Commit:
8f9af3fc83b84113522ee2edd3f33017d88f4337
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
call unveil earlier in 'got import'
We now know that unveil(2) will never traverse exec.
No need to wait with unveil until the editor has been run.
ok op@
- Commit:
0279329dccffda40b130fe1a08f888694df1238f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rename got_commit_graph_iter_start() to got_commit_graph_bfsort()
This function begins a breadth-first traversal. The new name makes
it easier to distinguish from got_commit_graph_toposort().
- Commit:
807c60e9b0d21645de0e196aaf07eb447a1c7487
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rebase' find a merge base with topological sorting if needed
Fixes a problematic case of spurious conflicts encountered by
naddy@ on landry's firefox package git repository.
The current implementation of toposort is expensive, so this might
make rebase appear to run slowly on large repositories. However,
this is better than letting users deal with spurious conflicts.
ok op@
- Commit:
e6fdf1dda4bb09f48bc1344b207aebb193636a7f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add log -t option which enables topological sorting of commits
Because the current implementation of toposort is expensive, add a
flag which enables it. I would rather not have this option and just
use toposort by default, however more work is required to achieve
acceptable performance.
ok op@
- Commit:
a8938c43582703be3f5912d0147fc275d314204a
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use a define for vi(1) path
This is intended to aid -portable, since other systems may have vi
installed in a different place, or maybe prefer to ship with a
different default editor.
ok stsp@
- Commit:
575ccdcfa027a0819df9f362eaf787142709ce2e
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug got checkout and update worktree leaks spotted by op@
- Commit:
b2424a42ae549628fe7e8ac9bf5b69af89f59d46
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug got status worktree leak found by Kyle Ackerman; ok op@
- Commit:
f52e24d844b8acbff9e1322c3f5e2507d9cd4b5f
- From:
- "Lorenz (xha)" <me@xha.li>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
simplify usage of the 'mesg' histedit script command
The 'mesg' script command now requires a commit ID as its argument,
rather than being tied to a preceding 'pick' or 'edit' command.
The old model was too confusing for new users, in particular for people
used to Git's rebase -i squash semantics.
The 'mesg' command is now semantically equivalent to the 'pick' command
and additionally opens the log message in an editor.
The new syntax is simpler to use but also requires that we drop support
for one-line log messages inside the histedit script, with a commit ID
taking its place in the argument space. We don't believe this feature was
used much, and that a simplified usage model is more beneficial overall.
Patch by Lorenz (xha)
ok jamsek
- Commit:
11024cb9b69a71de22ae46ccddcb4ef3b6730553
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
copy remote repo info out of work tree data before closing the work tree
Fixes a crash regression introduced when fetch/send were made to close
the work tree earlier.
- Commit:
236685110a720e7794a734da8872ac71174f3291
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got fetch' and 'got send' release the work tree lock earlier
This avoids having work tree operations blocked while network transfers
are in progress.
ok op@
- Commit:
484d974bd6540464db217df140323b4aab4086c3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
prevent overlapping repo and work tree in 'got checkout'
Some people are eager to try to make Got work just like Git by overlaying
the repository and work tree. This causes problems with unveil conflicts
at run-time.
Fail as early as possible during 'got checkout' when users attempt this.
cosmetic tweaks + ok op@
- Commit:
308ce28964ee726cc950ac9ae973cb286075581f
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got log -dPp' diffstat duplication bug
Only collect changed paths once if both -d and -P are specified;
we already checked for -d and -p. Reported by Lucas on IRC.
Regress for this and the previous (got log -x keyword) commit still due.
ok stsp@ and op@
- Commit:
ef1538260f78376b6fb605ffb10d682f5877afc2
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: allow 'got log -x' to accept keywords
Suggested by Lucas on IRC.
ok stsp@ and op@
- Commit:
ecd443d2472ce096dd28f55b466a204eca5b62c4
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
zap unused got_commit_object var; ok op@
- Commit:
6ebb22635171b6f1ad080fe10bf7b13133312957
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add cancellation support to the mixed-commits checker in worktree.c
- Commit:
58041363b15268c10af599e8fde0065ad975f554
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug got_reference leak in cmd_update()
ok op@
- Commit:
44d79efab98b7f1502b7d4a5b66e5890f16180d8
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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@