Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "merge --input-file-list NAME ..." as a way to exceed CLI limits #328

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Add "merge --input-file-list NAME ..." as a way to exceed CLI limits #328

wants to merge 13 commits into from

Commits on Jul 19, 2023

  1. Add "merge --input-file-list NAME ..." as a way to exceed CLI limits 

    Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    a58a70a View commit details
    Browse the repository at this point in the history

  2. MergeCommand: Convert singular --input-file-list to potentially multi… 

    …ple --input-files-list

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    f869610 View commit details
    Browse the repository at this point in the history

  3. MergeCommand: Convert singular --input-file-list to potentially multi… 

    …ple --input-files-list: use simple foreach()

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    d1aa106 View commit details
    Browse the repository at this point in the history

  4. MergeCommand: input-files-list: fix iterations and sanity checks 

    Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    3953595 View commit details
    Browse the repository at this point in the history

  5. MergeCommand: in options handle "--input-files" before "--input-files… 

    …-list" (dotnet is too smart for its own good)

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    56c2493 View commit details
    Browse the repository at this point in the history

  6. MergeCommand: behave like before if no input-files* args were specified 

    Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    fdac250 View commit details
    Browse the repository at this point in the history

  7. MergeCommand: implement support for --input-files-list0 

    Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    1cc6622 View commit details
    Browse the repository at this point in the history

  8. MergeCommand: align coding style of changes for InputFilesList with e… 

    …xisting precedent

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    064715e View commit details
    Browse the repository at this point in the history

  9. MergeCommand: rename --input-files-list0 to --input-files-nul-list (w… 

    …ork around stupid Options parser)

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    89499f5 View commit details
    Browse the repository at this point in the history

  10. MergeCommand: when handling --input-file-(nul-)list, avoid adding dup… 

    …licates and empty lines, if any

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    bbd41e4 View commit details
    Browse the repository at this point in the history

  11. MergeCommand: refactor DetermineInputFiles() into a separate method 

    Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    4017eb9 View commit details
    Browse the repository at this point in the history

  12. MergeCommand: DetermineInputFiles() refine progress and result reporting 

    In particular, avoid starting lines with "Got" for different concepts -
improve readability.

Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    d123703 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Merge remote-tracking branch 'upstream/main' into merge-multiple 

    Signed-off-by: Jim Klimov <[email protected]>
    @jimklimov
    jimklimov committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    8722b9a View commit details
    Browse the repository at this point in the history