npub1tkq8unhsd5jqx6ueex5lcpsgknrpquxuk44ftpjlpm3ulaake7xs76txrw/ngit-cli-mirror/src/sub_commands/pull.rs, branch v1.7.2 Personal mirror of DanConwayDev/ngit-cli on git.upleb.uk https://upleb.uk/npub1tkq8unhsd5jqx6ueex5lcpsgknrpquxuk44ftpjlpm3ulaake7xs76txrw/ngit-cli-mirror/atom?h=v1.7.2 2024-09-04T12:30:59+00:00 refactor: organise into lib and bin structure 2024-09-04T12:30:59+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-09-04T07:04:48+00:00 urn:sha1:949c6459aa7683453a7160423b689ceadb08954b the make the code more readable this commit just moves the files, the next commit should fix the imports feat(list): unique proposal branch names 2024-07-23T15:36:06+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-07-23T15:36:06+00:00 urn:sha1:b67376ff54abeab31422921ba5f4883d5d3dccdb to prevent accidental name conflicts. also moved to prs/* namespace `pull` and `push` integration tests are intermitantly failing to end at least for `push` they work when run individually but not when run together fix(pull): find proposal, root not revision 2024-07-22T08:42:36+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-07-22T08:42:36+00:00 urn:sha1:2411abc047b0abbd7b1c24b80d21f1bc9755cbe4 when looking for proposal roots 'pull' was not filtering out proposal revisions issue identified in failing test, which it now passes feat: integrate `fetch` into `pull` 2024-07-19T20:49:51+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-07-19T20:43:47+00:00 urn:sha1:55fd2693e314a87d32872cd74d3d563cd94201a2 the last set of pull integration test fails: when_latest_event_rebases_branch we are planning on replacing pull so I'm not sure whether it is worth fixing feat(send): compare against origin/main vs main 2024-03-08T17:27:13+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-03-08T16:49:03+00:00 urn:sha1:098b0258fdd581c750099cb463adbddb57843388 catch more errors when proposed commits are not connected to origin/main branch improve default selected commits when on main branch feat(init): add customisation and defaults 2024-02-23T13:57:23+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-02-23T13:57:23+00:00 urn:sha1:d5284b758661c491e6a206570763f2982424b70a - allow more cli input options - allow customisation of more fields in interface - change default identifer from shorthand root commit to short name - defaults to existing repo event (users or other) or maintainers.yaml refactor: fix spelling 2024-02-22T16:27:18+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-02-22T16:27:18+00:00 urn:sha1:89c51886afd54afd901995916909ba98e764b23e ammended should read amended refactor: simplifed ammendments and rebases 2024-02-22T15:00:21+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-02-22T14:57:45+00:00 urn:sha1:fcad6abb95b92c36fd766ff5987e954bfcb8af62 to align with changes done to pull c5dfd1b7e509eedc33de75343de8659e3c9e0b2a also improved copy fix(pull): local rebase detected as ammendments 2024-02-22T14:56:33+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-02-22T14:56:13+00:00 urn:sha1:350c70bf1569815534d028eafa810b34d04f1f3d also updated copy and code comments feat(pull): support `--in-reply-to` revisions 2024-02-22T12:18:01+00:00 DanConwayDev DanConwayDev@protonmail.com 2024-02-22T12:18:01+00:00 urn:sha1:312786fbdacd61fc9f3ed59612d9a6add9112b7f added tests to cover one of these rebase scenarios