Commit Graph

20164 Commits

Author SHA1 Message Date
pkova
5902ef9a53 eyre: remove superfluous connection-state check
This was originally introduced by me in #1814 to address #1811. Eyre was not
canceling heartbeat timers on all relevant events making it easy to end
up with an infinite behn loop. This check allowed ships that entered an infinite
loop to recover, as per my comment at
https://github.com/urbit/urbit/pull/1814#discussion_r333477482. Otherwise it's
not necessary.
2020-09-24 17:50:42 +03:00
Joe Bryan
a4bfed0f80
Merge pull request #3472 from urbit/jb/trim-meld
arvo: adds new maintenance commands: |trim and |meld
2020-09-17 00:03:03 -07:00
Joe Bryan
bd44f35d15 pill: solid 2020-09-16 23:45:14 -07:00
Joe Bryan
03a308bcef Merge branch 'release/next-sys' into jb/trim-meld
* release/next-sys:
  pill: update
2020-09-16 23:33:28 -07:00
Philip Monk
61fd3c957d
pill: update 2020-09-16 22:27:09 -07:00
Joe Bryan
31fe240632 arvo: adds |meld, triggering memory unification 2020-09-09 22:50:43 -07:00
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
matildepark
c45691d214
Merge pull request #3408 from urbit/lf/xml-ver
zuse: allow xml declaration in +de-xml:html
2020-09-05 16:17:31 -04:00
Philip Monk
1a9c9f1e39
Merge pull request #3404 from urbit/philip/safe-merge
clay: add safe merge strategies
2020-09-03 20:14:58 -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
Liam Fitzgerald
5020223ff2 zuse: de-xml:html handles declarations as in spec 2020-09-01 02:15:19 +10:00
Liam Fitzgerald
b5f64715f4 zuse: allow xml declaration in +de-xml:html
Allows for parsing of an xml declaration. Throws it away, as the
datastructure doesn't have anywhere to put the result
2020-08-31 12:24:41 +10: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
Fang
2385670631
Merge pull request #3387 from urbit/m/eyre-wack-gall
eyre: prevent %eyre-no-channel errors
2020-08-27 22:26:19 +02:00
Fang
b06f8a0f9e
eyre: send %leave on %fact/ack for deleted channel
Ordinarily, eyre cleans up the relevant gall subscriptions whenever a
channel disappears. In yet unresolved erroneous behavior though, it may
leave a gall subscription open, despite wiping the channel from state.

Attempting to pass the response onto the deleted channel anyway results
in an %eyre-no-channel error later in the event. The volume of these
errors can degrade the user experience, as per #3196.

To resolve the annoyance (but not the underlying issue) we detect the
"subscription has no channel" case, and issue a %leave. Doing so
requires additional information in the wire, so we add that in,
refactoring the relevant wire building along the way.

Note that due to the wire requirements, this cannot resolve existing
cases. For that, we depend on bc929ba6d.
2020-08-27 14:16:46 +02:00
Fang
bc929ba6db
gall: forget eyre subscriptions once
As part of the solution to #3196, we need to clean up any gall
subscriptions that eyre didn't properly clean up.

