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

Proposal: Improve branch selection #2281

Merged
merged 29 commits into from
Oct 18, 2021
Merged

Proposal: Improve branch selection #2281

merged 29 commits into from
Oct 18, 2021

Commits on Oct 13, 2021

  1. Add optional Branch param to Repo class 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    6e4d716 View commit details
    Browse the repository at this point in the history

  2. Populate branch for repos added as - org/repo:branch 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    d7f5338 View commit details
    Browse the repository at this point in the history

  3. Use branch from Repo class instead of configuration 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    0449cbc View commit details
    Browse the repository at this point in the history

  4. Remove --default-branch CLI param 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    ab00c61 View commit details
    Browse the repository at this point in the history

  5. Run sbt fmt 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    b0a8e0a View commit details
    Browse the repository at this point in the history

  6. Update Repo#show to include branch information if present 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    ee9ab63 View commit details
    Browse the repository at this point in the history

  7. Ensure PR title includes the branch if it is different than the defau… 

    …lt one

Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    88015c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2021

  1. Propagate branch to missing places 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    2f21827 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into move-default-branch-selection-to-repos-file

    @alejandrohdezma
    alejandrohdezma committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    02266c3 View commit details
    Browse the repository at this point in the history

  3. Run sbt fmt 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    0ac47d4 View commit details
    Browse the repository at this point in the history

  4. Remove unused import 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    c4bf4e5 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into move-default-bran… 

    …ch-selection-to-repos-file

Signed-off-by: Alejandro Hernández <[email protected]>

# Conflicts:
#	modules/core/src/main/scala/org/scalasteward/core/vcs/data/Repo.scala
#	modules/core/src/main/scala/org/scalasteward/core/vcs/package.scala
#	modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoTest.scala
    @alejandrohdezma
    alejandrohdezma committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    cc52559 View commit details
    Browse the repository at this point in the history

  6. Add repo with branch to repos file

    @fthomas
    fthomas committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    38fec63 View commit details
    Browse the repository at this point in the history

  7. Do not check out branch if forking is enabled 

    syncFork already does that with the correct branch.
    @fthomas
    fthomas committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    9a3830b View commit details
    Browse the repository at this point in the history

  8. Revert changes to the repoKeyEncoder

    @fthomas
    fthomas committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    899a019 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2021

  1. Ensure correct branch is checked-out when syncing a fork 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    a8e10ef View commit details
    Browse the repository at this point in the history

  2. Fix GitHub branch listing for forks 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    e848496 View commit details
    Browse the repository at this point in the history

  3. vcsRepoAlg.cloenAndSync has already checked-out the correct branch … 

    …at this point

Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    23c7675 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into move-default-branch-selection-to-repos-file

    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    6ae80b7 View commit details
    Browse the repository at this point in the history

  5. Update documentation 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    67ed0cf View commit details
    Browse the repository at this point in the history

  6. parent.default_branch is already the same as repo.branch

    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    462e97f View commit details
    Browse the repository at this point in the history

  7. Fix format of the example repos.md file

    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    f1150d9 View commit details
    Browse the repository at this point in the history

  8. Minimize diff

    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    0c82713 View commit details
    Browse the repository at this point in the history

  9. Shorter show and toPath implementations

    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    dfe8b4c View commit details
    Browse the repository at this point in the history

  10. Add .vscode folder to .gitignore 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    104307a View commit details
    Browse the repository at this point in the history

  11. Propagate UpdateDate#baseBranch to commitMsgFor 

    Signed-off-by: Alejandro Hernández <[email protected]>
    @alejandrohdezma
    alejandrohdezma committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    00e942f View commit details
    Browse the repository at this point in the history

  12. Revert "Propagate UpdateDate#baseBranch to commitMsgFor" 

    This reverts commit 00e942f.
    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    7386dbc View commit details
    Browse the repository at this point in the history

  13. Add val for commit message

    @fthomas
    fthomas committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    c6d7605 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. Fix Repo.{show, toPath}

    @fthomas
    fthomas committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    2cc0c9b View commit details
    Browse the repository at this point in the history