Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 755b93698531
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3abce7b376f4
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 1, 2020

  1. vimPlugins: automatically commit update

    @ryneeverett
    ryneeverett committed Apr 1, 2020
    Copy the full SHA
    df0db17 View commit details
    Browse the repository at this point in the history

  2. vimPlugins: automatically commit redirect updates 

    - When redirections are detected, rather than printing instructions,
update.py now creates two commits -- one with the plugin updates and
another with redirected plugin names updated to their new repos.
- Added a --allow-dirty flag so that one can run ./update.py --commit
with a dirty nixpkgs repository, which is necessary for development.
I wouldn't mind removing this before merging if it's not in our flag
budget but it's necessary scaffolding for now.
    @ryneeverett
    ryneeverett committed Apr 1, 2020
    Copy the full SHA
    042c3dc View commit details
    Browse the repository at this point in the history

  3. vimPlugins: update.py --add <plugin> argument 

    - update.py's new --add argument replaces manual editing of
vim-plugin-names for basic use cases.
    @ryneeverett
    ryneeverett committed Apr 1, 2020
    Copy the full SHA
    f1ae95f View commit details
    Browse the repository at this point in the history

  4. vimPlugins: remove repetition from update.main 

    Adding some abstraction makes main() more readable which is important
since it's the main control flow of the script.
    @ryneeverett
    ryneeverett committed Apr 1, 2020
    Copy the full SHA
    1f32eb7 View commit details
    Browse the repository at this point in the history

  5. vimPlugins: normalize deprecation names 

    Parsing plugin lines in multiple places is hazardous and already manifested a
bug!
    @ryneeverett
    ryneeverett committed Apr 1, 2020
    Copy the full SHA
    1c0f0de View commit details
    Browse the repository at this point in the history

  6. vimPlugins: update auto-commiting based on review 

    - Use git.Repo(ROOT, search_parent_directories=True) to find nixpkgs
repo.
- Don't commit overrides.nix.
- Remove "-a" short argument.
- Remove "--commit" flag and commit by default.
- Improve help/error messages.
- Favor closure pattern over classes.Use a closure to wrap the update
function with state rather than a callable class.
- break NixpkgsRepo class into functions
- Optional None-type arguments
- Remove repo checks from update.py. Git is too flexible and permits too
many workflows for my attempt to replace documentation with code to work.
My goal would be to separate the `--add` functionality from the update
functionality in the near term and then there will be no reason for this
usage to create commits anyway.
    @ryneeverett
    ryneeverett committed Apr 1, 2020
    Copy the full SHA
    0a27594 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #83788 from ryneeverett/vim-plugins-update-commit 

    vimPlugins: Automate git commits when updating.
    @timokau
    timokau committed Apr 1, 2020
    Copy the full SHA
    3abce7b View commit details
    Browse the repository at this point in the history