Commit Graph

57 Commits

Author SHA1 Message Date
Fang
d0091baa62
desk-jams: update
Also cleans docket back up.
2021-09-28 19:30:07 +04:00
Fang
6277213079
tmp: debug printfs 2021-09-28 18:30:12 +04:00
Fang
5cae9185f0
meta: fixup merge 2021-09-28 17:40:46 +04:00
Fang
400d2e4f44
Merge remote-tracking branch 'origin/lf/versioning-marks-dist' into dist 2021-09-28 17:13:33 +04:00
Liam Fitzgerald
77f7b05939 kiln: version external marks 2021-09-28 12:50:45 +10:00
Liam Fitzgerald
f3f13b1261 garden: version treaty, docket 2021-09-28 12:50:45 +10:00
ryjm
472f16fd2e garden spider: address comments 2021-09-27 21:23:46 -04:00
ryjm
ddf9e769ae spider, docket: move back to threads 2021-09-27 21:23:46 -04:00
Fang
4785dbbee5
docket: %leave glob subscriptions if necessary
If we're about to re-%watch on the same wire, we need to %leave first to
avoid getting into a duplicate wire situation.
2021-09-27 23:57:39 +04:00
Ted Blackman
7665e75849 manual merge @liam-fitzgerald misc. fixes PR 2021-09-27 14:50:58 -04:00
Fang
09c74dbaff
docket: fix "do we have this glob yet" check
We were incorrectly assuming we were comparing against a unit value.

Also makes a ~| more useful.
2021-09-26 21:55:22 +04:00
Fang
131cd82fc8
docket: include hash and target in glob wires
To avoid running into "duplicate wire" situations when we're just trying
to request the latest thing.

Additionally now does hash validation on http globs, and just silently
no-ops if the result we got came from a previous request.
2021-09-26 21:53:13 +04:00
Fang
2836fbde50
docket: better hash mismatch output
Could be useful to know both hashes when a mismatch happens.
2021-09-26 12:49:27 +04:00
Fang
cf73edb73c
docket: don't crash on adding a brand new docket
If we didn't have a charge for it yet, adding its new docket would
previously fail. Here we make sure this doesn't crash.

The local install case was hitting this.
2021-09-25 18:27:14 +04:00
Liam Fitzgerald
4267f69e3c hark: cleanup edges 2021-09-24 11:10:02 +10:00
Liam Fitzgerald
5dadee5375 Merge remote-tracking branch 'origin/dist' into m/dist-ames-glob-fixes 2021-09-23 15:50:55 +10:00
Liam Fitzgerald
b0f6f59b01 docket: move hash outside buccen 2021-09-23 15:45:13 +10:00
Liam Fitzgerald
7b262c78ce docket: remove index.html caching 2021-09-22 10:11:31 +10:00
Fang
514c54b46e
docket: change chad to %hung if glob watch fails 2021-09-21 19:28:52 +02:00
Fang
b41aaf8f10
docket: stop eating fresh globs and their hashes
When we uploaded a glob we hosted, we'd write a new docket to clay,
triggering a %commit.
The handling of this would:
- fail to update the docket in state,
- and discard our new glob, because the docket had changed.

Here we properly update the docket mirror in state, and make sure to
keep the glob around if its hash lines up.
2021-09-21 18:19:38 +02:00
Fang
75cc6aa28a
docket: add explicit hash to http globs 2021-09-21 17:52:45 +02:00
Fang
f1bb35fcee
docket: update docket file's glob hash on upload
If the docket says the glob is a local ames glob, then update the hash
to match the newly uploaded glob.