Since detecting that is hard, we opt to just wipe _all_ eyre-originating
subscriptions from gall. We inspect the duct, which isn't good, but it's
only just this once.
2020-08-27 13:23:36 +02:00
Philip Monk
769b43d73a
clay: add comments and cleanup +find-merge-points 2020-08-26 18:32:20 -07:00
Philip Monk
335119823c
Merge pull request #3376 from urbit/philip/commit-noop
clay: if commit would be a no-op, don't commit it
2020-08-26 15:12:57 -07:00
Philip Monk
9cd826f8f9
clay: make +find-merge-points faster
The main thing here is that we aggressively check whether we're in
ancestry of another mergebase candidate.  This means we don't have to do
a 2nd pass to eliminate redundant candidates.
2020-08-25 22:54:48 -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
Philip Monk
f606d2e3d6
clay: cleaner no-op detection
Only no-op if the incoming commit's parent is the old head of the desk.
Also move the printing near the end so we can know exactly if anything
changed.
2020-08-25 18:15:06 -07:00
Philip Monk
d5596eb1a3
clay: if commit would be a no-op, don't commit it
fixes #3317
2020-08-25 16:24:36 -07:00
Philip Monk
d4c7f99bd6
Merge pull request #3217 from cmarcelo/code-reset
jael, eyre: Add a way to reset the web login code
2020-08-25 15:26:01 -07:00
Caio Marcelo de Oliveira Filho
4804cb7864 pill: Update solid.pill for code-reset changes 2020-08-18 09:44:59 -07:00
Caio Marcelo de Oliveira Filho
92cf9d7c33 Merge branch 'master' into code-reset 2020-08-17 14:55:07 -07:00
Fang
22c66f9ac4
Merge pull request #3304 from ohAitch/patch-3
Fix {a/$foo} in type printing to [a=%foo]
2020-08-13 10:44:36 +02:00
Matilde Park
b0d252fa76 publish: no-op when joining our own notebook
Fixes #3300.
2020-08-12 23:08:31 -04:00
Anton Dyudin
06262cb701
Fix {a/$foo} in type printing to [a/%foo]
Per longtime deprecation of modeless mold syntax.
2020-08-12 12:25:46 -07:00
Fang
959648d484
Merge pull request #3266 from urbit/m/functional-cons
hoon: add +lead and +late
2020-08-12 16:30:55 +02:00
Liam Fitzgerald
993ba2d00f glob: update to 0v2.pbthv.gd1q2.h2ura.5esrn.d361c 2020-08-11 22:14:07 -04:00
matildepark
71985e2764
Merge pull request #3296 from urbit/mp/omni/links-join
leap: results link to join routes
2020-08-11 22:02:28 -04:00
Matilde Park
271a9ef235 leap: results link to join routes
Fixes #3274.
2020-08-11 21:52:49 -04:00
matildepark
d07a40b4cd
Merge pull request #3294 from tylershuster/leap-tab
leap: set default select behavior
2020-08-11 18:46:46 -04:00
matildepark
d8a832ceba
Merge pull request #3293 from urbit/mp/chat-regex-mobile
chat: fix syntax of regex check
2020-08-11 18:36:08 -04:00
Tyler Brown Cifu Shuster
62042a067b omni: set default select behavior 2020-08-11 15:35:00 -07:00
Matilde Park
02bd2e795a chat: fix syntax of regex check 2020-08-11 17:57:59 -04:00
matildepark
273bc9c0f3
Merge pull request #3287 from urbit/mp/omnibox-fixes
leap: small fixes
2020-08-11 16:54:19 -04:00
matildepark
97bbac159c
Merge pull request #3292 from urbit/la/chat-read
chat: don't show green line when unread is on page 1
2020-08-11 16:22:20 -04:00
Matilde Park
a123dd67dd interface: allow pinch zooming if needed 2020-08-11 16:20:19 -04:00
Matilde Park
2df01c5fad leap: disable spellcheck 2020-08-11 16:01:05 -04:00
Matilde Park
087dbf0221 interface: prevent interface zooming on iOS 2020-08-11 15:24:28 -04:00
L
2b065d65dc
Merge pull request #3269 from urbit/la/chat-settings
chat: settings page refactor
2020-08-11 12:15:07 -07:00
Logan Allen
fcf5b21a90 interface: settings for color disables properly 2020-08-11 12:07:10 -07:00
matildepark
d6ee658bf5
Merge pull request #3290 from tylershuster/chat-newline-fix-fix
chat: fixes #3288
2020-08-11 15:00:41 -04:00
Logan Allen
92fd1c2af5 chat: don't show green line 2020-08-11 11:35:55 -07:00
Tyler Brown Cifu Shuster
d86b240c7a chat: fixes #3288 2020-08-11 10:01:41 -07:00
Matilde Park
a16439188a omnibox: background darkens in dark mode
Fixes #3280.
2020-08-11 12:20:12 -04:00
Matilde Park
2a74699f61 omnibox: sorting -> apps, commands, groups, subs
Fixes #3279.
2020-08-11 12:17:07 -04:00