Commit graph

138 commits

Author SHA1 Message Date
Henrik Lissner
0e851ace9b
Backport bits of CLI rewrite
The rewrite for Doom's CLI is taking a while, so I've backported a few
important changes in order to ease the transition and fix a couple bugs
sooner.

Fixes #2802, #2737, #2386

The big highlights are:

- Fix #2802: We now update recipe repos *before* updating/installing any
  new packages. No more "Could not find package X in recipe repositories".

- Fix #2737: An edge case where straight couldn't reach a pinned
  commit (particularly with agda).

- Doom is now smarter about what option it recommends when straight
  prompts you to make a choice.

- Introduces a new init path for Doom. The old way:
  - Launch in "minimal" CLI mode in non-interactive sessions
  - Launch a "full" interactive mode otherwise.
  The new way
  - Launch in "minimal" CLI mode *only* for bin/doom
  - Launch is a simple mode for non-interactive sessions that still need
    access to your interactive config (like async org export/babel).
  - Launch a "full" interactive mode otherwise.

  This should fix compatibility issues with plugins that use the
  async.el library or spawn child Emacs processes to fake
  parallelization (like org's async export and babel functionality).

- Your private init.el is now loaded more reliably when running any
  bin/doom command. This gives you an opportunity to configure its
  settings.

- Added doom-first-{input,buffer,file}-hook hooks, which we use to queue
  deferred activation of a number of packages. Users can remove these
  modes from these hooks; altogether preventing them from loading,
  rather than waiting for them to load to then disable them,
  e.g. (after! smartparens (smartparens-global-mode -1)) -> (remove-hook
  'doom-first-buffer #'smartparens-global-mode)

  Hooks added to doom-first-*-hook variables will be removed once they
  run.

  This should also indirectly fix #2386, by preventing interactive modes
  from running in non-interactive session.

- Added `doom/bump-*` commands to make bumping modules and packages
  easier, and `doom/bumpify-*` commands for converting package!
  statements into user/repo@sha1hash format for bump commits.

- straight.el is now commit-pinned, like all other packages. We also
  more reliably install straight.el by cloning it ourselves, rather than
  relying on its bootstrap.el.

  This should prevent infinite "straight has diverged from master"
  prompts whenever we change branches (though, you might have to put up
  with it one more after this update -- see #2937 for workaround).

All the other minor changes:

- Moved core/autoload/cli.el to core/autoload/process.el
- The package manager will log attempts to check out pinned commits
- If package state is incomplete while rebuilding packages, emit a
  simpler error message instead of an obscure one!
- Added -u switch to 'doom sync' to make it run 'doom update' afterwards
- Added -p switch to 'doom sync' to make it run 'doom purge' afterwards
- Replace doom-modules function with doom-modules-list
- The `with-plist!` macro was removed, since `cl-destructuring-bind`
  already serves that purpose well enough.
- core/autoload/packages.el was moved into core-packages.el
- bin/doom will no longer die if DOOMDIR or DOOMLOCALDIR don't have a
  trailing slash
- Introduces doom-debug-variables; a list of variables to toggle on
  doom/toggle-debug-mode.
- The sandbox has been updated to reflect the above changes, also:
  1. Child instances will no longer inherit the process environment of
     the host instance,
  2. It will no longer produce an auto-save-list directory in ~/.emacs.d
2020-05-15 01:33:52 -04:00
Henrik Lissner
ca74996d1b
Complain if repo is invalid on 'doom update' 2020-03-01 13:25:47 -05:00
Henrik Lissner
3ecff5777b
Fix overaggressive recloning when updating packages 2020-03-01 13:23:39 -05:00
Henrik Lissner
71e5a5513b
Fix #2556 (hopefully): exec format error on Windows 2020-02-19 17:54:50 -05:00
Paul Oppenheimer
0a463673c9 make doom purge -g more aggressive
Reflog keeps the history of every reset, so expiring it allows us to
remove more older commits. git gc by default only cleans for 2 week old
objects, so I made it more aggressive
2020-02-10 20:23:09 -05:00
Henrik Lissner
0dc173a631
Polish progress output during 'doom update' 2020-02-01 02:07:24 -05:00
Henrik Lissner
9a0e029135
Fix output truncation & indentation on 'doom update' 2020-01-30 18:38:18 -05:00
Henrik Lissner
35364f1dd1
Fix hash-table-p errors on 'doom build' 2020-01-30 15:31:30 -05:00
Henrik Lissner
097972bd9d
Refactor package pinning
- Make doom/info package details more concise
- Removed doom-pinned-packages variable (pin info now stored in
  doom-packages metadata)
- Fix unpin! not actually unpinning some packages
2020-01-28 20:47:45 -05:00
Henrik Lissner
4dc01912f1
Fix 'doom update' reporting that a successful fetch failed 2020-01-28 14:06:20 -05:00
Henrik Lissner
471be76ba5
Fix typo causing void-function error 2020-01-27 02:05:14 -05:00
Henrik Lissner
5056c74688
Fix some packages failing to fetch on 'doom update' 2020-01-27 01:44:30 -05:00
Henrik Lissner
99fc55f75c
General, minor refactors in doom core 2020-01-27 00:51:32 -05:00
Henrik Lissner
dadd54604b
Refactor package update logic
Still needs more work.
2020-01-26 21:21:06 -05:00
Henrik Lissner
a9402cfb55
Fix #2373: bring back package pinning
This needs some serious refactoring...
2020-01-25 19:02:00 -05:00
Henrik Lissner
453e20534f
Temporarily disable pinning #2373
I'm swamped today and tomorrow so this will have to do for now
2020-01-15 11:19:32 -05:00
Henrik Lissner
dc4df47842
Don't fetch/checkout packages that are up-to-date 2020-01-14 22:47:38 -05:00
Henrik Lissner
f3a9d0c03c
Resolve pinned packages based on overridden recipes
And rearrange "Checking out ..." message during 'doom upgrade' to
display package first, then commit (and abbreviated), rather than the
other around. It's easier to read.
2020-01-14 21:57:58 -05:00
Henrik Lissner
b8b0f73edc
Resolve packages to repo for pinned packages
- Allow :pin SHA's to be abbreviated.
- Print out the repo being updated, rather than the package.
2020-01-14 21:18:59 -05:00
Henrik Lissner
0c9f1b1a9c
Minor refactors & comment revision 2020-01-11 17:27:04 -05:00
Henrik Lissner
f6852a2c9f
Add --discard switch to 'doom upgrade' #2224
Also rewrites straight prompt-in-batch-Emacs hack, and move it to
core-cli.el.
2020-01-09 03:36:00 -05:00
Henrik Lissner
b7dc9c644e
Don't use find if find can't be found 2020-01-08 22:09:42 -05:00
Henrik Lissner
f78f71a74c
Minor refactors & comment revision 2020-01-01 23:52:02 -05:00
Henrik Lissner
7a348f8784
Refactor how we indent straight's progress output
More work up front, less work in the trenches.
2020-01-01 19:34:30 -05:00
Henrik Lissner
4f676bd218
Refactor autoload generator bootstrappers 2020-01-01 13:31:40 -05:00
Henrik Lissner
a4653f475b
Print filename instead of absolute paths for purged ELPA packages 2019-12-30 17:28:31 -05:00
Henrik Lissner
908bd4b945
Remove FORCE-P argument for doom-cli-reload-autoloads
We weren't using them anyway.
2019-12-30 06:44:16 -05:00
Henrik Lissner
f8ff50565e
Refactor autoload generator
- Halves LOC
- Adopts functional paradigm where possible.
- Reduces the filesize of autoloads files by ~10-20%
- Speeds up autoloads generation by ~20%
2019-12-29 22:20:48 -05:00
Henrik Lissner
8d3954257e
Refactor 'doom purge' & fix elpa purging
Wasn't picking up ELPA packages.
2019-12-28 14:02:07 -05:00
Henrik Lissner
6396cbf6cd
Refactor 'doom build' 2019-12-28 14:01:36 -05:00
Henrik Lissner
2f540f8c45
Remove vestigial references to doom--finalize-straight 2019-12-27 03:30:03 -05:00
Henrik Lissner
550c9bda74
cli/packages: implement commit pinning support
This is step 2 toward version pinning and rollback.

Next step is to actually pin packages.

Step 1 was 125561eb0
2019-12-25 14:02:43 -05:00
Henrik Lissner
8dd647b9bd
Make 'doom update' Skip local packages
i.e. packages with a user-specified :local-repo
2019-12-14 20:50:16 -05:00
Henrik Lissner
886fa36ac8
Improve 'doom purge' progress output 2019-11-25 02:18:01 -05:00
Henrik Lissner
d37ebee2f8
Print progress to same line on 'doom update'
Experimental.
2019-11-24 16:50:46 -05:00
Henrik Lissner
4351474bf3
Add "X updated" notice after package is updated
To make it clearer what package was just updated after spewing a lot of
git log output.
2019-11-22 16:15:06 -05:00
Henrik Lissner
3896b994b5
Remove double-negative filesize from 'doom purge' 2019-11-08 17:30:21 -05:00
Henrik Lissner
873fc5c0db
Rewrite core-cli
Highlights:
- 'doom purge' now purges builds, elpa packages, and repos by default.
  Regrafting repos is now opt-in with the -g/--regraft switches.
  Negation flags have been added for elpa/repos: -e/--no-elpa and
  -r/--no-repos.
- Removed 'doom rebuild' (it is now just 'doom build' or 'doom b').
- Removed 'doom build's -f flag, this is now the default. Added the -r
  flag instead, which only builds packages that need rebuilding.
- 'doom update' now updates packages synchronously, but produces more
  informative output about the updating process.
- Straight can now prompt in batch mode, which resolves a lot of issues
  with 'doom update' (and 'doom upgrade') freezing indefinitely or
  throwing repo branch errors.
- 'bin/doom's switches are now positional. Switches aimed at `bin/doom`
  must precede any subcommands. e.g.
    Do: 'doom -yd upgrade'
    Don't do: 'doom upgrade -yd'
- Moved 'doom doctor' from bin/doom-doctor to core/cli/doctor, and
  integrated core/doctor.el into it, as to avoid naming conflicts
  between it and Emacs doctor.
- The defcli! macro now has a special syntax for declaring flags, their
  arguments and descriptions.

Addresses #1981, #1925, #1816, #1721, #1322
2019-11-08 16:02:06 -05:00
Henrik Lissner
45240699e0
Remove doom-elpa-dir variable
And just use package-user-dir. No need for two variable when one will
do.
2019-09-26 14:26:47 -04:00
Henrik Lissner
f03eb67314
Fix 'doom rebuild' generating broken autoloads
Causes errors about being unable to find general.el
2019-09-20 01:23:58 -04:00
Henrik Lissner
18329fdeaf
Add switch docs in update & purge commands 2019-09-12 17:25:54 -04:00
Henrik Lissner
84837fa0d6
Add --threads option to 'doom update' #1736 2019-09-12 17:25:54 -04:00
Henrik Lissner
4fda7cd287
Don't auto-purge ELPA packages on 'doom refresh'
...or 'doom purge', without the -e or --elpa switches (or --all).
2019-09-09 23:04:07 -04:00
Henrik Lissner
005647fd64
Fix wrong-type-arg package-desc error on 'doom refresh' 2019-09-03 14:07:09 -04:00
Henrik Lissner
81ee250c09
Minor refactor & revision across the board 2019-09-03 00:59:46 -04:00
Henrik Lissner
4ce86b06d4
Use more ambiguous reset target when normalizing repos
Possibly addresses "ambiguous target" errors during 'doom update'.

Might address #1738 and #1721
2019-09-03 00:59:46 -04:00
Henrik Lissner
49fb34d1c1
Fix 'doom purge' trying to purge site packages
It should only manage packages installed in
doom-elpa-dir (~/.emacs.d/.local/elpa, by default).
2019-09-02 13:12:57 -04:00
Henrik Lissner
8ac1e1a781
Refactor doom init process
- Refactors doom-initialize
- Moves doom-initialize-modules call to init.el, to more easily isolate
  it during unit testing.
2019-08-27 00:05:12 -04:00
Henrik Lissner
025a4c3d26
Properly reset packages on 'doom update'
Prevents some cases of infinite hanging while updating certain packages.
2019-08-22 16:13:23 -04:00
Henrik Lissner
e502031412
Fix 'doom purge' not regrafting all repos on first use 2019-08-22 16:12:22 -04:00