pijul nest
guest › [sign in] [explore]

cargo: Fix last conflict While most changes were great introduced by I43RAQTR6WY7KFUFBU5ALAWSNNQZPHSHATOVXFCERQRFTTK5OHNQC, in this case there was one more failure for me. This resolves the issues for good.

zj
Oct 12, 2021, 7:55 PM
TEU3IG76EPKBD54656OIIIYGDCCLTMXDO64SPKOC7AJLLOWCPLKQC

Dependencies

  • [2] CMY6YHG3 auth: Allow HTTP basic auth for users This can be used soon to push data as a user from the terminal where the cookie isn't set like in the browser.
  • [3] XFXPVFOS testing: Move tests to specific directory Tests I didn't really write until today, as I mostly didn't really know how to set it up. This is now partially mitigated, just by forcing myself to do it. There's a few problems still in the code; the database is shared with the dev application for instance. Though as a start I'll take it.
  • [4] Z63HIZPS testing: Move tests to specific directory Tests I didn't really write until today, as I mostly didn't really know how to set it up. This is now partially mitigated, just by forcing myself to do it. There's a few problems still in the code; the database is shared with the dev application for instance. Though as a start I'll take it.
  • [5] FS2NWBVN pijul: Start of push/pull work This change includes one API endpoint, .pijul. It allows for getting a channels remote ID. A lot of plumbing around repositories is added too, from init to opening pristine and actions like it.
  • [6] W3M3C7CC Initial commit This change includes a very small hello world application server written in Rust using Rocket.rs. Managing dependencies is done with Nix as that works well between Linux and Mac for me.
  • [7] JJQ4LMUM dependecy: Remove future No longer required, so cleaning it up right now.
  • [8] TWIZ7QV4 db: Add interface to add a project Right now a project has a name, and an owner which is hardcoded to 1. This is because basically I'm speedrunning to implement push/pull of Pijul and then revisit to add depth to features and tests. Model code is now split into files properly too.

Change contents

  • edit in Cargo.lock at line 1561
    [4.14495]
    [2.1316]
    "futures",
  • edit in Cargo.lock at line 1563
    [4.14495]→[3.496:508](∅→∅)
    "futures",
  • resolve order conflict in Cargo.lock at line 1563
    [2.1336]
    [4.4612]