urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 17:32:11 +03:00
Code Issues Packages Projects Releases Wiki Activity
22,640 Commits 768 Branches 10 Tags 215 MiB
4b48ab959e
Commit Graph

235 Commits

Author SHA1 Message Date
Joe Bryan
7f0b500778 arvo: adds |trim, triggering memory reclamation 2020-09-09 22:49:37 -07:00
Philip Monk
f9665c0cbd
Merge pull request #3378 from urbit/philip/base-hash 
clay: expose mergebase as base-hash
 2020-09-08 20:11:05 -07:00
Philip Monk
c7480c9b07
clay: fix bug in %mate 
If both sides changed a file in the same way, %mate used the version in
the mergebase, which is incorrect.  This changes it to use the version
in the destination desk.

An example of this issue:

    > +cat %/test/hoon
    /~zod/home/~2020.9.3..21.41.24..61ed/test/hoon
    first

    > |merge %scratch our %home
    >=
    merged with strategy %fine
    + /~zod/scratch/2/test/hoon

    > +cat /=scratch=/test
    /~zod/scratch/~2020.9.3..21.41.32..408c/test/hoon
    first

    > *%/test/hoon 'second'
    : /~zod/home/3/test/hoon

    > *%%%/scratch=/test/hoon 'second'
    : /~zod/scratch/3/test/hoon

    > |merge %scratch our %home
    >=
    %fine merge failed, trying %meet
    %meet merge failed, trying %mate
    merged with strategy %mate
    : /~zod/scratch/4/test/hoon

    > +cat /=scratch=/test
    /~zod/scratch/~2020.9.3..21.42.25..9e8b/test/hoon
    first
 2020-09-03 14:34:30 -07:00
Philip Monk
67c5caada8
clay: add safe merge options 
As described in gen/hood/merge/help.txt
 2020-08-28 16:36:00 -07:00
Philip Monk
794b31ec91
file-server: use new base hash 2020-08-25 21:08:26 -07:00
Philip Monk
4468d79509
clay: expose mergebase as base-hash 
Change the definition of base-hash to be the mergebase of %home with the
OTA source.  This means it's the most recent successfully-applied
update, which is usually the most important information.

Add sour-hash, which is the hash of the most recently *downloaded*
update, regardless of whether it applied successfuly (ie the old
base-hash).

Add a summary of the various hashes at the top of gen/trouble.
 2020-08-25 20:25:39 -07:00
Caio Marcelo de Oliveira Filho
92cf9d7c33 Merge branch 'master' into code-reset 2020-08-17 14:55:07 -07:00
Caio Marcelo de Oliveira Filho
df868e2c4f jael, eyre: Add a way to reset the web login code 
Jael now stores a `step` that is combined with the original salt to
produce a new code.  A `%step` card is used to increment that value,
and effectively resetting the keys.  Because the first `step` is zero,
the first code is the same as before.

Eyre was changed to be notified with `%code-changed` so it can forget
old cookies, sessions and discard all the existing channels.

A new generator was added |code, that does both querying and
resetting the code

    |code             :: shows current code, step and help
    |code %reset      :: changes the code

The old +code generator still works correctly.
 2020-07-31 11:35:48 -07:00
L
798f3b5de0
Merge pull request #3110 from urbit/la/graph-store 
graph-store: a consistent, strongly validated, interoperable data storage format
 2020-07-30 15:25:17 -07:00
Logan Allen
043714752e hood: no longer start graph hooks for now 2020-07-28 12:21:30 -07:00
Logan Allen
452d6ea4e1 graph-store: fully tested mark validation system 2020-07-28 12:03:09 -07:00
Logan Allen
a35749e2be graph-store: first validator mark builds 2020-07-27 12:56:30 -07:00
Logan Allen
325667f9ec Merge branch 'master' into la/graph-store 2020-07-27 12:10:22 -07:00
Logan Allen
a3cc668392 gen: add-graph uses empty graph 2020-07-27 12:09:19 -07:00
Fang
3315be4a24
Merge pull request #3197 from urbit/m/spur-timers 
gen: use spur in +timers
 2020-07-27 20:33:10 +02:00
Fang
89d8abf765
gen: use spur in +timers 
+en-beam expects a spur, reversing it for the final path rendering.
 2020-07-27 19:48:26 +02:00
Matilde Park
75acc5aeb5 Merge branch 'master' into release/next-userspace 2020-07-24 17:34:09 -04:00
Philip Monk
3a489e2f6f
Merge pull request #3156 from urbit/philip/moon 
moon: print key with correct life
 2020-07-24 14:13:57 -07:00
