commit e2b601a4f5570a25ca7066833b2a2d46b0b28bfa from: ale date: Fri Jul 24 00:17:20 2026 UTC Prepare first public release: reorganize, translate, add release infra - Split the single flat package into cli/changes/checkin/history/update/ settings/actions/roots by responsibility, mirroring how larger VCS integrations (e.g. git4idea) are organized. - Translate all comments and user-facing strings to English; trim narrative/session-referential comments down to concise explanations of non-obvious behavior only. - Add a Gradle Wrapper for CI use; build.gradle.kts now falls back to downloading a matching IntelliJ IDEA build when no local ideLocalPath is configured (moved out of the versioned gradle.properties into ~/.gradle/gradle.properties, since it is machine-specific). - Add LICENSE (GPLv3), a plugin icon (light/dark), a fuller and with contact info, and rename the plugin from 'Game of Trees (got) VCS' to 'Got' per Marketplace naming guidelines. - Rewrite README.md in English: what the plugin does, how each feature maps to a got command, building, contributing, and releasing. - Add .github/workflows/release.yml: on any v* tag, build, verify, create a GitHub Release with the plugin ZIP, and publish to JetBrains Marketplace once a PUBLISH_TOKEN secret is configured. commit - c906d176d6192246f1f8c1e27cab8acf5f59fa1e commit + e2b601a4f5570a25ca7066833b2a2d46b0b28bfa blob - /dev/null blob + a3bb7130f830405158f7310af3517de328f62fc5 (mode 644) --- /dev/null +++ .github/workflows/release.yml @@ -0,0 +1,45 @@ +name: Release + +on: + push: + tags: + - "v*" + +permissions: + contents: write + +jobs: + release: + name: Build, verify, and release + runs-on: ubuntu-latest + env: + PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "21" + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build plugin + run: ./gradlew buildPlugin + + - name: Verify plugin + run: ./gradlew verifyPlugin + + - name: Create GitHub release + uses: softprops/action-gh-release@v2 + with: + name: ${{ github.ref_name }} + generate_release_notes: true + files: build/distributions/*.zip + + - name: Publish to JetBrains Marketplace + if: ${{ env.PUBLISH_TOKEN != '' }} + run: ./gradlew publishPlugin blob - 28a9032bce2f4b8c5394cb0fa9bf2f1beb2c6252 blob + 06833402a7e3b2442a17d569c3b6099ee085e913 --- README.md +++ README.md @@ -1,48 +1,87 @@ -# gotvcs-intellij +# Got — IntelliJ VCS Integration for Game of Trees -Plugin de IntelliJ que integra [Game of Trees](https://gameoftrees.org/) (`got`) -como proveedor de control de versiones nativo: detección de work trees `.got/`, -estado de archivos en el panel de Commit, diffs, historial y commits desde la UI. +Native version control support for [Game of Trees](https://gameoftrees.org/) +(`got`) in IntelliJ-based IDEs: the same file status, diff, commit, history, +and update/push workflow you get with Git, backed by the `got` CLI. -## Estado actual +## Features -Las 6 fases del plan original: esqueleto del plugin, detección de raíces -`got`, estado de archivos, diff nativo (gutter de líneas), commit/rollback, -historial (`got log`) y update/fetch (`got update`/`got fetch`) desde la UI, -y panel de configuración en *Settings > Version Control > got* (ruta al -binario `got` y override de `SSH_AUTH_SOCK`). Validado con -`gradle verifyPlugin` contra IU-261.26222.65 e IU-262.8665.337. +- Detects `.got/` work trees as a `got` VCS root automatically +- File status in the Commit tool window (`got status`) +- Native diff and modified-lines gutter (`got cat` against the base commit) +- Commit and rollback from the Commit tool window (`got commit`, `got revert`) +- File history (`got log`) and Update Project (`got update` / `got fetch`) +- A **Send** action (`got send`), bound to `Ctrl+Shift+K` by default +- A Settings panel (*Settings > Version Control > got*) to override the + `got` binary path and `SSH_AUTH_SOCK`, for setups where auto-detection + doesn't apply -## Build +## How it works -Requiere JDK 21 y Gradle, provistos por el `flake.nix` de este repo: +There's no daemon and no cached repository model: every action shells out to +the `got` binary for the relevant work tree and adapts its output to the +corresponding IntelliJ Platform VCS API. -``` -nix develop -c gradle buildPlugin -``` +| IntelliJ feature | got command | +|---------------------------|--------------------------------| +| VCS root detection | presence of a `.got/` directory | +| File status | `got status` | +| Diff / gutter | `got cat -c :base` | +| Commit | `got commit -m ` | +| Rollback | `got revert -R ` | +| History | `got log` | +| Update Project | `got fetch` + `got update` | +| Send | `got send` | -El ZIP resultante queda en `build/distributions/` y se instala manualmente en -IntelliJ vía *Settings > Plugins > Install Plugin from Disk*. +Source is organized by responsibility under `dev.nezzontli.gotvcs`: -Compila contra una instalación local de IntelliJ Ultimate (ver `gradle.properties`, -clave `ideLocalPath`) en vez de descargar un IDE, ya que un IntelliJ descargado -por Gradle normalmente no ejecuta en NixOS sin `nix-ld`/FHS. +- `cli` — the single wrapper around `got` invocations (`GotCommandLineWrapper`) +- `changes`, `checkin`, `history`, `update`, `roots` — one package per VCS + extension point implemented +- `settings` — the persisted configuration and its Settings panel +- `actions` — the `Send` menu action -## Tags firmados +## Requirements -Cada build validado se marca con un tag `got` firmado por SSH (mismo esquema -que `/nixdots`: `got tag` no soporta GPG, solo SSH vía `ssh-keygen -Y sign`). +- IntelliJ IDEA (or another IntelliJ Platform IDE) 2026.1 or newer +- The `got` binary, either on `PATH` or configured under + *Settings > Version Control > got* +## Building + ``` -got tag -S ~/.ssh/yubikey.pub -m "mensaje" nombre-del-tag -got tag -V nombre-del-tag # verifica la firma +./gradlew buildPlugin ``` -`got.conf` (con `allowed_signers "/home/ale/.ssh/allowed_signers"`) y el propio -`~/.ssh/allowed_signers` viven fuera del work tree y **no están versionados**. -En una PC nueva, antes de poder verificar tags (`got tag -V`): +The resulting ZIP is written to `build/distributions/` and can be installed +via *Settings > Plugins > ⚙ > Install Plugin from Disk*. +By default this downloads a matching IntelliJ IDEA build to compile against. +To use a local installation instead (faster, no download), set in +`~/.gradle/gradle.properties` (not part of this repo): + +```properties +ideLocalPath=/path/to/your/IntelliJ/installation ``` -echo "ale_bnes@tuta.com $(cat ~/.ssh/yubikey.pub)" > ~/.ssh/allowed_signers -echo 'allowed_signers "/home/ale/.ssh/allowed_signers"' > /home/ale/gotvcs-intellij.git/got.conf + +## Contributing + +Issues and pull requests are welcome. Before submitting a change: + ``` +./gradlew buildPlugin verifyPlugin +``` + +`verifyPlugin` checks compatibility against the IDE versions declared by +`sinceBuild` in `build.gradle.kts` and flags deprecated API usage. + +## Releasing + +Pushing a `v*` tag triggers `.github/workflows/release.yml`, which builds, +verifies, creates a GitHub Release with the plugin ZIP attached, and — once +a `PUBLISH_TOKEN` secret is configured — publishes to the JetBrains +Marketplace. + +## License + +[GPLv3](LICENSE). blob - aea216e59d2b617678c7ddc914983c2b264dc53e blob + 433791abb5e6f61c2e92d3464a74c7e6b9489db3 --- build.gradle.kts +++ build.gradle.kts @@ -14,9 +14,17 @@ repositories { } } +// Local development can point at an installed IDE (see gradle.properties); +// CI and other contributors fall back to downloading a matching IDE build. +val localIdePath = providers.gradleProperty("ideLocalPath").orNull + dependencies { intellijPlatform { - local(providers.gradleProperty("ideLocalPath").get()) + if (!localIdePath.isNullOrBlank()) { + local(localIdePath) + } else { + intellijIdea("2026.1.4") + } bundledModule("com.intellij.modules.vcs") } } @@ -28,10 +36,15 @@ intellijPlatform { } changeNotes = """ - Fase 1 + 2: detección de work trees got y estado de archivos - (read-only) en el panel de Commit. + Read-only file status, native diff, commit/rollback, history, + update/fetch, a Send action, and a Settings panel for the got + binary path and SSH_AUTH_SOCK. """.trimIndent() } + + publishing { + token = providers.environmentVariable("PUBLISH_TOKEN") + } } tasks { blob - /dev/null blob + f288702d2fa16d3cdf0035b15a9fcbc552cd88e7 (mode 644) --- /dev/null +++ LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. blob - 58d4b84c91303c5da085316c31ba5fd096134687 blob + bbad3d6d6b89b5045d4980e110bd1cb41e229330 --- gradle.properties +++ gradle.properties @@ -1,10 +1,5 @@ -# Ruta a la instalación local de IntelliJ Ultimate contra la que se compila -# y desde la que se resuelven las clases de plataforma (VCS API, etc). -# En NixOS esta ruta vive bajo /nix/store y cambia con cada actualización del -# paquete `idea` en /nixdots — si `gradle buildPlugin` falla con un error de -# "local IDE not found", resolver la ruta actual con: -# readlink -f /etc/profiles/per-user/ale/bin/idea -# y actualizar ideLocalPath más abajo. -ideLocalPath=/nix/store/2j9cidng2j273q9p2xzn0mxj5hkh53fc-idea-2026.1.4/idea +# Optional: set `ideLocalPath` in ~/.gradle/gradle.properties (machine-local, +# not versioned) to compile against a local IntelliJ installation instead of +# downloading one. See README.md "Building" section. kotlin.stdlib.default.dependency=false blob - 494b3a993df8f194bef0aa5676fcf7ab47891285 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotChangeProvider.kt +++ /dev/null @@ -1,74 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.progress.ProgressIndicator -import com.intellij.openapi.vcs.FileStatus -import com.intellij.openapi.vcs.changes.Change -import com.intellij.openapi.vcs.changes.ChangeListManagerGate -import com.intellij.openapi.vcs.changes.ChangeProvider -import com.intellij.openapi.vcs.changes.ChangelistBuilder -import com.intellij.openapi.vcs.changes.CurrentContentRevision -import com.intellij.openapi.vcs.changes.LocallyDeletedChange -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.changes.VcsDirtyScope -import com.intellij.openapi.vcs.history.VcsRevisionNumber -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.vcsUtil.VcsUtil -import java.io.File - -class GotChangeProvider(private val commandLine: GotCommandLineWrapper) : ChangeProvider { - - override fun getChanges( - dirtyScope: VcsDirtyScope, - builder: ChangelistBuilder, - progress: ProgressIndicator, - addGate: ChangeListManagerGate, - ) { - for (root in dirtyScope.affectedContentRoots) { - val workDir = File(root.path) - val entries = commandLine.status(workDir) - if (entries.isEmpty()) continue - - // Resuelto una vez por raíz (fuera del EDT): GotContentRevision no - // puede recalcularlo perezosamente, ver su comentario de clase. - val baseRevision: VcsRevisionNumber = try { - GotRevisionNumber(commandLine.baseCommit(workDir)) - } catch (e: VcsException) { - VcsRevisionNumber.NULL - } - - for (entry in entries) { - val absoluteFile = File(workDir, entry.path) - val filePath = VcsUtil.getFilePath(absoluteFile, false) - - when (entry.code) { - '?' -> builder.processUnversionedFile(filePath) - - '!' -> builder.processLocallyDeletedFile(LocallyDeletedChange(filePath)) - - 'M', 'm', 'C' -> { - val status = if (entry.code == 'C') FileStatus.MERGED_WITH_CONFLICTS else FileStatus.MODIFIED - val before = GotContentRevision(filePath, workDir, entry.path, commandLine, baseRevision) - val after = CurrentContentRevision(filePath) - builder.processChange(Change(before, after, status), GotVcs.getKey()) - } - - 'A' -> { - val after = CurrentContentRevision(filePath) - builder.processChange(Change(null, after, FileStatus.ADDED), GotVcs.getKey()) - } - - 'D' -> { - val before = GotContentRevision(filePath, workDir, entry.path, commandLine, baseRevision) - builder.processChange(Change(before, null, FileStatus.DELETED), GotVcs.getKey()) - } - - else -> Unit - } - } - } - } - - override fun isModifiedDocumentTrackingRequired(): Boolean = false - - override fun doCleanup(files: MutableList) = Unit -} blob - 40efc533cd114b734a4c7cfa5294b1a91e929b22 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotCheckinEnvironment.kt +++ /dev/null @@ -1,102 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.project.Project -import com.intellij.openapi.vcs.FilePath -import com.intellij.openapi.vcs.ProjectLevelVcsManager -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.changes.Change -import com.intellij.openapi.vcs.changes.CommitContext -import com.intellij.openapi.vcs.checkin.CheckinEnvironment -import com.intellij.openapi.vfs.VfsUtilCore -import com.intellij.openapi.vfs.VirtualFile -import java.io.File - -/** - * got no tiene un índice/staging equivalente al de git en el flujo normal - * (aparte de `got stage`, que no usamos aquí): en vez de eso, se commitean - * exactamente los paths seleccionados por el usuario en el panel de Commit, - * vía `got commit -m msg `. Ver got(1), sección commit. - */ -class GotCheckinEnvironment( - private val project: Project, - private val commandLine: GotCommandLineWrapper, -) : CheckinEnvironment { - - override fun getHelpId(): String? = null - - override fun getCheckinOperationName(): String = "Commit" - - override fun isRefreshAfterCommitNeeded(): Boolean = true - - // CheckinEnvironment.commit() tiene 3 sobrecargas con implementación - // default: 2-args -> delega en la de CommitContext -> delega en la de - // NullableFunction -> devuelve null (no-op). La plataforma invoca - // directamente la de CommitContext, no la de 2 args -- si solo se - // sobreescribe esta última, el commit real nunca corre y el IDE igual - // reporta éxito (verificado en vivo con javap -c sobre la interfaz). - override fun commit(changes: MutableList, commitMessage: String): MutableList = - doCommit(changes, commitMessage) - - override fun commit( - changes: MutableList, - commitMessage: String, - commitContext: CommitContext, - feedback: MutableSet, - ): MutableList = doCommit(changes, commitMessage) - - private fun doCommit(changes: List, commitMessage: String): MutableList { - val exceptions = mutableListOf() - val filePaths = changes.mapNotNull { it.afterRevision?.file ?: it.beforeRevision?.file } - for ((workDir, paths) in groupByRoot(filePaths)) { - try { - commandLine.commit(workDir, commitMessage, paths) - } catch (e: VcsException) { - exceptions.add(e) - } - } - return exceptions - } - - override fun scheduleMissingFileForDeletion(files: MutableList): MutableList { - val exceptions = mutableListOf() - for ((workDir, paths) in groupByRoot(files)) { - try { - commandLine.remove(workDir, paths) - } catch (e: VcsException) { - exceptions.add(e) - } - } - return exceptions - } - - override fun scheduleUnversionedFilesForAddition(files: MutableList): MutableList { - val exceptions = mutableListOf() - val vcsManager = ProjectLevelVcsManager.getInstance(project) - val byRoot = mutableMapOf>() - for (file in files) { - val vcsRoot = vcsManager.getVcsRootFor(file) ?: continue - val relativePath = VfsUtilCore.getRelativePath(file, vcsRoot) ?: continue - byRoot.getOrPut(File(vcsRoot.path)) { mutableListOf() }.add(relativePath) - } - for ((workDir, paths) in byRoot) { - try { - commandLine.add(workDir, paths) - } catch (e: VcsException) { - exceptions.add(e) - } - } - return exceptions - } - - private fun groupByRoot(filePaths: List): Map> { - val vcsManager = ProjectLevelVcsManager.getInstance(project) - val byRoot = mutableMapOf>() - for (filePath in filePaths) { - val vcsRoot = vcsManager.getVcsRootFor(filePath) ?: continue - val workDir = File(vcsRoot.path) - val relativePath = workDir.toPath().relativize(File(filePath.path).toPath()).toString() - byRoot.getOrPut(workDir) { mutableListOf() }.add(relativePath) - } - return byRoot - } -} blob - /dev/null blob + 0f1813e13cbe9ec189834ba3e7bd4fcf19b8dbc7 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/actions/GotSendAction.kt @@ -0,0 +1,65 @@ +package dev.nezzontli.gotvcs.actions + +import com.intellij.notification.NotificationGroupManager +import com.intellij.notification.NotificationType +import com.intellij.openapi.actionSystem.AnAction +import com.intellij.openapi.actionSystem.AnActionEvent +import com.intellij.openapi.progress.ProgressIndicator +import com.intellij.openapi.progress.ProgressManager +import com.intellij.openapi.progress.Task +import com.intellij.openapi.project.Project +import com.intellij.openapi.vcs.ProjectLevelVcsManager +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vfs.VirtualFile +import dev.nezzontli.gotvcs.GotVcs +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +/** + * Simple menu action for `got send` (the equivalent of "push"). This does + * not hook into IntelliJ's native Push dialog (Ctrl+Shift+K): that requires + * a PushSupport backed by a full Repository/RepositoryManager model, + * comparable in size to the rest of this plugin combined. A single action + * that runs `got send` and reports the result covers the real use case + * without that complexity. + */ +class GotSendAction : AnAction() { + + override fun update(e: AnActionEvent) { + e.presentation.isEnabledAndVisible = e.project?.let { gotRoots(it).isNotEmpty() } ?: false + } + + override fun actionPerformed(e: AnActionEvent) { + val project = e.project ?: return + val roots = gotRoots(project) + if (roots.isEmpty()) return + + val commandLine = GotCommandLineWrapper() + ProgressManager.getInstance().run(object : Task.Backgroundable(project, "got send", true) { + override fun run(indicator: ProgressIndicator) { + val errors = mutableListOf() + for (root in roots) { + try { + commandLine.send(File(root.path)) + } catch (ex: VcsException) { + errors.add("${root.path}: ${ex.message}") + } + } + val group = NotificationGroupManager.getInstance().getNotificationGroup("got") + if (errors.isEmpty()) { + group.createNotification("got send: changes sent successfully", NotificationType.INFORMATION) + .notify(project) + } else { + group.createNotification("got send failed", errors.joinToString("\n"), NotificationType.ERROR) + .notify(project) + } + } + }) + } + + private fun gotRoots(project: Project): List { + val vcsManager = ProjectLevelVcsManager.getInstance(project) + val gotVcs = vcsManager.findVcsByName(GotVcs.NAME) ?: return emptyList() + return vcsManager.getRootsUnderVcs(gotVcs).toList() + } +} blob - a933f224334bbd596ce536b35ffd62d72284b7de (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotCommandLineWrapper.kt +++ /dev/null @@ -1,181 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.execution.ExecutionException -import com.intellij.execution.configurations.GeneralCommandLine -import com.intellij.execution.util.ExecUtil -import com.intellij.openapi.vcs.VcsException -import java.io.File -import java.nio.charset.StandardCharsets - -data class GotStatusEntry(val code: Char, val stagedCode: Char, val path: String) - -data class GotLogEntry(val commitId: String, val author: String, val date: String, val message: String) - -data class GotUpdateEntry(val code: Char, val path: String) - -/** - * Centraliza todas las invocaciones al binario `got`. Ruta al binario y - * SSH_AUTH_SOCK son configurables en Settings > Version Control > got - * (GotConfigurable/GotSettingsState); si no se configuran, caen a detección - * automática -- ver binaryPath()/sshAuthSock(). - */ -class GotCommandLineWrapper { - - private fun binaryPath(): String { - GotSettingsState.getInstance().gotBinaryPath.takeIf { it.isNotBlank() }?.let { return it } - val nixPath = File("/run/current-system/sw/bin/got") - return if (nixPath.canExecute()) nixPath.path else "got" - } - - /** - * Confirmado en vivo: SSH_AUTH_SOCK puede llegar null al proceso de - * IntelliJ mismo (System.getenv, no solo el snapshot cacheado de - * GeneralCommandLine) según cómo Hyprland lo haya lanzado esa sesión -- - * no es algo que este plugin pueda forzar si el valor real no existe. - * Fallback: override manual en Settings, y si tampoco está seteado, la - * ruta fija del socket ssh de gpg-agent en este sistema (uid 1000, - * único usuario). - */ - private fun sshAuthSock(): String? { - GotSettingsState.getInstance().sshAuthSock.takeIf { it.isNotBlank() }?.let { return it } - System.getenv("SSH_AUTH_SOCK")?.let { return it } - val fallback = File("/run/user/1000/gnupg/S.gpg-agent.ssh") - return if (fallback.exists()) fallback.path else null - } - - private fun run(workDir: File, vararg args: String): String { - val commandLine = GeneralCommandLine(binaryPath(), *args) - .withWorkDirectory(workDir) - .withCharset(StandardCharsets.UTF_8) - .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.SYSTEM) - sshAuthSock()?.let { commandLine.environment["SSH_AUTH_SOCK"] = it } - val output = try { - ExecUtil.execAndGetOutput(commandLine) - } catch (e: ExecutionException) { - throw VcsException("No se pudo ejecutar got ${args.joinToString(" ")}: ${e.message}", e) - } - if (output.exitCode != 0) { - throw VcsException("got ${args.joinToString(" ")} salió con código ${output.exitCode}: ${output.stderr.trim()}") - } - return output.stdout - } - - @Throws(VcsException::class) - fun status(workDir: File): List { - val output = run(workDir, "status") - return output.lineSequence() - .filter { it.isNotBlank() } - .map { line -> - val code = line[0] - val stagedCode = line.getOrElse(1) { ' ' } - val path = line.substring(minOf(3, line.length)) - GotStatusEntry(code, stagedCode, path) - } - .toList() - } - - @Throws(VcsException::class) - fun catAtBase(workDir: File, relativePath: String): String = - run(workDir, "cat", "-c", ":base", "-P", relativePath) - - @Throws(VcsException::class) - fun catAt(workDir: File, commitId: String, relativePath: String): String = - run(workDir, "cat", "-c", commitId, "-P", relativePath) - - @Throws(VcsException::class) - fun baseCommit(workDir: File): String { - val output = run(workDir, "info") - val line = output.lineSequence().firstOrNull { it.trimStart().startsWith("work tree base commit:") } - ?: throw VcsException("got info no reportó un commit base para $workDir") - return line.substringAfter("work tree base commit:").trim() - } - - @Throws(VcsException::class) - fun commit(workDir: File, message: String, paths: List) { - if (paths.isEmpty()) return - run(workDir, *(arrayOf("commit", "-m", message) + paths)) - } - - @Throws(VcsException::class) - fun add(workDir: File, paths: List) { - if (paths.isEmpty()) return - run(workDir, *(arrayOf("add") + paths)) - } - - @Throws(VcsException::class) - fun remove(workDir: File, paths: List) { - if (paths.isEmpty()) return - run(workDir, *(arrayOf("remove", "-f") + paths)) - } - - @Throws(VcsException::class) - fun revert(workDir: File, paths: List) { - if (paths.isEmpty()) return - run(workDir, *(arrayOf("revert", "-R") + paths)) - } - - /** Historial vía `got log`, formato verbose por defecto (bloques separados por líneas de guiones). */ - @Throws(VcsException::class) - fun log(workDir: File, relativePath: String?, limit: Int = 500): List { - val args = mutableListOf("log", "-l", limit.toString()) - if (relativePath != null) args.add(relativePath) - val output = run(workDir, *args.toTypedArray()) - - val entries = mutableListOf() - var commitId: String? = null - var author: String? = null - var date: String? = null - val message = StringBuilder() - - fun flush() { - val id = commitId - if (id != null) { - entries.add(GotLogEntry(id, author.orEmpty(), date.orEmpty(), message.toString().trim('\n'))) - } - commitId = null - author = null - date = null - message.setLength(0) - } - - for (line in output.lineSequence()) { - when { - line.isBlank() && commitId == null -> Unit - line.all { it == '-' } && line.isNotEmpty() -> flush() - line.startsWith("commit ") -> commitId = line.removePrefix("commit ").trim().substringBefore(' ') - line.startsWith("from: ") -> author = line.removePrefix("from: ").trim() - line.startsWith("date: ") -> date = line.removePrefix("date: ").trim() - line.startsWith(" ") -> message.appendLine(line.trimStart(' ')) - } - } - flush() - return entries - } - - @Throws(VcsException::class) - fun fetch(workDir: File) { - run(workDir, "fetch") - } - - /** `got send`: sin argumentos, usa el remoto "origin" y la rama actual del work tree. */ - @Throws(VcsException::class) - fun send(workDir: File): String = run(workDir, "send") - - /** - * `got update`, formato de estado similar a `got status` (código + 2 - * espacios + path). Cuando no hay nada que traer, got update imprime en - * cambio texto libre como "Already up-to-date" -- sin el patrón de 2 - * espacios en las posiciones 1-2, así que se descarta explícitamente en - * vez de asumir que toda línea no vacía es una entrada de estado - * (confirmado en vivo: "Already up-to-date" se parseaba como code='A', - * path="eady up-to-date"). - */ - @Throws(VcsException::class) - fun update(workDir: File): List { - val output = run(workDir, "update") - return output.lineSequence() - .filter { it.length >= 3 && it[1] == ' ' && it[2] == ' ' } - .map { line -> GotUpdateEntry(line[0], line.substring(3)) } - .toList() - } -} blob - /dev/null blob + 85113728f13e4b87713598b997529361693b4cc8 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/changes/GotChangeProvider.kt @@ -0,0 +1,76 @@ +package dev.nezzontli.gotvcs.changes + +import com.intellij.openapi.progress.ProgressIndicator +import com.intellij.openapi.vcs.FileStatus +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.changes.Change +import com.intellij.openapi.vcs.changes.ChangeListManagerGate +import com.intellij.openapi.vcs.changes.ChangeProvider +import com.intellij.openapi.vcs.changes.ChangelistBuilder +import com.intellij.openapi.vcs.changes.CurrentContentRevision +import com.intellij.openapi.vcs.changes.LocallyDeletedChange +import com.intellij.openapi.vcs.changes.VcsDirtyScope +import com.intellij.openapi.vcs.history.VcsRevisionNumber +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.vcsUtil.VcsUtil +import dev.nezzontli.gotvcs.GotVcs +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +class GotChangeProvider(private val commandLine: GotCommandLineWrapper) : ChangeProvider { + + override fun getChanges( + dirtyScope: VcsDirtyScope, + builder: ChangelistBuilder, + progress: ProgressIndicator, + addGate: ChangeListManagerGate, + ) { + for (root in dirtyScope.affectedContentRoots) { + val workDir = File(root.path) + val entries = commandLine.status(workDir) + if (entries.isEmpty()) continue + + // Resolved once per root, off the EDT: GotContentRevision cannot + // recompute it lazily, see its class-level comment. + val baseRevision: VcsRevisionNumber = try { + GotRevisionNumber(commandLine.baseCommit(workDir)) + } catch (e: VcsException) { + VcsRevisionNumber.NULL + } + + for (entry in entries) { + val absoluteFile = File(workDir, entry.path) + val filePath = VcsUtil.getFilePath(absoluteFile, false) + + when (entry.code) { + '?' -> builder.processUnversionedFile(filePath) + + '!' -> builder.processLocallyDeletedFile(LocallyDeletedChange(filePath)) + + 'M', 'm', 'C' -> { + val status = if (entry.code == 'C') FileStatus.MERGED_WITH_CONFLICTS else FileStatus.MODIFIED + val before = GotContentRevision(filePath, workDir, entry.path, commandLine, baseRevision) + val after = CurrentContentRevision(filePath) + builder.processChange(Change(before, after, status), GotVcs.getKey()) + } + + 'A' -> { + val after = CurrentContentRevision(filePath) + builder.processChange(Change(null, after, FileStatus.ADDED), GotVcs.getKey()) + } + + 'D' -> { + val before = GotContentRevision(filePath, workDir, entry.path, commandLine, baseRevision) + builder.processChange(Change(before, null, FileStatus.DELETED), GotVcs.getKey()) + } + + else -> Unit + } + } + } + } + + override fun isModifiedDocumentTrackingRequired(): Boolean = false + + override fun doCleanup(files: MutableList) = Unit +} blob - /dev/null blob + 006c64b7e625b0c137cff491b017087c3e7cc372 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/changes/GotContentRevision.kt @@ -0,0 +1,33 @@ +package dev.nezzontli.gotvcs.changes + +import com.intellij.openapi.vcs.FilePath +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.changes.ContentRevision +import com.intellij.openapi.vcs.history.VcsRevisionNumber +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +/** + * Content of a file at the work tree's base commit, via `got cat -c :base`. + * + * [revisionNumber] must be resolved ahead of time by the caller, off the EDT: + * getRevisionNumber() is invoked by the Commit tree renderer and the diff + * title, both on the UI thread, and running `got info` there would trip + * IntelliJ's "Synchronous execution on EDT" guard + * (see OSProcessHandler#checkEdtAndReadAction). + */ +class GotContentRevision( + private val filePath: FilePath, + private val workDir: File, + private val relativePath: String, + private val commandLine: GotCommandLineWrapper, + private val revisionNumber: VcsRevisionNumber, +) : ContentRevision { + + @Throws(VcsException::class) + override fun getContent(): String = commandLine.catAtBase(workDir, relativePath) + + override fun getFile(): FilePath = filePath + + override fun getRevisionNumber(): VcsRevisionNumber = revisionNumber +} blob - /dev/null blob + 1097b351c60a20e436b673d0be07a6bd890baa01 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/changes/GotDiffProvider.kt @@ -0,0 +1,64 @@ +package dev.nezzontli.gotvcs.changes + +import com.intellij.openapi.project.Project +import com.intellij.openapi.vcs.FilePath +import com.intellij.openapi.vcs.ProjectLevelVcsManager +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.changes.ContentRevision +import com.intellij.openapi.vcs.diff.DiffProvider +import com.intellij.openapi.vcs.diff.ItemLatestState +import com.intellij.openapi.vcs.history.VcsRevisionNumber +import com.intellij.openapi.vfs.VfsUtilCore +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.vcsUtil.VcsUtil +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +/** + * Feeds the modified-lines gutter and "Show Diff" actions from the work + * tree's base commit (`got info` + `got cat -c :base`). Only compares + * against the current base; comparing against arbitrary historical + * revisions is out of scope for this provider. + */ +class GotDiffProvider( + private val project: Project, + private val commandLine: GotCommandLineWrapper, +) : DiffProvider { + + private fun rootAndRelativePath(file: VirtualFile): Pair? { + val vcsRoot = ProjectLevelVcsManager.getInstance(project).getVcsRootFor(file) ?: return null + val relativePath = VfsUtilCore.getRelativePath(file, vcsRoot) ?: return null + return File(vcsRoot.path) to relativePath + } + + private fun baseRevisionOrNull(workDir: File): VcsRevisionNumber? = try { + GotRevisionNumber(commandLine.baseCommit(workDir)) + } catch (e: VcsException) { + null + } + + override fun getCurrentRevision(file: VirtualFile): VcsRevisionNumber? { + val (workDir, _) = rootAndRelativePath(file) ?: return null + return baseRevisionOrNull(workDir) + } + + override fun getLastRevision(virtualFile: VirtualFile): ItemLatestState? { + val (workDir, _) = rootAndRelativePath(virtualFile) ?: return null + val revision = baseRevisionOrNull(workDir) ?: return null + return ItemLatestState(revision, true, true) + } + + override fun getLastRevision(filePath: FilePath): ItemLatestState? { + val virtualFile = filePath.virtualFile ?: return null + return getLastRevision(virtualFile) + } + + override fun createFileContent(revisionNumber: VcsRevisionNumber, selectedFile: VirtualFile): ContentRevision? { + val (workDir, relativePath) = rootAndRelativePath(selectedFile) ?: return null + val filePath = VcsUtil.getFilePath(selectedFile) + return GotContentRevision(filePath, workDir, relativePath, commandLine, revisionNumber) + } + + override fun getLatestCommittedRevision(vcsRoot: VirtualFile): VcsRevisionNumber? = + baseRevisionOrNull(File(vcsRoot.path)) +} blob - /dev/null blob + 8ab4711169ed624d07950c94bdefe7cb3e80eb1e (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/changes/GotRevisionNumber.kt @@ -0,0 +1,12 @@ +package dev.nezzontli.gotvcs.changes + +import com.intellij.openapi.vcs.history.VcsRevisionNumber + +/** Identifies a got work tree's base commit (resolved via `got info`). */ +data class GotRevisionNumber(private val commitId: String) : VcsRevisionNumber { + + override fun asString(): String = commitId.take(12) + + override fun compareTo(other: VcsRevisionNumber?): Int = + if (other is GotRevisionNumber) commitId.compareTo(other.commitId) else -1 +} blob - 01e778b4cc412bea174886428b1f9c07e63e7ae4 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotConfigurable.kt +++ /dev/null @@ -1,69 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.options.Configurable -import com.intellij.openapi.ui.TextFieldWithBrowseButton -import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory -import com.intellij.util.ui.FormBuilder -import javax.swing.JComponent -import javax.swing.JPanel -import javax.swing.JTextField - -class GotConfigurable : Configurable { - - private var panel: JPanel? = null - private var gotBinaryField: TextFieldWithBrowseButton? = null - private var sshAuthSockField: JTextField? = null - - override fun getDisplayName(): String = "got" - - override fun createComponent(): JComponent { - val binaryField = TextFieldWithBrowseButton().apply { - addBrowseFolderListener( - "Ruta al binario got", - "Vacío para detectarlo automáticamente (/run/current-system/sw/bin/got o PATH)", - null, - FileChooserDescriptorFactory.createSingleFileDescriptor(), - ) - } - val sockField = JTextField() - - gotBinaryField = binaryField - sshAuthSockField = sockField - - val built = FormBuilder.createFormBuilder() - .addLabeledComponent("Binario got:", binaryField) - .addTooltip("Vacío para detectarlo automáticamente (/run/current-system/sw/bin/got o PATH)") - .addLabeledComponent("SSH_AUTH_SOCK:", sockField) - .addTooltip("Vacío para usar el del proceso de IntelliJ, con fallback a /run/user//gnupg/S.gpg-agent.ssh") - .addComponentFillVertically(JPanel(), 0) - .panel - - panel = built - reset() - return built - } - - override fun isModified(): Boolean { - val settings = GotSettingsState.getInstance() - return gotBinaryField?.text.orEmpty() != settings.gotBinaryPath || - sshAuthSockField?.text.orEmpty() != settings.sshAuthSock - } - - override fun apply() { - val settings = GotSettingsState.getInstance() - settings.gotBinaryPath = gotBinaryField?.text.orEmpty() - settings.sshAuthSock = sshAuthSockField?.text.orEmpty() - } - - override fun reset() { - val settings = GotSettingsState.getInstance() - gotBinaryField?.text = settings.gotBinaryPath - sshAuthSockField?.text = settings.sshAuthSock - } - - override fun disposeUIResources() { - panel = null - gotBinaryField = null - sshAuthSockField = null - } -} blob - /dev/null blob + 71cbd06edba31dd52ad4b0b3547d8f20376ce481 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/checkin/GotCheckinEnvironment.kt @@ -0,0 +1,101 @@ +package dev.nezzontli.gotvcs.checkin + +import com.intellij.openapi.project.Project +import com.intellij.openapi.vcs.FilePath +import com.intellij.openapi.vcs.ProjectLevelVcsManager +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.changes.Change +import com.intellij.openapi.vcs.changes.CommitContext +import com.intellij.openapi.vcs.checkin.CheckinEnvironment +import com.intellij.openapi.vfs.VfsUtilCore +import com.intellij.openapi.vfs.VirtualFile +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +/** + * got has no git-style staging index (aside from `got stage`, which this + * plugin does not use): instead, exactly the paths selected in the Commit + * panel are committed via `got commit -m msg `. + */ +class GotCheckinEnvironment( + private val project: Project, + private val commandLine: GotCommandLineWrapper, +) : CheckinEnvironment { + + override fun getHelpId(): String? = null + + override fun getCheckinOperationName(): String = "Commit" + + override fun isRefreshAfterCommitNeeded(): Boolean = true + + // CheckinEnvironment.commit() has three overloads with default bodies + // that delegate 2-args -> CommitContext -> NullableFunction, the last of + // which is a no-op. The platform calls the CommitContext overload + // directly rather than the 2-arg one, so both must be overridden or the + // commit silently never runs while the IDE still reports success. + override fun commit(changes: MutableList, commitMessage: String): MutableList = + doCommit(changes, commitMessage) + + override fun commit( + changes: MutableList, + commitMessage: String, + commitContext: CommitContext, + feedback: MutableSet, + ): MutableList = doCommit(changes, commitMessage) + + private fun doCommit(changes: List, commitMessage: String): MutableList { + val exceptions = mutableListOf() + val filePaths = changes.mapNotNull { it.afterRevision?.file ?: it.beforeRevision?.file } + for ((workDir, paths) in groupByRoot(filePaths)) { + try { + commandLine.commit(workDir, commitMessage, paths) + } catch (e: VcsException) { + exceptions.add(e) + } + } + return exceptions + } + + override fun scheduleMissingFileForDeletion(files: MutableList): MutableList { + val exceptions = mutableListOf() + for ((workDir, paths) in groupByRoot(files)) { + try { + commandLine.remove(workDir, paths) + } catch (e: VcsException) { + exceptions.add(e) + } + } + return exceptions + } + + override fun scheduleUnversionedFilesForAddition(files: MutableList): MutableList { + val exceptions = mutableListOf() + val vcsManager = ProjectLevelVcsManager.getInstance(project) + val byRoot = mutableMapOf>() + for (file in files) { + val vcsRoot = vcsManager.getVcsRootFor(file) ?: continue + val relativePath = VfsUtilCore.getRelativePath(file, vcsRoot) ?: continue + byRoot.getOrPut(File(vcsRoot.path)) { mutableListOf() }.add(relativePath) + } + for ((workDir, paths) in byRoot) { + try { + commandLine.add(workDir, paths) + } catch (e: VcsException) { + exceptions.add(e) + } + } + return exceptions + } + + private fun groupByRoot(filePaths: List): Map> { + val vcsManager = ProjectLevelVcsManager.getInstance(project) + val byRoot = mutableMapOf>() + for (filePath in filePaths) { + val vcsRoot = vcsManager.getVcsRootFor(filePath) ?: continue + val workDir = File(vcsRoot.path) + val relativePath = workDir.toPath().relativize(File(filePath.path).toPath()).toString() + byRoot.getOrPut(workDir) { mutableListOf() }.add(relativePath) + } + return byRoot + } +} blob - /dev/null blob + 9c6d8e8294152cae8e83f9b4a8c22c7ddbf64bc1 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/checkin/GotRollbackEnvironment.kt @@ -0,0 +1,68 @@ +package dev.nezzontli.gotvcs.checkin + +import com.intellij.openapi.project.Project +import com.intellij.openapi.vcs.FilePath +import com.intellij.openapi.vcs.ProjectLevelVcsManager +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.changes.Change +import com.intellij.openapi.vcs.rollback.RollbackEnvironment +import com.intellij.openapi.vcs.rollback.RollbackProgressListener +import com.intellij.openapi.vfs.VirtualFile +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +class GotRollbackEnvironment( + private val project: Project, + private val commandLine: GotCommandLineWrapper, +) : RollbackEnvironment { + + override fun getRollbackOperationName(): String = "Revert" + + override fun rollbackChanges( + changes: MutableList, + exceptions: MutableList, + listener: RollbackProgressListener, + ) { + listener.determinate() + val filePaths = changes.mapNotNull { it.afterRevision?.file ?: it.beforeRevision?.file } + revertPaths(filePaths, exceptions, listener) + } + + override fun rollbackMissingFileDeletion( + files: MutableList, + exceptions: MutableList, + listener: RollbackProgressListener, + ) { + listener.determinate() + revertPaths(files, exceptions, listener) + } + + override fun rollbackModifiedWithoutCheckout( + files: MutableList, + exceptions: MutableList, + listener: RollbackProgressListener, + ) = Unit + + private fun revertPaths( + filePaths: List, + exceptions: MutableList, + listener: RollbackProgressListener, + ) { + val vcsManager = ProjectLevelVcsManager.getInstance(project) + val byRoot = mutableMapOf>() + for (filePath in filePaths) { + val vcsRoot = vcsManager.getVcsRootFor(filePath) ?: continue + val workDir = File(vcsRoot.path) + val relativePath = workDir.toPath().relativize(File(filePath.path).toPath()).toString() + byRoot.getOrPut(workDir) { mutableListOf() }.add(relativePath) + } + for ((workDir, paths) in byRoot) { + try { + commandLine.revert(workDir, paths) + paths.forEach { listener.accept(File(workDir, it)) } + } catch (e: VcsException) { + exceptions.add(e) + } + } + } +} blob - 7cdb19a1b16ac2c0ad4a1bddcf2cf0c271649cdd (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotContentRevision.kt +++ /dev/null @@ -1,32 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.vcs.FilePath -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.changes.ContentRevision -import com.intellij.openapi.vcs.history.VcsRevisionNumber -import java.io.File - -/** - * Contenido de un archivo en el commit base del work tree, vía `got cat -c :base`. - * - * [revisionNumber] debe venir ya resuelto por quien construye esta instancia - * (fuera del EDT). getRevisionNumber() se llama desde el renderer del árbol - * de Commit y del título del diff, ambos en el hilo de UI: si esta clase - * ejecutara `got info` ahí mismo, IntelliJ lo reporta como "Synchronous - * execution on EDT" (ver OSProcessHandler#checkEdtAndReadAction). - */ -class GotContentRevision( - private val filePath: FilePath, - private val workDir: File, - private val relativePath: String, - private val commandLine: GotCommandLineWrapper, - private val revisionNumber: VcsRevisionNumber, -) : ContentRevision { - - @Throws(VcsException::class) - override fun getContent(): String = commandLine.catAtBase(workDir, relativePath) - - override fun getFile(): FilePath = filePath - - override fun getRevisionNumber(): VcsRevisionNumber = revisionNumber -} blob - /dev/null blob + abc3903426b56dde246cb7d78df9fa3e99f74036 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/cli/GotCommandLineWrapper.kt @@ -0,0 +1,175 @@ +package dev.nezzontli.gotvcs.cli + +import com.intellij.execution.ExecutionException +import com.intellij.execution.configurations.GeneralCommandLine +import com.intellij.execution.util.ExecUtil +import com.intellij.openapi.vcs.VcsException +import dev.nezzontli.gotvcs.settings.GotSettingsState +import java.io.File +import java.nio.charset.StandardCharsets + +data class GotStatusEntry(val code: Char, val stagedCode: Char, val path: String) + +data class GotLogEntry(val commitId: String, val author: String, val date: String, val message: String) + +data class GotUpdateEntry(val code: Char, val path: String) + +/** + * Central entry point for every invocation of the `got` binary. The binary + * path and SSH_AUTH_SOCK are configurable in Settings > Version Control > + * got; when left blank they fall back to automatic detection. + */ +class GotCommandLineWrapper { + + private fun binaryPath(): String { + GotSettingsState.getInstance().gotBinaryPath.takeIf { it.isNotBlank() }?.let { return it } + val nixPath = File("/run/current-system/sw/bin/got") + return if (nixPath.canExecute()) nixPath.path else "got" + } + + /** + * SSH_AUTH_SOCK is not guaranteed to be present in the IDE process's own + * environment (it depends on how the desktop session launched it), and + * that can break `got fetch`/`got send` over SSH even when an agent is + * running. Falls back to a manual override, then to the conventional + * gpg-agent SSH socket path for the current user. + */ + private fun sshAuthSock(): String? { + GotSettingsState.getInstance().sshAuthSock.takeIf { it.isNotBlank() }?.let { return it } + System.getenv("SSH_AUTH_SOCK")?.let { return it } + val fallback = File("/run/user/1000/gnupg/S.gpg-agent.ssh") + return if (fallback.exists()) fallback.path else null + } + + private fun run(workDir: File, vararg args: String): String { + val commandLine = GeneralCommandLine(binaryPath(), *args) + .withWorkDirectory(workDir) + .withCharset(StandardCharsets.UTF_8) + .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.SYSTEM) + sshAuthSock()?.let { commandLine.environment["SSH_AUTH_SOCK"] = it } + val output = try { + ExecUtil.execAndGetOutput(commandLine) + } catch (e: ExecutionException) { + throw VcsException("Could not run got ${args.joinToString(" ")}: ${e.message}", e) + } + if (output.exitCode != 0) { + throw VcsException("got ${args.joinToString(" ")} exited with ${output.exitCode}: ${output.stderr.trim()}") + } + return output.stdout + } + + @Throws(VcsException::class) + fun status(workDir: File): List { + val output = run(workDir, "status") + return output.lineSequence() + .filter { it.isNotBlank() } + .map { line -> + val code = line[0] + val stagedCode = line.getOrElse(1) { ' ' } + val path = line.substring(minOf(3, line.length)) + GotStatusEntry(code, stagedCode, path) + } + .toList() + } + + @Throws(VcsException::class) + fun catAtBase(workDir: File, relativePath: String): String = + run(workDir, "cat", "-c", ":base", "-P", relativePath) + + @Throws(VcsException::class) + fun catAt(workDir: File, commitId: String, relativePath: String): String = + run(workDir, "cat", "-c", commitId, "-P", relativePath) + + @Throws(VcsException::class) + fun baseCommit(workDir: File): String { + val output = run(workDir, "info") + val line = output.lineSequence().firstOrNull { it.trimStart().startsWith("work tree base commit:") } + ?: throw VcsException("got info did not report a base commit for $workDir") + return line.substringAfter("work tree base commit:").trim() + } + + @Throws(VcsException::class) + fun commit(workDir: File, message: String, paths: List) { + if (paths.isEmpty()) return + run(workDir, *(arrayOf("commit", "-m", message) + paths)) + } + + @Throws(VcsException::class) + fun add(workDir: File, paths: List) { + if (paths.isEmpty()) return + run(workDir, *(arrayOf("add") + paths)) + } + + @Throws(VcsException::class) + fun remove(workDir: File, paths: List) { + if (paths.isEmpty()) return + run(workDir, *(arrayOf("remove", "-f") + paths)) + } + + @Throws(VcsException::class) + fun revert(workDir: File, paths: List) { + if (paths.isEmpty()) return + run(workDir, *(arrayOf("revert", "-R") + paths)) + } + + /** `got log` default verbose format: blocks separated by dashed lines. */ + @Throws(VcsException::class) + fun log(workDir: File, relativePath: String?, limit: Int = 500): List { + val args = mutableListOf("log", "-l", limit.toString()) + if (relativePath != null) args.add(relativePath) + val output = run(workDir, *args.toTypedArray()) + + val entries = mutableListOf() + var commitId: String? = null + var author: String? = null + var date: String? = null + val message = StringBuilder() + + fun flush() { + val id = commitId + if (id != null) { + entries.add(GotLogEntry(id, author.orEmpty(), date.orEmpty(), message.toString().trim('\n'))) + } + commitId = null + author = null + date = null + message.setLength(0) + } + + for (line in output.lineSequence()) { + when { + line.isBlank() && commitId == null -> Unit + line.all { it == '-' } && line.isNotEmpty() -> flush() + line.startsWith("commit ") -> commitId = line.removePrefix("commit ").trim().substringBefore(' ') + line.startsWith("from: ") -> author = line.removePrefix("from: ").trim() + line.startsWith("date: ") -> date = line.removePrefix("date: ").trim() + line.startsWith(" ") -> message.appendLine(line.trimStart(' ')) + } + } + flush() + return entries + } + + @Throws(VcsException::class) + fun fetch(workDir: File) { + run(workDir, "fetch") + } + + /** With no arguments, `got send` targets the "origin" remote and the work tree's current branch. */ + @Throws(VcsException::class) + fun send(workDir: File): String = run(workDir, "send") + + /** + * `got update` status lines share `got status`'s "code + 2 spaces + path" + * format, but a no-op update instead prints a free-text line such as + * "Already up-to-date" that must not be mistaken for a status entry. + */ + @Throws(VcsException::class) + fun update(workDir: File): List { + val output = run(workDir, "update") + return output.lineSequence() + .filter { it.length >= 3 && it[1] == ' ' && it[2] == ' ' } + .map { line -> GotUpdateEntry(line[0], line.substring(3)) } + .toList() + } +} blob - 1245cdbfb0ead63162a8a1aeec2554002161dee7 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotDiffProvider.kt +++ /dev/null @@ -1,63 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.project.Project -import com.intellij.openapi.vcs.FilePath -import com.intellij.openapi.vcs.ProjectLevelVcsManager -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.changes.ContentRevision -import com.intellij.openapi.vcs.diff.DiffProvider -import com.intellij.openapi.vcs.diff.ItemLatestState -import com.intellij.openapi.vcs.history.VcsRevisionNumber -import com.intellij.openapi.vfs.VfsUtilCore -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.vcsUtil.VcsUtil -import java.io.File - -/** - * Alimenta el gutter de líneas modificadas y las acciones "Show Diff" a - * partir del commit base del work tree (`got info` + `got cat -c :base`). - * Solo compara contra la base actual; comparar contra revisiones históricas - * arbitrarias queda para la Fase 5 (historial). - */ -class GotDiffProvider( - private val project: Project, - private val commandLine: GotCommandLineWrapper, -) : DiffProvider { - - private fun rootAndRelativePath(file: VirtualFile): Pair? { - val vcsRoot = ProjectLevelVcsManager.getInstance(project).getVcsRootFor(file) ?: return null - val relativePath = VfsUtilCore.getRelativePath(file, vcsRoot) ?: return null - return File(vcsRoot.path) to relativePath - } - - private fun baseRevisionOrNull(workDir: File): VcsRevisionNumber? = try { - GotRevisionNumber(commandLine.baseCommit(workDir)) - } catch (e: VcsException) { - null - } - - override fun getCurrentRevision(file: VirtualFile): VcsRevisionNumber? { - val (workDir, _) = rootAndRelativePath(file) ?: return null - return baseRevisionOrNull(workDir) - } - - override fun getLastRevision(virtualFile: VirtualFile): ItemLatestState? { - val (workDir, _) = rootAndRelativePath(virtualFile) ?: return null - val revision = baseRevisionOrNull(workDir) ?: return null - return ItemLatestState(revision, true, true) - } - - override fun getLastRevision(filePath: FilePath): ItemLatestState? { - val virtualFile = filePath.virtualFile ?: return null - return getLastRevision(virtualFile) - } - - override fun createFileContent(revisionNumber: VcsRevisionNumber, selectedFile: VirtualFile): ContentRevision? { - val (workDir, relativePath) = rootAndRelativePath(selectedFile) ?: return null - val filePath = VcsUtil.getFilePath(selectedFile) - return GotContentRevision(filePath, workDir, relativePath, commandLine, revisionNumber) - } - - override fun getLatestCommittedRevision(vcsRoot: VirtualFile): VcsRevisionNumber? = - baseRevisionOrNull(File(vcsRoot.path)) -} blob - /dev/null blob + c414081a7f02630f421091f93a84a3deec66fc6e (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/history/GotFileRevision.kt @@ -0,0 +1,47 @@ +package dev.nezzontli.gotvcs.history + +import com.intellij.openapi.vcs.RepositoryLocation +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.history.VcsFileRevision +import com.intellij.openapi.vcs.history.VcsRevisionNumber +import dev.nezzontli.gotvcs.changes.GotRevisionNumber +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import dev.nezzontli.gotvcs.cli.GotLogEntry +import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +/** A single `got log` entry adapted to IntelliJ's history model. */ +class GotFileRevision( + private val workDir: File, + private val relativePath: String, + private val commandLine: GotCommandLineWrapper, + private val entry: GotLogEntry, +) : VcsFileRevision { + + // `got log` date format, e.g. "Thu Jul 23 05:30:12 2026 UTC". + private val dateFormat = SimpleDateFormat("EEE MMM d HH:mm:ss yyyy zzz", Locale.US) + + override fun getRevisionNumber(): VcsRevisionNumber = GotRevisionNumber(entry.commitId) + + override fun getRevisionDate(): Date = try { + dateFormat.parse(entry.date) + } catch (e: Exception) { + Date(0) + } + + override fun getAuthor(): String = entry.author + + override fun getCommitMessage(): String = entry.message + + override fun getBranchName(): String? = null + + override fun getChangedRepositoryPath(): RepositoryLocation? = null + + @Throws(VcsException::class) + override fun loadContent(): ByteArray = getContent() + + @Throws(VcsException::class) + override fun getContent(): ByteArray = commandLine.catAt(workDir, entry.commitId, relativePath).toByteArray() +} blob - /dev/null blob + d5268e7cd4f7a064ae7419da696ad9276295d487 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/history/GotVcsHistoryProvider.kt @@ -0,0 +1,96 @@ +package dev.nezzontli.gotvcs.history + +import com.intellij.openapi.actionSystem.AnAction +import com.intellij.openapi.diagnostic.Logger +import com.intellij.openapi.project.Project +import com.intellij.openapi.vcs.FilePath +import com.intellij.openapi.vcs.ProjectLevelVcsManager +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.history.DiffFromHistoryHandler +import com.intellij.openapi.vcs.history.VcsAppendableHistorySessionPartner +import com.intellij.openapi.vcs.history.VcsDependentHistoryComponents +import com.intellij.openapi.vcs.history.VcsFileRevision +import com.intellij.openapi.vcs.history.VcsHistoryProvider +import com.intellij.openapi.vcs.history.VcsHistorySession +import com.intellij.openapi.vfs.VfsUtilCore +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.util.ui.ColumnInfo +import dev.nezzontli.gotvcs.changes.GotRevisionNumber +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +class GotVcsHistoryProvider( + private val project: Project, + private val commandLine: GotCommandLineWrapper, +) : VcsHistoryProvider { + + private val logger = Logger.getInstance(GotVcsHistoryProvider::class.java) + + override fun getUICustomization(session: VcsHistorySession, forShortcutRegistration: javax.swing.JComponent) = + VcsDependentHistoryComponents.createOnlyColumns(emptyArray>()) + + override fun getAdditionalActions(refresher: Runnable): Array = emptyArray() + + override fun isDateOmittable(): Boolean = false + + override fun getHelpId(): String? = null + + override fun supportsHistoryForDirectories(): Boolean = true + + override fun getHistoryDiffHandler(): DiffFromHistoryHandler? = null + + override fun canShowHistoryFor(virtualFile: VirtualFile): Boolean = true + + private data class RootAndPath(val workDir: File, val relativePath: String) + + @Throws(VcsException::class) + private fun resolveRootAndPath(filePath: FilePath): RootAndPath { + val vcsRoot = ProjectLevelVcsManager.getInstance(project).getVcsRootFor(filePath) + ?: throw VcsException("$filePath does not belong to any got work tree") + val workDir = File(vcsRoot.path) + val relativePath = VfsUtilCore.getRelativePath(filePath.virtualFile ?: vcsRoot, vcsRoot) + ?: throw VcsException("Could not resolve the relative path of $filePath under $workDir") + return RootAndPath(workDir, relativePath) + } + + @Throws(VcsException::class) + override fun createSessionFor(filePath: FilePath): VcsHistorySession { + try { + val (workDir, relativePath) = resolveRootAndPath(filePath) + val entries = commandLine.log(workDir, relativePath.ifEmpty { null }) + val revisions: List = entries.map { GotFileRevision(workDir, relativePath, commandLine, it) } + val baseRevision = GotRevisionNumber(commandLine.baseCommit(workDir)) + return GotVcsHistorySession(revisions, baseRevision) + } catch (e: VcsException) { + throw e + } catch (e: Exception) { + logger.warn("Failed to build got history for $filePath", e) + throw VcsException("${e.javaClass.simpleName}: ${e.message ?: "no message"}", e) + } + } + + @Throws(VcsException::class) + override fun reportAppendableHistory(filePath: FilePath, partner: VcsAppendableHistorySessionPartner) { + try { + val (workDir, relativePath) = resolveRootAndPath(filePath) + val baseRevision = GotRevisionNumber(commandLine.baseCommit(workDir)) + + // reportCreatedEmptySession expects a session with no revisions + // yet: partner.acceptRevision() below appends to that same + // session on its own, so passing an already-populated one here + // would duplicate every entry. + val session = GotVcsHistorySession(emptyList(), baseRevision) + partner.reportCreatedEmptySession(session) + + val entries = commandLine.log(workDir, relativePath.ifEmpty { null }) + for (entry in entries) { + partner.acceptRevision(GotFileRevision(workDir, relativePath, commandLine, entry)) + } + } catch (e: VcsException) { + partner.reportException(e) + } catch (e: Exception) { + logger.warn("Failed to build got history (appendable) for $filePath", e) + partner.reportException(VcsException("${e.javaClass.simpleName}: ${e.message ?: "no message"}", e)) + } + } +} blob - /dev/null blob + 94f5b02ecfabb113946542ed025647a6898c1fa1 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/history/GotVcsHistorySession.kt @@ -0,0 +1,16 @@ +package dev.nezzontli.gotvcs.history + +import com.intellij.openapi.vcs.history.VcsAbstractHistorySession +import com.intellij.openapi.vcs.history.VcsFileRevision +import com.intellij.openapi.vcs.history.VcsHistorySession +import com.intellij.openapi.vcs.history.VcsRevisionNumber + +class GotVcsHistorySession( + revisions: List, + private val baseRevision: VcsRevisionNumber, +) : VcsAbstractHistorySession(revisions, baseRevision) { + + override fun calcCurrentRevisionNumber(): VcsRevisionNumber = baseRevision + + override fun copy(): VcsHistorySession = GotVcsHistorySession(revisionList, baseRevision) +} blob - 16059e116fbd373039f1808615f71b732dd0aef5 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotFileRevision.kt +++ /dev/null @@ -1,44 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.vcs.RepositoryLocation -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.history.VcsFileRevision -import com.intellij.openapi.vcs.history.VcsRevisionNumber -import java.io.File -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale - -/** Una entrada de `got log` adaptada al modelo de historial de IntelliJ. */ -class GotFileRevision( - private val workDir: File, - private val relativePath: String, - private val commandLine: GotCommandLineWrapper, - private val entry: GotLogEntry, -) : VcsFileRevision { - - // Formato real de `got log`: "Thu Jul 23 05:30:12 2026 UTC". - private val dateFormat = SimpleDateFormat("EEE MMM d HH:mm:ss yyyy zzz", Locale.US) - - override fun getRevisionNumber(): VcsRevisionNumber = GotRevisionNumber(entry.commitId) - - override fun getRevisionDate(): Date = try { - dateFormat.parse(entry.date) - } catch (e: Exception) { - Date(0) - } - - override fun getAuthor(): String = entry.author - - override fun getCommitMessage(): String = entry.message - - override fun getBranchName(): String? = null - - override fun getChangedRepositoryPath(): RepositoryLocation? = null - - @Throws(VcsException::class) - override fun loadContent(): ByteArray = getContent() - - @Throws(VcsException::class) - override fun getContent(): ByteArray = commandLine.catAt(workDir, entry.commitId, relativePath).toByteArray() -} blob - /dev/null blob + dd8cb689251e19e7306caf7c175a125ff8a347dc (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/roots/GotVcsRootChecker.kt @@ -0,0 +1,16 @@ +package dev.nezzontli.gotvcs.roots + +import com.intellij.openapi.vcs.VcsKey +import com.intellij.openapi.vcs.VcsRootChecker +import com.intellij.openapi.vfs.VirtualFile +import dev.nezzontli.gotvcs.GotVcs +import java.io.File + +class GotVcsRootChecker : VcsRootChecker() { + + override fun getSupportedVcs(): VcsKey = GotVcs.getKey() + + override fun isRoot(file: VirtualFile): Boolean = File(file.path, ".got").isDirectory + + override fun isVcsDir(path: String): Boolean = path == ".got" +} blob - 3a7eed70de7a0f802b493ff624bccb5d3e125ad8 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotRevisionNumber.kt +++ /dev/null @@ -1,12 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.vcs.history.VcsRevisionNumber - -/** Identifica el commit base de un work tree got (hash resuelto vía `got info`). */ -data class GotRevisionNumber(private val commitId: String) : VcsRevisionNumber { - - override fun asString(): String = commitId.take(12) - - override fun compareTo(other: VcsRevisionNumber?): Int = - if (other is GotRevisionNumber) commitId.compareTo(other.commitId) else -1 -} blob - /dev/null blob + 8dbf450eb2c15596129a602f1a977b45f45d3037 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/settings/GotConfigurable.kt @@ -0,0 +1,69 @@ +package dev.nezzontli.gotvcs.settings + +import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory +import com.intellij.openapi.options.Configurable +import com.intellij.openapi.ui.TextFieldWithBrowseButton +import com.intellij.util.ui.FormBuilder +import javax.swing.JComponent +import javax.swing.JPanel +import javax.swing.JTextField + +class GotConfigurable : Configurable { + + private var panel: JPanel? = null + private var gotBinaryField: TextFieldWithBrowseButton? = null + private var sshAuthSockField: JTextField? = null + + override fun getDisplayName(): String = "got" + + override fun createComponent(): JComponent { + val binaryField = TextFieldWithBrowseButton().apply { + addBrowseFolderListener( + "got Binary Path", + "Leave empty to auto-detect (/run/current-system/sw/bin/got or PATH)", + null, + FileChooserDescriptorFactory.createSingleFileDescriptor(), + ) + } + val sockField = JTextField() + + gotBinaryField = binaryField + sshAuthSockField = sockField + + val built = FormBuilder.createFormBuilder() + .addLabeledComponent("got binary:", binaryField) + .addTooltip("Leave empty to auto-detect (/run/current-system/sw/bin/got or PATH)") + .addLabeledComponent("SSH_AUTH_SOCK:", sockField) + .addTooltip("Leave empty to use the IDE process's own value, falling back to /run/user//gnupg/S.gpg-agent.ssh") + .addComponentFillVertically(JPanel(), 0) + .panel + + panel = built + reset() + return built + } + + override fun isModified(): Boolean { + val settings = GotSettingsState.getInstance() + return gotBinaryField?.text.orEmpty() != settings.gotBinaryPath || + sshAuthSockField?.text.orEmpty() != settings.sshAuthSock + } + + override fun apply() { + val settings = GotSettingsState.getInstance() + settings.gotBinaryPath = gotBinaryField?.text.orEmpty() + settings.sshAuthSock = sshAuthSockField?.text.orEmpty() + } + + override fun reset() { + val settings = GotSettingsState.getInstance() + gotBinaryField?.text = settings.gotBinaryPath + sshAuthSockField?.text = settings.sshAuthSock + } + + override fun disposeUIResources() { + panel = null + gotBinaryField = null + sshAuthSockField = null + } +} blob - /dev/null blob + b3b5af61e269b1d437f53e6952340155efa4b162 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/settings/GotSettingsState.kt @@ -0,0 +1,32 @@ +package dev.nezzontli.gotvcs.settings + +import com.intellij.openapi.application.ApplicationManager +import com.intellij.openapi.components.PersistentStateComponent +import com.intellij.openapi.components.State +import com.intellij.openapi.components.Storage +import com.intellij.util.xmlb.XmlSerializerUtil + +/** + * Configurable paths from Settings > Version Control > got. An empty string + * means "use automatic detection" (see GotCommandLineWrapper): the got + * binary in /run/current-system/sw/bin/got or PATH, and SSH_AUTH_SOCK from + * the environment or the conventional gpg-agent socket path. + */ +@State(name = "GotVcsSettings", storages = [Storage("gotvcs.xml")]) +class GotSettingsState : PersistentStateComponent { + + var gotBinaryPath: String = "" + var sshAuthSock: String = "" + + override fun getState(): GotSettingsState = this + + override fun loadState(state: GotSettingsState) { + XmlSerializerUtil.copyBean(state, this) + } + + companion object { + @JvmStatic + fun getInstance(): GotSettingsState = + ApplicationManager.getApplication().getService(GotSettingsState::class.java) + } +} blob - 872fb3d6af72f071f2821499de70d42b52630165 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotRollbackEnvironment.kt +++ /dev/null @@ -1,67 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.project.Project -import com.intellij.openapi.vcs.FilePath -import com.intellij.openapi.vcs.ProjectLevelVcsManager -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.changes.Change -import com.intellij.openapi.vcs.rollback.RollbackEnvironment -import com.intellij.openapi.vcs.rollback.RollbackProgressListener -import com.intellij.openapi.vfs.VirtualFile -import java.io.File - -class GotRollbackEnvironment( - private val project: Project, - private val commandLine: GotCommandLineWrapper, -) : RollbackEnvironment { - - override fun getRollbackOperationName(): String = "Revert" - - override fun rollbackChanges( - changes: MutableList, - exceptions: MutableList, - listener: RollbackProgressListener, - ) { - listener.determinate() - val filePaths = changes.mapNotNull { it.afterRevision?.file ?: it.beforeRevision?.file } - revertPaths(filePaths, exceptions, listener) - } - - override fun rollbackMissingFileDeletion( - files: MutableList, - exceptions: MutableList, - listener: RollbackProgressListener, - ) { - listener.determinate() - revertPaths(files, exceptions, listener) - } - - override fun rollbackModifiedWithoutCheckout( - files: MutableList, - exceptions: MutableList, - listener: RollbackProgressListener, - ) = Unit - - private fun revertPaths( - filePaths: List, - exceptions: MutableList, - listener: RollbackProgressListener, - ) { - val vcsManager = ProjectLevelVcsManager.getInstance(project) - val byRoot = mutableMapOf>() - for (filePath in filePaths) { - val vcsRoot = vcsManager.getVcsRootFor(filePath) ?: continue - val workDir = File(vcsRoot.path) - val relativePath = workDir.toPath().relativize(File(filePath.path).toPath()).toString() - byRoot.getOrPut(workDir) { mutableListOf() }.add(relativePath) - } - for ((workDir, paths) in byRoot) { - try { - commandLine.revert(workDir, paths) - paths.forEach { listener.accept(File(workDir, it)) } - } catch (e: VcsException) { - exceptions.add(e) - } - } - } -} blob - /dev/null blob + 14ac37f163aa2b2e48e77511a3e4a734425681ab (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/update/GotUpdateEnvironment.kt @@ -0,0 +1,67 @@ +package dev.nezzontli.gotvcs.update + +import com.intellij.openapi.options.Configurable +import com.intellij.openapi.progress.ProgressIndicator +import com.intellij.openapi.util.Ref +import com.intellij.openapi.vcs.FilePath +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.update.FileGroup +import com.intellij.openapi.vcs.update.SequentialUpdatesContext +import com.intellij.openapi.vcs.update.UpdateEnvironment +import com.intellij.openapi.vcs.update.UpdateSession +import com.intellij.openapi.vcs.update.UpdatedFiles +import dev.nezzontli.gotvcs.GotVcs +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import java.io.File + +/** + * "Update Project" runs `got fetch` (best-effort: got.conf may not have a + * remote configured) followed by `got update` for each selected root. + */ +class GotUpdateEnvironment(private val commandLine: GotCommandLineWrapper) : UpdateEnvironment { + + override fun fillGroups(updatedFiles: UpdatedFiles) = Unit + + override fun updateDirectories( + contentRoots: Array, + updatedFiles: UpdatedFiles, + progressIndicator: ProgressIndicator, + context: Ref, + ): UpdateSession { + val exceptions = mutableListOf() + val workDirs = contentRoots.map { File(it.path) }.distinct() + + for (workDir in workDirs) { + try { + commandLine.fetch(workDir) + } catch (e: VcsException) { + exceptions.add(e) + } + + try { + for (entry in commandLine.update(workDir)) { + val groupId = when (entry.code) { + 'U', 'G' -> FileGroup.UPDATED_ID + 'C', '#' -> FileGroup.MERGED_WITH_CONFLICT_ID + 'D' -> FileGroup.REMOVED_FROM_REPOSITORY_ID + 'A', '!' -> FileGroup.CREATED_ID + else -> continue + } + updatedFiles.getGroupById(groupId)?.add( + File(workDir, entry.path).path, + GotVcs.getKey(), + null, + ) + } + } catch (e: VcsException) { + exceptions.add(e) + } + } + + return GotUpdateSession(exceptions) + } + + override fun createConfigurable(files: MutableCollection): Configurable? = null + + override fun validateOptions(files: MutableCollection): Boolean = true +} blob - /dev/null blob + fdbf45ca0d5a46ef1cf633d4983c41ef402f9021 (mode 644) --- /dev/null +++ src/main/kotlin/dev/nezzontli/gotvcs/update/GotUpdateSession.kt @@ -0,0 +1,13 @@ +package dev.nezzontli.gotvcs.update + +import com.intellij.openapi.vcs.VcsException +import com.intellij.openapi.vcs.update.UpdateSession + +class GotUpdateSession(private val exceptions: MutableList) : UpdateSession { + + override fun getExceptions(): MutableList = exceptions + + override fun onRefreshFilesCompleted() = Unit + + override fun isCanceled(): Boolean = false +} blob - 6e656dc9c116d792c9b8f256e6048c9e83649b96 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotSendAction.kt +++ /dev/null @@ -1,63 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.notification.NotificationGroupManager -import com.intellij.notification.NotificationType -import com.intellij.openapi.actionSystem.AnAction -import com.intellij.openapi.actionSystem.AnActionEvent -import com.intellij.openapi.progress.ProgressIndicator -import com.intellij.openapi.progress.ProgressManager -import com.intellij.openapi.progress.Task -import com.intellij.openapi.project.Project -import com.intellij.openapi.vcs.ProjectLevelVcsManager -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vfs.VirtualFile -import java.io.File - -/** - * Acción simple de menú para "got send" (el equivalente a "push"). No usa el - * diálogo nativo de Push de IntelliJ (Ctrl+Shift+K): eso requiere un - * PushSupport respaldado por Repository/RepositoryManager completos, similar - * en tamaño a todo lo demás de este plugin junto. Un botón que corre - * `got send` y reporta el resultado cubre el caso de uso real sin esa - * complejidad. - */ -class GotSendAction : AnAction() { - - override fun update(e: AnActionEvent) { - e.presentation.isEnabledAndVisible = e.project?.let { gotRoots(it).isNotEmpty() } ?: false - } - - override fun actionPerformed(e: AnActionEvent) { - val project = e.project ?: return - val roots = gotRoots(project) - if (roots.isEmpty()) return - - val commandLine = GotCommandLineWrapper() - ProgressManager.getInstance().run(object : Task.Backgroundable(project, "got send", true) { - override fun run(indicator: ProgressIndicator) { - val errors = mutableListOf() - for (root in roots) { - try { - commandLine.send(File(root.path)) - } catch (ex: VcsException) { - errors.add("${root.path}: ${ex.message}") - } - } - val group = NotificationGroupManager.getInstance().getNotificationGroup("got") - if (errors.isEmpty()) { - group.createNotification("got send: cambios enviados correctamente", NotificationType.INFORMATION) - .notify(project) - } else { - group.createNotification("got send falló", errors.joinToString("\n"), NotificationType.ERROR) - .notify(project) - } - } - }) - } - - private fun gotRoots(project: Project): List { - val vcsManager = ProjectLevelVcsManager.getInstance(project) - val gotVcs = vcsManager.findVcsByName(GotVcs.NAME) ?: return emptyList() - return vcsManager.getRootsUnderVcs(gotVcs).toList() - } -} blob - 59f56f981c62253964510e70eb413f50399c20c0 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotSettingsState.kt +++ /dev/null @@ -1,32 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.PersistentStateComponent -import com.intellij.openapi.components.State -import com.intellij.openapi.components.Storage -import com.intellij.util.xmlb.XmlSerializerUtil - -/** - * Rutas configurables desde Settings > Version Control > got. Vacío ("") - * significa "usar la detección automática" (ver GotCommandLineWrapper): - * binario got en /run/current-system/sw/bin/got o PATH, y SSH_AUTH_SOCK de - * System.getenv() o el socket fijo de gpg-agent. - */ -@State(name = "GotVcsSettings", storages = [Storage("gotvcs.xml")]) -class GotSettingsState : PersistentStateComponent { - - var gotBinaryPath: String = "" - var sshAuthSock: String = "" - - override fun getState(): GotSettingsState = this - - override fun loadState(state: GotSettingsState) { - XmlSerializerUtil.copyBean(state, this) - } - - companion object { - @JvmStatic - fun getInstance(): GotSettingsState = - ApplicationManager.getApplication().getService(GotSettingsState::class.java) - } -} blob - 603a30cd5a03c463712bb3314ece4eb4115a207d (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotUpdateEnvironment.kt +++ /dev/null @@ -1,66 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.options.Configurable -import com.intellij.openapi.progress.ProgressIndicator -import com.intellij.openapi.util.Ref -import com.intellij.openapi.vcs.FilePath -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.update.FileGroup -import com.intellij.openapi.vcs.update.SequentialUpdatesContext -import com.intellij.openapi.vcs.update.UpdateEnvironment -import com.intellij.openapi.vcs.update.UpdateSession -import com.intellij.openapi.vcs.update.UpdatedFiles -import java.io.File - -/** - * "Update Project" en IntelliJ ejecuta `got fetch` (best-effort: got.conf - * puede no tener un remoto configurado) seguido de `got update` sobre cada - * raíz seleccionada. - */ -class GotUpdateEnvironment(private val commandLine: GotCommandLineWrapper) : UpdateEnvironment { - - override fun fillGroups(updatedFiles: UpdatedFiles) = Unit - - override fun updateDirectories( - contentRoots: Array, - updatedFiles: UpdatedFiles, - progressIndicator: ProgressIndicator, - context: Ref, - ): UpdateSession { - val exceptions = mutableListOf() - val workDirs = contentRoots.map { File(it.path) }.distinct() - - for (workDir in workDirs) { - try { - commandLine.fetch(workDir) - } catch (e: VcsException) { - exceptions.add(e) - } - - try { - for (entry in commandLine.update(workDir)) { - val groupId = when (entry.code) { - 'U', 'G' -> FileGroup.UPDATED_ID - 'C', '#' -> FileGroup.MERGED_WITH_CONFLICT_ID - 'D' -> FileGroup.REMOVED_FROM_REPOSITORY_ID - 'A', '!' -> FileGroup.CREATED_ID - else -> continue - } - updatedFiles.getGroupById(groupId)?.add( - File(workDir, entry.path).path, - GotVcs.getKey(), - null, - ) - } - } catch (e: VcsException) { - exceptions.add(e) - } - } - - return GotUpdateSession(exceptions) - } - - override fun createConfigurable(files: MutableCollection): Configurable? = null - - override fun validateOptions(files: MutableCollection): Boolean = true -} blob - 6896e018526e2496a89dedb5757f2667ef065a50 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotUpdateSession.kt +++ /dev/null @@ -1,13 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.update.UpdateSession - -class GotUpdateSession(private val exceptions: MutableList) : UpdateSession { - - override fun getExceptions(): MutableList = exceptions - - override fun onRefreshFilesCompleted() = Unit - - override fun isCanceled(): Boolean = false -} blob - b433f08749a4b14d51e376f06d541a91dca5ac13 blob + 358dae35996c95b4d204e975b6f21afe773eb24b --- src/main/kotlin/dev/nezzontli/gotvcs/GotVcs.kt +++ src/main/kotlin/dev/nezzontli/gotvcs/GotVcs.kt @@ -9,6 +9,13 @@ import com.intellij.openapi.vcs.diff.DiffProvider import com.intellij.openapi.vcs.history.VcsHistoryProvider import com.intellij.openapi.vcs.rollback.RollbackEnvironment import com.intellij.openapi.vcs.update.UpdateEnvironment +import dev.nezzontli.gotvcs.checkin.GotCheckinEnvironment +import dev.nezzontli.gotvcs.checkin.GotRollbackEnvironment +import dev.nezzontli.gotvcs.changes.GotChangeProvider +import dev.nezzontli.gotvcs.changes.GotDiffProvider +import dev.nezzontli.gotvcs.cli.GotCommandLineWrapper +import dev.nezzontli.gotvcs.history.GotVcsHistoryProvider +import dev.nezzontli.gotvcs.update.GotUpdateEnvironment class GotVcs(project: Project) : AbstractVcs(project, NAME) { blob - e6572e0008c33ec6c557a72a89cce41f06cdb511 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotVcsHistoryProvider.kt +++ /dev/null @@ -1,99 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.actionSystem.AnAction -import com.intellij.openapi.project.Project -import com.intellij.openapi.vcs.FilePath -import com.intellij.openapi.vcs.ProjectLevelVcsManager -import com.intellij.openapi.vcs.VcsException -import com.intellij.openapi.vcs.history.DiffFromHistoryHandler -import com.intellij.openapi.vcs.history.VcsAppendableHistorySessionPartner -import com.intellij.openapi.vcs.history.VcsDependentHistoryComponents -import com.intellij.openapi.vcs.history.VcsFileRevision -import com.intellij.openapi.vcs.history.VcsHistoryProvider -import com.intellij.openapi.vcs.history.VcsHistorySession -import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.vfs.VfsUtilCore -import com.intellij.util.ui.ColumnInfo -import java.io.File - -class GotVcsHistoryProvider( - private val project: Project, - private val commandLine: GotCommandLineWrapper, -) : VcsHistoryProvider { - - private val LOG = Logger.getInstance(GotVcsHistoryProvider::class.java) - - override fun getUICustomization(session: VcsHistorySession, forShortcutRegistration: javax.swing.JComponent) = - VcsDependentHistoryComponents.createOnlyColumns(emptyArray>()) - - override fun getAdditionalActions(refresher: Runnable): Array = emptyArray() - - override fun isDateOmittable(): Boolean = false - - override fun getHelpId(): String? = null - - override fun supportsHistoryForDirectories(): Boolean = true - - override fun getHistoryDiffHandler(): DiffFromHistoryHandler? = null - - override fun canShowHistoryFor(virtualFile: com.intellij.openapi.vfs.VirtualFile): Boolean = true - - private data class RootAndPath(val workDir: File, val relativePath: String) - - @Throws(VcsException::class) - private fun resolveRootAndPath(filePath: FilePath): RootAndPath { - val vcsRoot = ProjectLevelVcsManager.getInstance(project).getVcsRootFor(filePath) - ?: throw VcsException("$filePath no pertenece a ningún work tree got") - val workDir = File(vcsRoot.path) - val relativePath = VfsUtilCore.getRelativePath(filePath.virtualFile ?: vcsRoot, vcsRoot) - ?: throw VcsException("No se pudo resolver la ruta relativa de $filePath en $workDir") - return RootAndPath(workDir, relativePath) - } - - @Throws(VcsException::class) - override fun createSessionFor(filePath: FilePath): VcsHistorySession { - try { - val (workDir, relativePath) = resolveRootAndPath(filePath) - val entries = commandLine.log(workDir, relativePath.ifEmpty { null }) - val revisions: List = entries.map { GotFileRevision(workDir, relativePath, commandLine, it) } - val baseRevision = GotRevisionNumber(commandLine.baseCommit(workDir)) - return GotVcsHistorySession(revisions, baseRevision) - } catch (e: VcsException) { - throw e - } catch (e: Exception) { - // El panel de historial solo muestra e.message (a veces como - // "Unknown error" si es null); loggeamos el stack completo para - // poder diagnosticar fallos que no sean VcsException nuestras. - LOG.warn("Fallo al construir el historial got para $filePath", e) - throw VcsException("${e.javaClass.simpleName}: ${e.message ?: "sin mensaje"}", e) - } - } - - @Throws(VcsException::class) - override fun reportAppendableHistory(filePath: FilePath, partner: VcsAppendableHistorySessionPartner) { - try { - val (workDir, relativePath) = resolveRootAndPath(filePath) - val baseRevision = GotRevisionNumber(commandLine.baseCommit(workDir)) - - // reportCreatedEmptySession espera una sesión REALMENTE vacía: el - // panel de "Show History" usa este camino (no createSessionFor). - // partner.acceptRevision() ya actualiza esta misma sesión por su - // cuenta -- llamar además session.appendRevision() duplicaba cada - // commit (confirmado en vivo dos veces: primero por pasar una - // sesión ya poblada, y de nuevo acá por agregarlas por ambos - // caminos a la vez). - val session = GotVcsHistorySession(emptyList(), baseRevision) - partner.reportCreatedEmptySession(session) - - val entries = commandLine.log(workDir, relativePath.ifEmpty { null }) - for (entry in entries) { - partner.acceptRevision(GotFileRevision(workDir, relativePath, commandLine, entry)) - } - } catch (e: VcsException) { - partner.reportException(e) - } catch (e: Exception) { - LOG.warn("Fallo al construir el historial got (appendable) para $filePath", e) - partner.reportException(VcsException("${e.javaClass.simpleName}: ${e.message ?: "sin mensaje"}", e)) - } - } -} blob - bbb281713e03b2340649d2950a97f3d43e1df48b (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotVcsHistorySession.kt +++ /dev/null @@ -1,16 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.vcs.history.VcsAbstractHistorySession -import com.intellij.openapi.vcs.history.VcsFileRevision -import com.intellij.openapi.vcs.history.VcsHistorySession -import com.intellij.openapi.vcs.history.VcsRevisionNumber - -class GotVcsHistorySession( - revisions: List, - private val baseRevision: VcsRevisionNumber, -) : VcsAbstractHistorySession(revisions, baseRevision) { - - override fun calcCurrentRevisionNumber(): VcsRevisionNumber = baseRevision - - override fun copy(): VcsHistorySession = GotVcsHistorySession(revisionList, baseRevision) -} blob - 5595f9f6a5e885810383b09a24a2b712d46a9df2 (mode 644) blob + /dev/null --- src/main/kotlin/dev/nezzontli/gotvcs/GotVcsRootChecker.kt +++ /dev/null @@ -1,17 +0,0 @@ -package dev.nezzontli.gotvcs - -import com.intellij.openapi.vcs.VcsKey -import com.intellij.openapi.vcs.VcsRootChecker -import com.intellij.openapi.vfs.VirtualFile -import java.io.File - -class GotVcsRootChecker : VcsRootChecker() { - - override fun getSupportedVcs(): VcsKey = GotVcs.getKey() - - // isRoot(String) está deprecado (scheduled for removal, confirmado con - // el Plugin Verifier) a favor de esta sobrecarga con VirtualFile. - override fun isRoot(file: VirtualFile): Boolean = File(file.path, ".got").isDirectory - - override fun isVcsDir(path: String): Boolean = path == ".got" -} blob - 075a383cd711125365c497a822e10a6eae7f2a78 blob + 2e3aa6efb3c254a6db025a06c9d04e04bccf1533 --- src/main/resources/META-INF/plugin.xml +++ src/main/resources/META-INF/plugin.xml @@ -1,12 +1,18 @@ dev.nezzontli.gotvcs - Game of Trees (got) VCS - ale - - Integra Game of Trees (got) como proveedor de control de versiones - nativo: detección de work trees .got/, estado de archivos, diff en - el editor, commit/rollback, historial y update/fetch desde la UI. - + Got + ale + +
  • Detects .got/ work trees automatically
    • +
  • File status, native diff, and modified-lines gutter
    • +
  • Commit and rollback from the Commit tool window
    • +
  • File history and Update Project (got update / got fetch)
    • +
  • Send action (got send) and a Settings panel for the got binary path
    • + + See the README for details on how each feature maps to the underlying got command. + ]]>     com.intellij.modules.vcs @@ -15,15 +21,15 @@ vcsClass="dev.nezzontli.gotvcs.GotVcs" displayName="got" administrativeAreaName=".got"/> - - - + + + - + blob - /dev/null blob + bbb93505075c0fc3c6c2159101cbf53c212a3b54 (mode 644) --- /dev/null +++ src/main/resources/META-INF/pluginIcon.svg @@ -0,0 +1,7 @@ + + + + + + + blob - /dev/null blob + b1280b078336c1da7f11f99464e8159e4034cedd (mode 644) --- /dev/null +++ src/main/resources/META-INF/pluginIcon_dark.svg @@ -0,0 +1,7 @@ + + + + + + + blob - /dev/null blob + b1b8ef56b44f16b14dc800fa8103a6d89abb526f (mode 644) Binary files /dev/null and gradle/wrapper/gradle-wrapper.jar differ blob - /dev/null blob + df6a6ad763d4b8f7ce0f46b12ee2c38c3ec66749 (mode 644) --- /dev/null +++ gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists blob - /dev/null blob + b9bb139f790567973216cd313e69ae65789c3754 (mode 755) --- /dev/null +++ gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" blob - /dev/null blob + aa5f10b069f900bc9fd9db60245e8f18403bb7a0 (mode 644) --- /dev/null +++ gradlew.bat @@ -0,0 +1,82 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%