pkg update and first config fix
org-brain not working, add org-roam
This commit is contained in:
674
lisp/crdt/COPYING
Normal file
674
lisp/crdt/COPYING
Normal file
@@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
351
lisp/crdt/HACKING.org
Normal file
351
lisp/crdt/HACKING.org
Normal file
@@ -0,0 +1,351 @@
|
||||
* Algorithm
|
||||
|
||||
Background reading: [[https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type][CRDT]]
|
||||
|
||||
This packages implements the Logoot split algorithm
|
||||
~André, Luc, et al. "Supporting adaptable granularity of changes for massive-scale collaborative editing." 9th IEEE International Conference on Collaborative Computing: Networking, Applications and Worksharing. IEEE, 2013.~
|
||||
|
||||
The CRDT-ID blocks are implemented by text property ='crdt-id=.
|
||||
A continous range of text with the same ='crdt-id= property represent a CRDT-ID block.
|
||||
The ='crdt-id= is a a cons of =(ID-STRING . END-OF-BLOCK-P)=,
|
||||
where =ID-STRING= represent the CRDT-ID of the leftmost character in the block.
|
||||
If =END-OF-BLOCK-P= is =NIL=, the block is a non-rightmost segment splitted from a larger block,
|
||||
so insertion at the right of this block shouldn't be merged into the block by sharing the base CRDT-ID and increasing offset.
|
||||
|
||||
=ID-STRING= is a unibyte string representing a CRDT-ID (for efficient comparison).
|
||||
Every two bytes represent a big endian encoded integer.
|
||||
For base IDs, last two bytes are always representing Site ID.
|
||||
Stored strings are BASE-ID:OFFSETs. So the last two bytes represent offset,
|
||||
and second last two bytes represent Site ID.
|
||||
|
||||
* Protocol
|
||||
|
||||
Text-based version
|
||||
(it should be easy to migrate to a binary version. Using text for better debugging for now)
|
||||
|
||||
Note: Starting from =v0.3.0=, we separate /User IDs/ and /Site IDs/.
|
||||
Site IDs are /buffer local/ and temporarily assigned to users with writable access.
|
||||
|
||||
Every message takes the form =(type . body)=
|
||||
|
||||
- Text Editing
|
||||
A peer must obtain a =site-id= before performing the following operations,
|
||||
by remote calling =crdt-get-write-access=. See [[Remote Function]].
|
||||
+ insert ::
|
||||
body takes the form =(buffer-name user-id crdt-id position-hint content)=
|
||||
- =position-hint= is the buffer position where the operation happens at the site
|
||||
which generates the operation. Then we can play the trick that start search
|
||||
near this position at other sites to speedup CRDT ID search
|
||||
- =content= is the string to be inserted
|
||||
|
||||
+ delete ::
|
||||
body takes the form =(buffer-name user-id position-hint . crdt-id-list)=
|
||||
- =crdt-id-list= is generated from =CRDT--DUMP-IDS= from the deleted text
|
||||
|
||||
+ cursor ::
|
||||
body takes the form
|
||||
=(buffer-name user-id point-position-hint point-crdt-id mark-position-hint mark-crdt-id)=
|
||||
=*-crdt-id= can be either a CRDT ID, or
|
||||
- =nil=, which means clear the point/mark
|
||||
- =""=, which means =(point-max)=
|
||||
|
||||
- Contact information
|
||||
|
||||
+ contact ::
|
||||
body takes the form =(user-id slot value)=
|
||||
- =slot= can be one of
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
name host service focus
|
||||
#+END_SRC
|
||||
|
||||
+ leave ::
|
||||
body takes the form =(user-id)=
|
||||
|
||||
This message is sometime sent from client to server to indicate disconnection,
|
||||
if the underlying proxy doesn't indicate disconnection properly.
|
||||
|
||||
- Login
|
||||
+ hello ::
|
||||
This message is sent from client to server, when a client connect to the server.
|
||||
body takes the form =(protocol-version &optional response)=
|
||||
|
||||
+ challenge ::
|
||||
body takes the form =(salt)=
|
||||
|
||||
+ login ::
|
||||
It's always sent after server receives a hello message.
|
||||
Assigns a User ID to the client
|
||||
body takes the form =(user-id)=.
|
||||
|
||||
- Initial Synchronization
|
||||
+ sync ::
|
||||
This message is sent from server to client to get it sync to the state on the server.
|
||||
Might be used for other optimization in the future.
|
||||
One optimization I have in mind is let server try to merge all CRDT item into a single
|
||||
one and try to synchronize this state to clients at best effort.
|
||||
body takes the form =(buffer-name . crdt-id-list)=
|
||||
- =crdt-id-list= is generated from =CRDT--DUMP-IDS=
|
||||
|
||||
+ ready ::
|
||||
body takes the form =(buffer-name major-mode-symbol)=
|
||||
Indicates the end of a batch of synchronization messages
|
||||
(which usually contains some =cursor= messages, a =sync= message,
|
||||
and some =overlay-*= messages).
|
||||
The client should now try to enable =major-mode-symbol= in the
|
||||
synchronized buffer.
|
||||
|
||||
- Error Recovery
|
||||
Note: when a client side error happens, it just sends a =get= message and
|
||||
follow initial synchronization procedure to reinitialize the buffer.
|
||||
|
||||
+ error ::
|
||||
body takes the form =(buffer-name error-symbol . error-datum)=.
|
||||
This message is sent from server to client to notice that some messages from the
|
||||
client is not processed due to error =(error-symbol . error-datum)=.
|
||||
Normally client should follow initial synchronization procedure to reinitialize the buffer.
|
||||
- =buffer-name= can also be =nil=, which signifies that it's a session error.
|
||||
The only reasonable thing to do is to disconnect in this scenario.
|
||||
Currently, this happens when client/server protocol version doesn't match.
|
||||
|
||||
- Buffer Service
|
||||
+ add ::
|
||||
Indicates that the server has started sharing some buffers.
|
||||
body takes the form =buffer-name-list=
|
||||
|
||||
+ remove ::
|
||||
Indicates that the server has stopped sharing some buffers.
|
||||
body takes the form =buffer-name-list=
|
||||
|
||||
+ get ::
|
||||
Request the server to resend =sync= message for a buffer.
|
||||
body takes the form =(buffer-name)=
|
||||
|
||||
- Overlay Synchronization
|
||||
+ overlay-add ::
|
||||
body takes the form
|
||||
#+BEGIN_SRC
|
||||
(buffer-name user-id logical-clock species
|
||||
front-advance rear-advance
|
||||
start-position-hint start-crdt-id
|
||||
end-position-hint end-crdt-id)
|
||||
#+END_SRC
|
||||
|
||||
+ overlay-move ::
|
||||
body takes the form
|
||||
#+BEGIN_SRC
|
||||
(buffer-name user-id logical-clock
|
||||
start-position-hint start-crdt-id
|
||||
end-position-hint end-crdt-id)
|
||||
#+END_SRC
|
||||
|
||||
+ overlay-put ::
|
||||
body takes the form =(buffer-name user-id logical-clock prop value)=
|
||||
|
||||
+ overlay-remove ::
|
||||
body takes the form =(buffer-name user-id logical-clock)=
|
||||
|
||||
- <<Remote Function>>
|
||||
+ fcap ::
|
||||
body takes the form =(fcap-symbol nonce in-states out-states . interactive-form)=
|
||||
This grants a "functional capability" to a peer.
|
||||
Nonce is a random number to prevent forging capability.
|
||||
- =in-states= is a list of state symbols that the function depends on.
|
||||
=out-states= is a list of state symbols that the function modifies and should be synchronized
|
||||
to the caller.
|
||||
See [[Allowed state symbols]].
|
||||
|
||||
+ funcall ::
|
||||
body takes the form
|
||||
#+BEGIN_SRC
|
||||
(user-id logical-clock spawn-user-id
|
||||
state-list nonce fcap-symbol . args)
|
||||
#+END_SRC
|
||||
- =spawn-user-id= represents the site where the interactive command is originally invoked
|
||||
+ It can be different from =user-id= because a remote function can call a remote function!
|
||||
This is especially useful when client makes a remote call,
|
||||
but the call on the server request some interactive input,
|
||||
and such interactive call are remote-called back into the client.
|
||||
- =state-list= is an alist of bindings.
|
||||
(except that we use 1 element list for the CDRs, to save a dot in the serialized string)
|
||||
(CDRs can also be 2 element list of the form =(crdt-id pos-hint)=)
|
||||
<<Allowed state symbols>> are
|
||||
#+BEGIN_SRC
|
||||
window window-point buffer buffer-content point
|
||||
mark mark-active transient-mark-mode last-command-event
|
||||
#+END_SRC
|
||||
|
||||
+ return ::
|
||||
body takes the form =(user-id logical-clock state-list success-p . return-values)=
|
||||
|
||||
- Buffer local variables
|
||||
+ var :: body takes the form =(buffer-name variable-symbol . args)=
|
||||
=args= is passed to the variable receiver =(get variable-symbol 'crdt-variable-receiver)=
|
||||
to calculate an updated value.
|
||||
The actual format of =args= depends on the variable sender and receiver
|
||||
(which supposed implement some CRDT).
|
||||
|
||||
All peer must make sure they install the same kind of variable sender and receiver
|
||||
for =variable-symbol=.
|
||||
|
||||
- Remote Buffer Process
|
||||
+ process ::
|
||||
body takes the form =(buffer-name string)=
|
||||
Sent from client to server, request sending =string=
|
||||
to the process buffer associated to =buffer-name=.
|
||||
|
||||
+ process-mark ::
|
||||
body takes the form =(buffer-name crdt-id position-hint)=.
|
||||
|
||||
NOTE: for =overlay-put=, =overlay-move= and =process-mark=, server must also broadcast the message
|
||||
*back to the client that generated it*, to ensure consistent global history.
|
||||
|
||||
* Emacs as a collaborative operating system
|
||||
|
||||
The goal: With a few annotations, developer should be able to make any Emacs application
|
||||
collaboration-powered. Emacs should be one of the most powerful collaboration platforms.
|
||||
|
||||
How: There're plenty of Emacs applications centered around the buffer and buffer-local-variables.
|
||||
By implementing synchronization primitives for all components in a buffer,
|
||||
pretty much everything can be made collaborative.
|
||||
Synchronize arbitrary buffer-local-variable reasonably is hard, but user annotations can help.
|
||||
|
||||
** How to implement collaboration support for a package
|
||||
|
||||
~crdt.el~ provides two sets of facilities for adding collaboration support, a command-based one and a state-based one.
|
||||
Package hackers are free to combine them to provide desired behavior.
|
||||
|
||||
*** Command-based collaboration
|
||||
|
||||
This is a simple method to add collaboration support.
|
||||
After registering a command with =crdt-register-remote-command=,
|
||||
an =:around= advice is added such that when a client invoke this command,
|
||||
an request is sent to the server instead of running the command locally.
|
||||
|
||||
Hackers must make sure that they declare what sets of buffer state the command uses
|
||||
to fully preserve user intent.
|
||||
|
||||
Although relatively simple, collaboration command implemented using this method
|
||||
must go through a round trip to the server and will incur latency.
|
||||
|
||||
**** Why we need used-state-set annotations
|
||||
|
||||
Suppose Alyssa P. Hacker does =(crdt-register-remote-command 'eval-last-sexp)=,
|
||||
but didn't declare that =eval-last-sexp= uses content of the buffer.
|
||||
Now the hackers are conspiring in an ~crdt.el~ session.
|
||||
Ben Bitdiddle places cursor after =(+ 1 1)= and run =eval-last-sexp=.
|
||||
However, the moment Ben Bitdiddle's request arrives at the server,
|
||||
Cy D. Fect has changed =(+ 1 1)= to =(+ 1 2)= (their message arrives first!).
|
||||
Now the server does what it sees and return =3=, instead of =2=.
|
||||
|
||||
The correct solution is to let the server roll-back to the state when Ben Bitdiddle invoked the command.
|
||||
It is relatively expensive thus we don't want to do this for every command,
|
||||
thus we require package hackers to annotate explicitly.
|
||||
|
||||
/The above mechanism haven't been implemented yet!/
|
||||
But adding annotations now will help adding it in the future.
|
||||
To implement this mechanism we need to add lamport timestamp to every messages
|
||||
(which may corresponds to mutation of interesting states),
|
||||
and send a vector clock in =command= messages which depend on buffer content.
|
||||
|
||||
*** State-based collaboration
|
||||
|
||||
We can also synchronize the underlying state of the packages
|
||||
rather than proxying user-level commands.
|
||||
If there're good CRDT candidates to be used for the state
|
||||
(hackers need to understand what concurrency semantics their state need to have!),
|
||||
then the commands can have real-time effect without needing to be acknowledged from the server.
|
||||
|
||||
=crdt-org-sync-overlay-mode= is an example of this approach.
|
||||
|
||||
Overall, this method is much more complicated than command-base method.
|
||||
Development of the facility is still on-going.
|
||||
|
||||
** TODO Task list for ~crdt.el~ facility
|
||||
- [X] synchronize buffer text (insert/delete)
|
||||
- [X] synchronize overlays
|
||||
- [-] synchronize major/minor modes
|
||||
+ [X] initial synchronization of major modes
|
||||
+ [ ] toggle minor modes on the fly
|
||||
+ [X] change major modes on the fly
|
||||
- [-] set of synchronization primitives for buffer local variables
|
||||
+ [-] server dictated
|
||||
+ [ ] non incremental
|
||||
+ [X] naive incremental
|
||||
+ [ ] state-of-the-art level tree diff
|
||||
+ [ ] a library of CRDTs
|
||||
- [X] synchronize text properties (any use case for this?)
|
||||
+ [X] synchronize when new text is inserted
|
||||
+ [X] synchronize when changed
|
||||
- [ ] synchronize markers (any use case for this?)
|
||||
- [-] remote command
|
||||
+ [X] basic remote command (only possibly use =(point)=)
|
||||
+ [X] command that uses region
|
||||
+ [ ] correctly handle command that uses buffer content
|
||||
+ [ ] handle arbitrary =interactive= form (firstly, what's the right thing to do?)
|
||||
- [-] remote buffer process
|
||||
+ [X] process mark
|
||||
+ [X] send to process
|
||||
+ [ ] make sure "pseudo process" really looks like process
|
||||
(define complete set of advices)
|
||||
|
||||
** Notes and examples of CRDTize built-in packages
|
||||
|
||||
Search for =;;; Built-in package integrations= in ~crdt.el~
|
||||
|
||||
* TODO Cross-editor support
|
||||
|
||||
The current plan is to reuse the Emacs implementation as a local server for any other editor, aka Emacs as a service.
|
||||
The benefit is that we don't need to reimplement the sophiscated CRDT algorithm in other +uncivilized+ environments.
|
||||
We then just need to design a thin protocol that communicate between local Emacs and the other editor.
|
||||
Since this protocol communicate only locally, the latency should be negligible,
|
||||
therefore we use a blocking reader/writer lock based synchronization scheme.
|
||||
|
||||
** Lock: modes of operations
|
||||
|
||||
It turns out that I vastly over-estimated the extensibility of /The Other Editors/.
|
||||
For example, lots of them (including M$ vScoDe and cult 666) doesn't seem to have anything like =pre-command-hook=,
|
||||
making it impossible to implement a usual bidirectional locking mechanism
|
||||
(because we can't tell those editors to acquire lock from Emacs before running commands that potentially modify the buffer).
|
||||
|
||||
Currently I implemneted a hack that by default let /The Other Editors/ hold the lock, but upon receiving
|
||||
an =acquire= from Emacs, let /The Other Editors/ dead loops to hopefully halt command execution until Emacs gives back the lock.
|
||||
Emacs thus must give back lock as soon as possible to un-hang /The Other Editors/.
|
||||
|
||||
Q: What if Emacs GCs?
|
||||
/Q got thrown out of the window./
|
||||
|
||||
** Bridge protocol
|
||||
|
||||
- Reader/writer lock
|
||||
+ aquire :: body takes the form =()=
|
||||
+ release :: body takes the form =()=
|
||||
|
||||
The rest is mostly analogue to the primary protocol for Emacsen,
|
||||
except that CRDT IDs are replaced by explicit integer position (start from 1, as in Emacs).
|
||||
|
||||
- Text Editing
|
||||
+ insert :: body takes the form =(buffer-name position content)=
|
||||
+ delete :: body takes the form =(buffer-name position length)=
|
||||
|
||||
- Peer State
|
||||
+ cursor :: body takes the form =(buffer-name user-id point-position mark-position)=
|
||||
=*-position= can be either an integer, or
|
||||
- =nil=, which means clear the point/mark
|
||||
|
||||
+ contact :: same as primary protocol.
|
||||
+ leave :: same as primary protocol.
|
||||
|
||||
- Login
|
||||
Note that we don't include challenge/response authentication mecahnism.
|
||||
|
||||
+ hello :: same as primary protocol.
|
||||
+ login :: same as primary protocol.
|
||||
|
||||
- Initial Synchronization
|
||||
+ sync :: body takes the form =(buffer-name content-string)=
|
||||
+ ready :: same as primary protocol.
|
||||
|
||||
- Buffer Service
|
||||
+ add :: same as primary protocol.
|
||||
+ remove :: same as primary protocol.
|
||||
+ get :: same as primary protocol.
|
||||
23
lisp/crdt/Makefile
Normal file
23
lisp/crdt/Makefile
Normal file
@@ -0,0 +1,23 @@
|
||||
EMACS=emacs
|
||||
|
||||
.PHONY: package elpa clean compile
|
||||
|
||||
package: *.el
|
||||
@ver=`grep -o "Version: .*" crdt.el | cut -c 10-`; \
|
||||
tar czvf crdt-$$ver.tar.gz --mode 644 $$(find . -name \*.el)
|
||||
|
||||
elpa: *.el
|
||||
@version=`grep -o "Version: .*" crdt.el | cut -c 10-`; \
|
||||
dir=crdt-$$version; \
|
||||
mkdir -p "$$dir"; \
|
||||
cp $$(find . -name \*.el) crdt-$$version; \
|
||||
echo "(define-package \"crdt\" \"$$version\" \
|
||||
\"Simultaneous text editing over network\")" \
|
||||
> "$$dir"/crdt-pkg.el; \
|
||||
tar cvf crdt-$$version.tar --mode 644 "$$dir"
|
||||
|
||||
clean:
|
||||
@rm -rf crdt-*/ crdt-*.tar crdt-*.tar.gz *.elc
|
||||
|
||||
compile:
|
||||
${EMACS} -Q --batch -L . -f batch-byte-compile crdt.el
|
||||
201
lisp/crdt/README-elpa
Normal file
201
lisp/crdt/README-elpa
Normal file
@@ -0,0 +1,201 @@
|
||||
1 Introduction
|
||||
══════════════
|
||||
|
||||
`crdt.el' is a real-time collaborative editing environment for Emacs
|
||||
using Conflict-free Replicated Data Types.
|
||||
|
||||
Highlights:
|
||||
• [CRDT], darling child of collaborative editing researches…
|
||||
• Share multiple buffer in one session
|
||||
• See other users' cursor and region
|
||||
• Synchronize Org mode folding status
|
||||
• Org mode integration
|
||||
• Comint derivatives integration (experimental)
|
||||
|
||||
|
||||
[CRDT]
|
||||
<https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type>
|
||||
|
||||
|
||||
2 Usage
|
||||
═══════
|
||||
|
||||
2.1 Installation
|
||||
────────────────
|
||||
|
||||
`crdt.el' is now on GNU ELPA! Just `M-x package-install crdt'.
|
||||
|
||||
*Caution!!!* Please make sure that you and your peers are on the same
|
||||
`crdt.el' version! It turns out to be one of the most common causes
|
||||
of `crdt.el' not working. Because currently the network protocol is
|
||||
not stablized, behavior when using mismatched versions is
|
||||
unexpectable.
|
||||
• Strictly speaking, it should work when `crdt-protocol-version' are
|
||||
defined (added after version `0.2.5') and the same on all peers.
|
||||
But why not save some hassle and keep everyone on the latest
|
||||
version.
|
||||
• To upgrade, just `M-x package-reinstall crdt', then preferably
|
||||
restart Emacs. To check your `crdt.el' version, `M-x crdt-version'.
|
||||
|
||||
|
||||
2.2 Start a shared session
|
||||
──────────────────────────
|
||||
|
||||
A shared session is a place that can contains multiple buffers (or
|
||||
files), and multiple users can join to collaboratively edit those
|
||||
buffers (or files). Think about a meeting room with some people
|
||||
working together on some papers.
|
||||
|
||||
In some buffer, `M-x crdt-share-buffer'. Then enter session name.
|
||||
This add the current buffer to the existing session with that name.
|
||||
If no such exists, it creates a new session with the provided session
|
||||
name, and initially contains the current buffer as a shared buffer.
|
||||
|
||||
If a new session is to be created, you need to enter port (default to
|
||||
6530), optional password and your display name (default to your
|
||||
current `(user-full-name)').
|
||||
|
||||
Experimental settings: "Secure Port" specifies TLS port, and "Command
|
||||
Functions" specifies user permissions. It's ok to just use the default
|
||||
values.
|
||||
|
||||
|
||||
2.3 Join a session
|
||||
──────────────────
|
||||
|
||||
`M-x crdt-connect', then enter address, port, and your display name.
|
||||
|
||||
If the server has provided the permission (this is the default case),
|
||||
connected user may also add their buffers to the session via `M-x
|
||||
crdt-share-buffer'.
|
||||
|
||||
|
||||
2.4 Navigate through sessions
|
||||
─────────────────────────────
|
||||
|
||||
Sessions
|
||||
`M-x crdt-list-sessions' lists all sessions.
|
||||
|
||||
Buffers
|
||||
`M-x crdt-list-buffers' lists all buffers in current session.
|
||||
In the displayed buffer list, press `RET' in the session list to
|
||||
see buffers in the selected session.
|
||||
|
||||
You can also use `M-x crdt-switch-to-buffer' to interactively
|
||||
switch to another buffer in the current session.
|
||||
|
||||
Users
|
||||
In a CRDT shared buffer (either server or client), `M-x
|
||||
crdt-list-users' to list active users. In the displayed user
|
||||
list, press `RET' on an entry to goto that user's cursor
|
||||
position. Press `f' to follow that user, and press `f' again or
|
||||
`M-x crdt-stop-follow' to stop following.
|
||||
|
||||
You can also use `M-x crdt-goto-next-user' and `M-x
|
||||
crdt-goto-prev-user' to cycle through users' cursor positions
|
||||
from any CRDT shared buffer (don't need to be in the user list
|
||||
buffer).
|
||||
|
||||
|
||||
2.5 Stop sharing
|
||||
────────────────
|
||||
|
||||
`M-x crdt-stop-session' stops a session you've started and disconnect
|
||||
all other users from it. This will ask for your confirmation,
|
||||
customize `crdt-confirm-stop-session' if you want to disable it.
|
||||
|
||||
You can also press `k' or `d' in the session list (show it by `M-x
|
||||
crdt-list-sessions').
|
||||
|
||||
`M-x crdt-stop-share-buffer' removes current buffer from its CRDT
|
||||
session (this operation is only allowed at server side). You can also
|
||||
press `k' or `d' in the buffer list.
|
||||
|
||||
|
||||
2.6 Disconnect from a session
|
||||
─────────────────────────────
|
||||
|
||||
`M-x crdt-disconnect', then choose a session to disconnect from.
|
||||
|
||||
You can also press `k' or `d' in the session list (show it by `M-x
|
||||
crdt-list-sessions').
|
||||
|
||||
The server Emacs has the privilege to disconnect a user from a
|
||||
session. To do so, press `k' or `d' on an entry in the user list
|
||||
(show it by `M-x crdt-list-users').
|
||||
|
||||
|
||||
2.7 Fancy stuff
|
||||
───────────────
|
||||
|
||||
Visualizing author of parts of the document
|
||||
Turn on `crdt-visualize-author-mode' to color text based on
|
||||
which user authored it.
|
||||
|
||||
Synchronizing Org folding status
|
||||
Turn on `crdt-org-sync-overlay-mode'. All peers that have this
|
||||
enabled have their folding status synchronized. Peers without
|
||||
enabling this minor mode are unaffected.
|
||||
|
||||
Comint integration
|
||||
Just go ahead and share you comint REPL buffer! Tested: `shell'
|
||||
and `cmuscheme'. By default, when sharing a comint buffer,
|
||||
`crdt.el' temporarily reset input history (as in `M-n' `M-p') so
|
||||
others don't spy into your `.bash_history' and alike. You can
|
||||
customize this behavior using variable
|
||||
`crdt-comint-share-input-history'.
|
||||
|
||||
|
||||
2.8 What if we don't have a public IP?
|
||||
──────────────────────────────────────
|
||||
|
||||
There're various workaround.
|
||||
|
||||
• You can use [tuntox] to proxy your connection over the [Tox]
|
||||
protocol. `crdt.el' has experimental built-in integration for
|
||||
`tuntox'. To enable it, you need to install `tuntox', set up the
|
||||
custom variable `crdt-tuntox-executable' accordingly (the path to
|
||||
your `tuntox' binary), and set the custom variable
|
||||
`crdt-use-tuntox'. Setting it to `t' make `crdt.el' always create
|
||||
`tuntox' proxy for new server sessions, and setting it to `'confirm'
|
||||
make `crdt.el' ask you every time when creating new sessions. After
|
||||
starting a session with `tuntox' proxy, you can `M-x crdt-copy-url'
|
||||
to copy a URL recognizable by `M-x crdt-connect' and share it to
|
||||
your friends. Be aware that according to my experience, `tuntox'
|
||||
takes significant time to establish a connection (sometimes up to
|
||||
half a minute), however it gets much faster after the connection is
|
||||
established.
|
||||
|
||||
• You can use Teredo to get a public routable IPv6 address. One free
|
||||
software implementation is Miredo. Get it from your favorite package
|
||||
manager or from [their website]. A typical usage is (run as root)
|
||||
┌────
|
||||
│ # /usr/local/sbin/miredo
|
||||
│ # ifconfig teredo
|
||||
└────
|
||||
The `ifconfig' command should print the information of your IPv6
|
||||
address. Now your traffic go through IPv6, and once you start a
|
||||
`crdt.el' session, your friends should be able to join using the
|
||||
IPv6 address. For more information, see the user guide on the
|
||||
Miredo website.
|
||||
|
||||
• You can use SSH port forwarding if you have a VPS with public IP.
|
||||
Example usage:
|
||||
┌────
|
||||
│ $ ssh -R EXAMPLE.COM:6530:127.0.0.1:6530 EXAMPLE.COM
|
||||
└────
|
||||
This make your `crdt.el' session on local port `6530' accessible
|
||||
from `EXAMPLE.COM:6530'.
|
||||
|
||||
Note that you need to set the following `/etc/ssh/sshd_config'
|
||||
option on your VPS
|
||||
┌────
|
||||
│ GatewayPorts yes
|
||||
└────
|
||||
|
||||
|
||||
[tuntox] <https://gitlab.com/gjedeer/tuntox>
|
||||
|
||||
[Tox] <https://tox.chat>
|
||||
|
||||
[their website] <https://www.remlab.net/miredo/>
|
||||
166
lisp/crdt/README.org
Normal file
166
lisp/crdt/README.org
Normal file
@@ -0,0 +1,166 @@
|
||||
* Introduction
|
||||
|
||||
~crdt.el~ is a real-time collaborative editing environment for Emacs
|
||||
using Conflict-free Replicated Data Types.
|
||||
|
||||
Highlights:
|
||||
- [[https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type][CRDT]],
|
||||
darling child of collaborative editing researches...
|
||||
- Share multiple buffer in one session
|
||||
- See other users' cursor and region
|
||||
- Synchronize Org mode folding status
|
||||
- Org mode integration
|
||||
- Comint derivatives integration (experimental)
|
||||
|
||||
* Usage
|
||||
|
||||
** Installation
|
||||
|
||||
~crdt.el~ is now on GNU ELPA! Just =M-x package-install crdt=.
|
||||
|
||||
*Caution!!!* Please make sure that you and your peers are on the same
|
||||
~crdt.el~ version! It turns out to be one of the most common causes
|
||||
of ~crdt.el~ not working. Because currently the network protocol is
|
||||
not stablized, behavior when using mismatched versions is
|
||||
unexpectable.
|
||||
- Strictly speaking, it should work when =crdt-protocol-version= are
|
||||
defined (added after version =0.2.5=) and the same on all peers.
|
||||
But why not save some hassle and keep everyone on the latest
|
||||
version.
|
||||
- To upgrade, just =M-x package-reinstall crdt=, then preferably
|
||||
restart Emacs. To check your ~crdt.el~ version, =M-x crdt-version=.
|
||||
|
||||
** Start a shared session
|
||||
|
||||
A shared session is a place that can contains multiple buffers (or
|
||||
files), and multiple users can join to collaboratively edit those
|
||||
buffers (or files). Think about a meeting room with some people
|
||||
working together on some papers.
|
||||
|
||||
In some buffer, =M-x crdt-share-buffer=. Then enter session name.
|
||||
This add the current buffer to the existing session with that name.
|
||||
If no such exists, it creates a new session with the provided session
|
||||
name, and initially contains the current buffer as a shared buffer.
|
||||
|
||||
If a new session is to be created, you need to enter port (default to
|
||||
6530), optional password and your display name (default to your
|
||||
current =(user-full-name)=).
|
||||
|
||||
Experimental settings: "Secure Port" specifies TLS port, and "Command
|
||||
Functions" specifies user permissions. It's ok to just use the default
|
||||
values.
|
||||
|
||||
** Join a session
|
||||
|
||||
=M-x crdt-connect=, then enter address, port, and your display name.
|
||||
|
||||
If the server has provided the permission (this is the default case),
|
||||
connected user may also add their buffers to the session via
|
||||
=M-x crdt-share-buffer=.
|
||||
|
||||
** Navigate through sessions
|
||||
|
||||
- Sessions :: =M-x crdt-list-sessions= lists all sessions.
|
||||
|
||||
- Buffers :: =M-x crdt-list-buffers= lists all buffers in current
|
||||
session. In the displayed buffer list, press ~RET~ in the session
|
||||
list to see buffers in the selected session.
|
||||
|
||||
You can also use =M-x crdt-switch-to-buffer= to interactively switch
|
||||
to another buffer in the current session.
|
||||
|
||||
- Users :: In a CRDT shared buffer (either server or client), =M-x crdt-list-users=
|
||||
to list active users. In the displayed user list, press ~RET~ on an
|
||||
entry to goto that user's cursor position. Press ~f~ to follow that
|
||||
user, and press ~f~ again or =M-x crdt-stop-follow= to stop following.
|
||||
|
||||
You can also use =M-x crdt-goto-next-user= and =M-x crdt-goto-prev-user=
|
||||
to cycle through users' cursor positions from any CRDT shared buffer
|
||||
(don't need to be in the user list buffer).
|
||||
|
||||
** Stop sharing
|
||||
|
||||
=M-x crdt-stop-session= stops a session you've started and disconnect
|
||||
all other users from it. This will ask for your confirmation,
|
||||
customize =crdt-confirm-stop-session= if you want to disable it.
|
||||
|
||||
You can also press ~k~ or ~d~ in the session list (show it by =M-x crdt-list-sessions=).
|
||||
|
||||
=M-x crdt-stop-share-buffer= removes current buffer from its CRDT
|
||||
session (this operation is only allowed at server side). You can also
|
||||
press ~k~ or ~d~ in the buffer list.
|
||||
|
||||
** Disconnect from a session
|
||||
|
||||
=M-x crdt-disconnect=, then choose a session to disconnect from.
|
||||
|
||||
You can also press ~k~ or ~d~ in the session list (show it by =M-x crdt-list-sessions=).
|
||||
|
||||
The server Emacs has the privilege to disconnect a user from a
|
||||
session. To do so, press ~k~ or ~d~ on an entry in the user list
|
||||
(show it by =M-x crdt-list-users=).
|
||||
|
||||
** Fancy stuff
|
||||
|
||||
- Visualizing author of parts of the document ::
|
||||
Turn on =crdt-visualize-author-mode= to color text based on which
|
||||
user authored it.
|
||||
|
||||
- Synchronizing Org folding status :: Turn on
|
||||
=crdt-org-sync-overlay-mode=. All peers that have this enabled have
|
||||
their folding status synchronized. Peers without enabling this minor
|
||||
mode are unaffected.
|
||||
|
||||
- Comint integration ::
|
||||
Just go ahead and share you comint REPL buffer! Tested: ~shell~ and
|
||||
~cmuscheme~. By default, when sharing a comint buffer, ~crdt.el~
|
||||
temporarily reset input history (as in =M-n= =M-p=) so others don't
|
||||
spy into your =.bash_history= and alike. You can customize this
|
||||
behavior using variable =crdt-comint-share-input-history=.
|
||||
|
||||
** What if we don't have a public IP?
|
||||
|
||||
There're various workaround.
|
||||
|
||||
- You can use [[https://gitlab.com/gjedeer/tuntox][tuntox]] to proxy
|
||||
your connection over the [[https://tox.chat][Tox]] protocol.
|
||||
=crdt.el= has experimental built-in integration for =tuntox=. To
|
||||
enable it, you need to install =tuntox=, set up the custom variable
|
||||
=crdt-tuntox-executable= accordingly (the path to your =tuntox=
|
||||
binary), and set the custom variable =crdt-use-tuntox=. Setting it
|
||||
to =t= make =crdt.el= always create =tuntox= proxy for new server
|
||||
sessions, and setting it to ='confirm= make =crdt.el= ask you every
|
||||
time when creating new sessions. After starting a session with
|
||||
=tuntox= proxy, you can =M-x crdt-copy-url= to copy a URL
|
||||
recognizable by =M-x crdt-connect= and share it to your friends. Be
|
||||
aware that according to my experience, =tuntox= takes significant
|
||||
time to establish a connection (sometimes up to half a minute),
|
||||
however it gets much faster after the connection is established.
|
||||
|
||||
- You can use Teredo to get a public routable IPv6 address. One free
|
||||
software implementation is Miredo. Get it from your favorite package
|
||||
manager or from [[https://www.remlab.net/miredo/][their website]].
|
||||
A typical usage is (run as root)
|
||||
#+BEGIN_SRC
|
||||
# /usr/local/sbin/miredo
|
||||
# ifconfig teredo
|
||||
#+END_SRC
|
||||
The =ifconfig= command should print the information of your IPv6
|
||||
address. Now your traffic go through IPv6, and once you start a
|
||||
=crdt.el= session, your friends should be able to join using the
|
||||
IPv6 address. For more information, see the user guide on the
|
||||
Miredo website.
|
||||
|
||||
- You can use SSH port forwarding if you have a VPS with public IP.
|
||||
Example usage:
|
||||
#+BEGIN_SRC
|
||||
$ ssh -R EXAMPLE.COM:6530:127.0.0.1:6530 EXAMPLE.COM
|
||||
#+END_SRC
|
||||
This make your =crdt.el= session on local port =6530= accessible
|
||||
from =EXAMPLE.COM:6530=.
|
||||
|
||||
Note that you need to set the following =/etc/ssh/sshd_config=
|
||||
option on your VPS
|
||||
#+BEGIN_SRC
|
||||
GatewayPorts yes
|
||||
#+END_SRC
|
||||
2
lisp/crdt/crdt-pkg.el
Normal file
2
lisp/crdt/crdt-pkg.el
Normal file
@@ -0,0 +1,2 @@
|
||||
;; Generated package description from crdt.el -*- no-byte-compile: t -*-
|
||||
(define-package "crdt" "0.3.5" "Collaborative editing using Conflict-free Replicated Data Types" 'nil :commit "e6d42f42c5dedb73560048f4bf6263c63ffa21bb" :authors '(("Qiantan Hong" . "qhong@alum.mit.edu")) :maintainer '("Qiantan Hong" . "qhong@alum.mit.edu") :keywords '("collaboration" "crdt") :url "https://code.librehq.com/qhong/crdt.el")
|
||||
3427
lisp/crdt/crdt.el
Normal file
3427
lisp/crdt/crdt.el
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user