Commits
- 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:
101257039ae01276572124264470185d2b9baaf0
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
man nits; found with mandoc -Tlint
- 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:
d4b2e62d5cb4bd0757706877687d1c2bcb15f30c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
initialize and tidy up *branch_ref in got_worktree_histedit_continue()
- Commit:
20d96a10d5e54c5ff61a9ce5a53439d063a0805c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got-notify-http: refactor jsonify()
To support the other types of notifications, we can't just peek at
the first byte and decide wether it's a short or long format.
Refactor the parsing so that there's one main entrypoint, jsonify(),
that calls jsonify_comment() or jsonify_comment_short() depending
on the format of the line. Other "line types" will be added as a
follow-up to support the other notification types.
- Commit:
dada399a5c3d460b46744b7270bb9b07b44c42c8
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fold some long lines
- Commit:
9c485a117d54fcaae2d9cfc14cb90bbd5fbec161
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got-notify-http: change the layout of the json
Split the author/committer in sub-fields, rename author -> committer
in the short format parser and cache the author for the long format
in case it's the same user as the committer. Put a copy of the
first line of the commit message in the "short_message" field.
There's some redundancy now, but it's to make consuming easier.
ok stsp@
- 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:
5571f6ee575aa802f8a2a2cd841857b0ea046e07
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix typo in a comment
- Commit:
fcfdd0a183387d3aa708939ecbed113759de09dc
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got-notify-http: fix unicode handling
JSON strings are made of UNICODE codepoints, of which only \, " and
control characters have to be escaped, and the whole document MUST
be encoded in UTF-8. The current code generates invalid strings
for non-ASCII characters, so it has to be made UTF-8 aware.
tedu' isu8cont() can't be used since it allows surrogate pairs and
overlong sequences which will cause decoding errors on the receiving
side. Similarly, mbtowc() depends on the current locale and could
cause issues in -portable.
Instead, bundle Björn Höhrmann's "Flexible and Economical UTF-8
Decoder" and use it to parse the text. Decoding errors results in
the replacement character U+FFFD being emitted and the bytes
considered so far to be discarded; the decoder is then restarted
with the next byte.
Git commit messages don't carry the notion of the encoding, but
it's reasonable to expect UTF-8 (which is a superset of ASCII).
For other more esotic encodings, the commit id can be used to
manually extract the data.
ok stsp@
- Commit:
0178cac96c4245c6d52a00772ee6667b627c900b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
http_notification regress: prettify the json
long lines are not manegeable. split the json over multiple lines,
then use ed to join everything back in a single one.
- Commit:
86901c63904d24eb274939c21b40fa5d5de2f4e7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: http-server: hide the HTTP headers
The http-server script is already validating the headers, doing so
in the regress too is not helpful.
- Commit:
37038afa98389d7b612d7077ce821d951e55034b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got-notify-http: reject 3XX status codes
At least for now, we don't support following redirects nor retrying
the post, so consider a 3XX status a failure too.
- Commit:
2403c80c372b1d6deacb38b0bf9bee1b145e6529
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add my name in the bufio sources
- Commit:
c97a1399a088da22062dc1ab1c4e3b9bfe626d93
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
adjust expected output in the regress
- Commit:
94a3f4e9292a2c4019c2e68c242efa31f3e1fe4f
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got-notify-http
ok stsp@
- Commit:
bc0cdda132594ebe68c239990867d8e9a73af778
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix gotd_parse_url()
A path of "/" is valid and trailing slashes must be preserved.
ok stsp@
- Commit:
24a2826aba4cf5e99c0e9ce87dccbd23d1b3862e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a messagelen field in the notifications
Similar to the `got cat' output; it's needed to un-ambiguosly parse
the content of the notification, which is already useful to parse
the email content and invaluable for the upcoming got-notify-http.
ok stsp@
- 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:
473cd2ee73f447fd177f9c48f17fb6e8b2f5b533
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove a confusing comment
This function starts a breadth-first traversal, not necessarily first-parent.
- 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@