Joe Bryan
9e77535568 Merge branch 'master' into release/next-vere 
* master: (117 commits)
  contact-store: restore /~/default contacts
  contact-hook: resubscribe on correct paths
  metadata: handle OTA correctly
  release: urbit-os-v1.0.30
  group-store: remove scries from OTA logic
  release: urbit-os-v1.0.30
  MAINTAINERS: amend for post-fusion
  ames: add scry endpoint for forward lanes
  ames: improve scry interface
  chat, publish, contacts: fix OTA bugs
  trouble: report glob state
  clay: ignore extraneous /sys/lyv results
  zuse: added docstring and warning
  release: urbit-os-v1.0.29
  groups: correct line-height on group items
  launch: use mono for base hash
  interface: don't require urbitrc for build:prod
  maintainers: add glob-making instructions
  interface: amend disconnect copy
  metadata-store: migrate contact paths
  ...
 2020-07-23 16:08:09 -07:00
Philip Monk
d44661e5e6
moon: print key with correct life 
We were sending the correct life to Jael, but the ticket we printed had
the life hardcoded to 1.  This makes it use the correct life in both
places.
 2020-07-23 01:47:02 -07:00
Caio Marcelo de Oliveira Filho
47871d0f48 ota: show information instead of disable by default 
Instead of `|ota` cancel the OTA, make it show the current setting.
Make the cancel need a more explicit argument.

   |ota                 shows the current setting
   |ota disable         disable OTA
   |ota ~sponsor %desk  reset to a different sponsor/desk

Because most of the time the expected desk is going to be %kids, use
that in the "help message".
 2020-07-22 16:27:05 -07:00
Logan Allen
9d5f16901e graph-store: update generators 2020-07-22 13:33:05 -07:00
Matilde Park
0d68f3f901 Merge branch 'release/next-sys' 2020-07-22 14:31:17 -04:00
Liam Fitzgerald
24b25a3422 Merge remote-tracking branch 'origin/release/next-userspace' into lf/groups-refactor 2020-07-22 10:42:52 +00:00
Caio Marcelo de Oliveira Filho
d8203eb0d1 trouble: report glob state 2020-07-22 00:22:45 -07:00
Fang
3eab480de7
Merge branch 'release/next-sys' into jb/m/behn-scry 2020-07-22 02:02:05 +02:00
Philip Monk
350756b47a
glob: autostart and make ota-able 2020-07-17 16:58:28 -07:00
Logan Allen
106119a9ba Merge branch 'la/ordered-map-subset' into la/graph-store 2020-07-08 15:17:55 -04:00
Liam Fitzgerald
76bc3d82e1 Merge branch 'release/next-userspace' into lf/groups-refactor 2020-07-08 10:04:02 +10:00
Logan Allen
a7cbecc0e2 Merge branch 'lf/groups-refactor' into la/graph-store 2020-07-06 15:02:20 -04:00
Fang
a53e462be8
Merge branch 'master' into ipc-redux 2020-07-03 14:58:49 +02:00
Philip Monk
ba9e894580
trouble: report source of OTA instead of parent 2020-06-30 16:10:12 -07:00
Liam Fitzgerald
9b61c5571b Merge branch 'ford-fusion' into lf/groups-refactor 2020-06-27 10:42:16 +10:00
Joe Bryan
7f61b5a491 Revert "Merge pull request #3050 from urbit/m/behn-improvements" 
This reverts commit ed808614aa, reversing
changes made to a6db3add83.
 2020-06-26 16:24:43 -07:00
Fang
fe87d69ad1 behn: improve scry interface 
No longer abuse the desk field, instead making use of the path. Reject
any scries outside of the local ship, empty desk and current time as
invalid.

Expose ducts only under a debug endpoint, nothing else should care about
being able to inspect them.

Add scry endpoints for the very next timer (if any), and all timers up
to and including a specified timestamp.
 2020-06-26 15:17:12 -07:00
Liam Fitzgerald
ad6efe44ff groups: update generators and marks for ford-fusion 2020-06-26 12:45:02 +10:00
Ted Blackman
26ff47b93d Merge remote-tracking branch 'origin/release/next-userspace' into ford-fusion 2020-06-25 22:24:30 -04:00
Fang
a94285208a
behn: improve scry interface 
No longer abuse the desk field, instead making use of the path. Reject
any scries outside of the local ship, empty desk and current time as
invalid.

Expose ducts only under a debug endpoint, nothing else should care about
being able to inspect them.