One would naively expect this to result in a %commit fact being
received, letting us update our state through the usual mechanism.
This is, for some reason, not the case...
2021-09-21 17:42:45 +02:00
Fang
4e453a9051
docket: hash-based glob-ames, handle within app
Instead of going through the thread. This works around a mark
definition issue and lets the docket file be more precise about
version selection. (Though older globs likely won't be kept around.)
2021-09-21 16:18:41 +02:00
Fang
976a071e5c
docket: stub out only glob _data_ in dbug state
And make it (hopefully) more obvious that it's getting stubbed out.
2021-09-21 16:17:53 +02:00
Liam Fitzgerald
f6b5377d8f treaty: hardcode default ally 2021-09-21 14:53:32 +10:00
Liam Fitzgerald
55da88a32a hark-system-hook: reconfigure update notifications 2021-09-21 12:51:03 +10:00
Fang
da28fbfed9
Merge dist into m/distpilled 2021-09-20 19:35:51 +02:00
Fang
5cf8e5a484
docket: account for new kiln fact mark 2021-09-20 19:30:26 +02:00
fang
5afa9f4974
Merge pull request #5220 from urbit/m/dist-glob-upload-docs
dist: docket: improve upload page
2021-09-20 19:16:48 +02:00
Liam Fitzgerald
ea5570655b garden: hark-store typo 2021-09-20 14:51:01 +10:00
Liam Fitzgerald
0655d72fd4 hark-store: fix %archive-all 2021-09-20 14:15:19 +10:00
Liam Fitzgerald
71f8b9a90b settings-store: handle missing desk 2021-09-20 12:17:54 +10:00
Liam Fitzgerald
143a8e08e6 various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
Liam Fitzgerald
1d94d08d60 garden: rework hark-store timeboxing 2021-09-17 10:44:35 +10:00
Fang
b23d9d7002
docket: loosen restrictions on glob uploads
Now also lets you upload globs that the local ship isn't the canonical
source for. Could come in handy for troubleshooting, among other things.
2021-09-14 23:29:07 +02:00
Fang
177ef73d37
docket: improve upload page
Most notably, we further restrict the desks eligible for glob upload
to just the ones whose glob is said to be hosted on the local ship.

On the upload page, we replace the desk input field with a dropdown
from which eligible desks can be selected.
Additionally we now display some instructions, instead of leaving
developers entirely on their own.
2021-09-14 16:38:20 +02:00
Liam Fitzgerald
a433e4f911 Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-14 12:40:52 +10:00
Liam Fitzgerald
10885ac57a settings-store: fix typo 2021-09-13 11:42:10 +10:00
Liam Fitzgerald
cc3fe23ae4 hark-store: add time field to %seen-index 2021-09-10 13:45:23 +10:00
Liam Fitzgerald
00d08a4543 Merge remote-tracking branch 'origin/dist' into lf/app-linking 2021-09-10 10:22:43 +10:00
Liam Fitzgerald
f2e1e2fe93 garden: proper lag notifications w/ autodismiss 2021-09-09 14:53:26 +10:00
Liam Fitzgerald
3ed00eda9d settings-store: query by desk 2021-09-09 11:35:57 +10:00
Liam Fitzgerald
f31c119ba0 settings-store: namespace by desk 2021-09-09 10:41:39 +10:00
Liam Fitzgerald
e08ac991b3 garden: move settings-store 2021-09-09 09:52:56 +10:00
Liam Fitzgerald
b3e634db48 treaty: request treaties from outside alliance 2021-09-08 12:59:05 +10:00
Ted Blackman
83be5162ed docket: manual merge of @Fang- web glob upload 2021-09-06 22:37:13 +03:00
Ted Blackman
18019b3eb4 minor cleanups 2021-09-06 21:59:24 +03:00
Liam Fitzgerald
613980c511 garden: update hark-store for third party distro 2021-09-06 13:22:25 +10:00
ryjm
ad8f6f681e docket: download globs over ames
Kind of a pain to test, need a better way to insert a `charge` directly.
Either that or rework `chad`, but I don't entirely understand why the
`chad` lifecycle is the way it is.
2021-09-01 02:22:54 -04:00
Liam Fitzgerald
962ab54f40 garden: move hark-store 2021-09-01 14:36:31 +10:00