* recommend using sh/merge-with-custom-msg
* recommend cherry-picking merge commits
* drop hep from release candidate tag format
* minor other additions
* Use 'set -e' to bail on any errors.
* If the pull request number is not specified, bail out.
* Print a simple pre-merge checklist before prompting for merge.
* origin/philip/gall-ack-fix:
gall: give both acks in case of unexpected ack
gall: make 2140e07 ota-able
gall: properly track remote acknowledgments
Signed-off-by: Jared Tobin <jared@tlon.io>
The KERNEL_CHANGED and PILLS_CHANGED variables used the revision with
'origin' stripped from it (intended for using in messages only), which
caused them to miss remote revisions.
Also tweaks the conditional so that the kernel diff only displays when
pills haven't been updated.
It's hard to say what's the safest thing to do when we get an ack we
weren't expecting due to losing outstanding.agents.state in +load
3-to-4, so this gives both a watch-ack and a poke-ack. This seems most
likely to succeed.
Does not change state type, but clears outstanding.agents.state since
it's full of garbage values. This introduces a possibility that we may
have been in the middle of something, so we handle that in a reasonably
sane way.
outstanding.agents.state is a queue of what sort of message we sent to a
foreign app. We use it so that when the acknowledgment comes back we
know whether to treat it as a watch-ack, poke-ack, or neither. We used
to put this info in the wire, but this gave us a different ames flow,
which meant %leave and %watch didn't get associated (causing #2079).
The error was that when when retrieving the item from the queue, we put
the new 1-item-shorter queue back in outstanding.agents.state at a
different wire than it came from, so the queues never actually got
shorter, and acknowledgments of the wrong sort were commonly produced.
This caused problems mainly in situations where we poke and peer on the
same wire, and possibly when a subscription was cancelled.
Possibly related to #2206 and #2176. I would expect this bug to cause
those issues, but I haven't verified the converse. Also possibly
related to #2153 and #2079.
"Replace" suggests this function either produces an updated set/map when done,
like +snap, or changes all values in-place, like +turn. In truth, it's more
similar to +roll, which does reduction/accumulation.
("Reduce" specifically was chosen because it maintains the mnemonic relation to
the arm name.)
It's very easy to forget to verify that pills have been updated
accordingly when the kernel changes. This adds a warning that prints
when the kernel in the target has changed but the pills have not.
Also prompts the user for confirmation pre-merge.
* origin/king-haskell: (411 commits)
Fix counting bug in event log replay.
fix progress bar in daemon mode
Got Linux release builds working again.
king: style improvements
king: Build without warnings.
Fix king-haskell Linux release build.
Update scripts to point to `urbit-king`.
Renamed modules Ur.** to Urbit.** to be consistent with urbit-{atom,hob}
king: Rename `king` package to `urbit-king`.
Clean up `Urbit.Atom` and move it into it's own package.
Module structure, doc strings
Bump stackage version.
Got docs to build.
king haskell: automatically connect to terminal when running a ship
king: add partial-replay and --dry-from
Make sure we close HTTP sockets on close (or reconfigure).
Hack around terminfo database problem.
Fixed bug in HTTP Server (only first block from stream was handled).
Logging for event sourced responses.
Cleanup port binding logic.
...
Signed-off-by: Jared Tobin <jared@tlon.io>
Don't include pkg/arvo/tests and pkg/urbit/tests when running
git-archive(1).
Additionally, move the export-ignore declaration for
pkg/urbit/hashtable_tests into the pkg/urbit/.gitattributes files. For
default operation, git-archive(1) requires that these declarations be
located on the tree being archived.
Removes miscellaneous files that had lingered from pre-monorepoisation:
* pkg/arvo Travis and .gitignore, .gitattributes files
* pkg/urbit CONTRIBUTING.md (subsumed by file in repository root)
Release tarballs previously didn't include a release directory, so the
files would be unceremoniously dumped into the user's current directory
when extracted.
Fixes#1400.
This reverts commit 94800ca79c, which
fixed a bug with mugs in Vere. Fixing it retroactively invalidated the
mugs in all event logs in the present era, however.
Adds a derivation that uses a patched pkg/urbit/vere/lmdb.c that employs
a sixty gigabyte log limit, instead of the default forty. This is
useful for ships e.g. ~zod that receive a lot of traffic on mainnet.
'installPhase' captures all the important stuff that builder.sh
previously did, and use of the generic builder allows stages of the
build to be more easily overridden.
Due to asynchronicity, Ford can receive responses from Clay to requests
that it has already attempted to cancel. This removes some overzealous
assertions that this wouldn't happen.