Add scry endpoints for the very next timer (if any), and all timers up
to and including a specified timestamp.
 2020-06-24 17:09:29 +02:00
Logan Allen
a245a1b095 graph-store: added archiving functionality 2020-06-23 14:01:04 -04:00
Logan Allen
c9ccbdabef graph-store: added action generators 2020-06-23 14:00:15 -04:00
Liam Fitzgerald
8cf81002ec Merge branch 'ford-fusion' into lf/groups-refactor 2020-06-23 12:13:03 +10:00
Ted Blackman
01eee03340 kiln: WIP state as tuple 2020-06-16 03:29:17 -04:00
Liam Fitzgerald
d66dbff61e groups: migrate to push-pull hooks and resources 2020-06-08 17:53:16 +10:00
Philip Monk
8b78f04dd3
Merge remote-tracking branch 'origin/master' into ford-fusion 2020-06-02 21:50:20 -07:00
Liam Fitzgerald
f392e861ee groups: add prototype state adapters and cleanup 2020-06-03 12:21:00 +10:00
Fang
30924609e0
Merge pull request #2882 from urbit/lf/links-refactors 
links: namespace types
 2020-06-02 17:16:37 +02:00
Liam Fitzgerald
5016e84c0a groups: namespace tags 2020-06-02 15:24:08 +10:00
Liam Fitzgerald
e2aa8af220 groups: add .hidden flag on group 2020-06-02 15:24:08 +10:00
Liam Fitzgerald
841ba72bd9 chat: update to new groups 2020-06-02 15:20:14 +10:00
Liam Fitzgerald
f60181871a groups: finish rewrite 2020-06-02 15:11:02 +10:00
Liam Fitzgerald
d2de8d72eb groups: begin rewrite 2020-06-02 15:07:09 +10:00
Benjamin Summers
47247d86d2 Merge branch 'khrc' of github.com:urbit/urbit into ipc-redux-kh 2020-05-29 17:15:16 -07:00
Philip Monk
a362e4b3cb
gen: add |ames-wake 
forgot to add this file
 2020-05-28 10:50:32 -07:00
Fang
58e85fa661
Merge branch 'release/next-sys' into m/debug-dashboard 2020-05-23 01:00:45 +02:00
Philip Monk
a4a44f1e21
kiln: cleanup 2020-05-22 14:32:32 -07:00
Philip Monk
4aff4d74e2
kiln: get updates into %home, remove %base 
We need to get updates directly into %home in case the marks depend on
changes to hoon.hoon.  %base has no reason to exist.

Our ota strategy is now to merge from parent/kids to home, then
parent/kids to kids.
 2020-05-21 23:45:17 -07:00
Philip Monk
cce32194c1
pill: update 2020-05-21 23:15:23 -07:00
Ted Blackman
13f6b84b76 /gen/timers: stop using parser path 2020-05-22 01:53:33 -04:00
Ted Blackman
34038a4616 /gen: all generators build 2020-05-20 04:51:37 -04:00
Ted Blackman
64882f09e7 /gen,/app: stop using /= 2020-05-19 16:53:55 -04:00
Philip Monk
a874ab4355
zuse: remove +ford 2020-05-14 00:22:39 -07:00
Philip Monk
c092f9cea4
hood: remove references to ford 2020-05-13 19:29:20 -07:00
Liam Fitzgerald
5dce103fe0 links: update generators 2020-05-09 09:41:58 +10:00
lukechampine
baa309e375 dojo: rename remote access generators 2020-05-08 00:53:21 -04:00
Liam Fitzgerald
bf965a26ea links: rename files to namespacing convention 2020-05-08 14:27:37 +10:00
Fang
61a5e7a45e
behn: expose timers through scry 
Instead of giving the tank of the timers, give the list of timers
itself.

Updates +timers to account for this.
 2020-05-08 01:38:29 +02:00
lukechampine
6ab3ab7d5c dojo: add remote access controls 2020-05-07 17:57:31 -04:00
Joe Bryan
a3f85f8086 arvo: fixes +solid boot sequence 2020-04-30 15:01:22 -07:00
Logan Allen
9c6cb61d61 s3: got tests passing and added the rest of the generators 2020-04-24 12:19:01 -04:00
Logan Allen
ab3a759ce2 s3-store: poke functionality, updated credentials, added generators 2020-04-24 12:19:01 -04:00
Ted Blackman
5854162e74 ford-fusion: parse /? 2020-04-16 08:56:06 -04:00
Ted Blackman
35c39bf076 ford-fusion: +get-cast compiles, initial tests pass 2020-04-16 08:45:48 -04:00
ixv
12b6a5ccc5
Merge pull request #2600 from urbit/dk-help-generator 
completed +help comments for places they were missing
 2020-04-09 16:51:22 -07:00
Fang
9f47cbd568
dbug: document "all subscriptions" option in gen 2020-04-07 11:21:17 +02:00
Isaac Visintainer
2ad8264c52 Merge branch 'philip/gall-clear' 2020-04-02 15:32:43 -07:00
Liam Fitzgerald
eeebfc0114 launch: address review comments for /who endpoint 2020-04-02 08:50:01 +10:00
Liam Fitzgerald
253187001b launch: add CORS headers to /who endpoint 
Necessary to allow bridge to make a cross-origin request via
javascript.
 2020-04-02 08:16:10 +10:00
Liam Fitzgerald
e16c999c76 launch: add /who endpoint 
The /who endpoint responds with the name of the ship in JSON
 2020-04-02 08:16:08 +10:00
David Kerschner
eeacf4543f removed gen/ph per @philipcmonk 2020-03-27 10:06:27 -07:00
David Kerschner
12662675f4
Update pkg/arvo/gen/azimuth-tracker/watch.hoon 
Co-Authored-By: Philip Monk <phil@pcmonk.me>
 2020-03-27 10:04:31 -07:00
David Kerschner
290ce453eb
Update pkg/arvo/gen/aqua/pill.hoon 
Co-Authored-By: Philip Monk <phil@pcmonk.me>
 2020-03-27 10:04:25 -07:00
David Kerschner
123122b755 completed +help comments for places they were missing 2020-03-24 15:14:24 -07:00
Philip Monk
1599937c81
clay: add option to skip queue 
Makes it so that |cancel %force skips the next thing in the queue if
you're not in the middle of something.  If you are in the middle of
something, it skips the thing you're in the middle of (just like naked
|cancel).

This should resolve issues where |cancel doesn't drain the queue.
 2020-03-23 15:53:18 -07:00
Philip Monk
184a0f52a5
gall: add |gall-sear 2020-03-20 15:32:23 -07:00
Fang
9a6bde765b
dbug: allow complex, hoon-based state queries 
+dbug [%state 'some-hoon'] now allows you to run some-hoon against the
application's state. That hoon has access to the bowl and stdlib for
more dbugging convenience.
 2020-03-12 16:40:35 +01:00
Joe Bryan
191425a11e arvo: adds +deep, prototype arvo filesystem engine 2020-03-05 17:00:40 -08:00
Isaac Visintainer
c502474942 Merge branch 'master' into os1-rc 2020-02-26 19:18:17 -08:00
Fang
a61718fd51
dbug: default to %state 2020-02-23 01:46:26 +01:00
Isaac Visintainer
00a9eb9eab Merge branch 'master' into os1-rc 2020-02-19 16:04:21 -08:00
risruc-habteb
67221aad29
Update frontpage.hoon 
Swapped "p.bek" for "our" and uncommented line 22.
 2020-02-04 21:40:14 -05:00
Fang
a26ec1db12
Merge pull request #2209 from urbit/m/link-bugfix 
link: listening & comments
 2020-01-30 00:51:22 +01:00
Fang
4693af478a
link-store: add :link-store|note 
For writing a comment on a url under a path.
 2020-01-29 21:12:13 +01:00
Logan Allen
d2ad5b143d hood: added |autocommit generator 2020-01-29 10:42:52 -08:00
Fang
283affd701
link-store: update generator doc to match name 2020-01-29 19:22:08 +01:00
Fang
bd2b4f9acb
dbug: support app state printing 
:your-app +dbug %state

(cherry picked from commit a7f07866f9)
 2020-01-29 14:04:27 +01:00
Fang
38f8bdd497
dbug: add agent wrapper for debugging pokes 
Use :app +dbug to get the entire bowl, or specific subscriptions.
(cherry picked from commit 421dae13cf)
 2020-01-29 14:04:27 +01:00
Fang
a7f07866f9
dbug: support app state printing 
:your-app +dbug %state
 2020-01-24 20:48:17 -08:00
Fang
421dae13cf
dbug: add agent wrapper for debugging pokes 
Use :app +dbug to get the entire bowl, or specific subscriptions.
 2020-01-21 12:34:50 -08:00
Fang
4610b26948
link: rename generator as per type change 2020-01-07 13:46:13 -08:00
Fang
ea7c1db61c
various: use =/ in place of =+ ^- 
Also faceless =; where appropriate.
 2019-12-21 14:29:14 -03:30