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.

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

commit, tag, branch priority support in list-repos and 'combo -v' commands #182

Closed
ndhaller opened this issue Sep 8, 2023 · 0 comments · Fixed by #186
Closed

commit, tag, branch priority support in list-repos and 'combo -v' commands #182

ndhaller opened this issue Sep 8, 2023 · 0 comments · Fixed by #186

Comments

@ndhaller
Copy link
Contributor

ndhaller commented Sep 8, 2023

I made a test Combination that uses commit and tag and branch at the same time, as this is a documented supported configuration to define all three.
When the combo is checked out, the priority is supposed to be commit > tag > branch .

    <Combination name="sandbox-listRepos-test2-commit-tag-branch" description="a combo for testing the list-repos command with commit > tag > branch priority">
      <Source localRoot="edkrepo" remote="EdkrepoRepo" commit="31bb065c7f288437e2823a95606928325d6b2467" tag="edkrepo-v3.1.1" branch="main" />
      <Source localRoot="edkrepo-manifest" remote="EdkrepoManifestRepo" commit="498fc403d3ab9fd96fbd9ac3ca78dd01e5ead466" branch="main" />
    </Combination>

list-repos issue

The recently updated edkrepo list-repos command only lists this Combination by the branch name.

edkrepo - [https://github.com/tianocore/edk2-edkrepo]
Branches:
  main
    EdkRepo                                      : *(main)*
    Edkrepo-Sandbox2                             : *(sandbox-main2)*
                                                    (sandbox-listRepos-test2-commit-tag-branch)
edkrepo-manifest - [https://github.com/tianocore/edk2-edkrepo-manifest]
Branches:
  main
    EdkRepoManifest                              : *(main)*
    Edkrepo-Sandbox2                             : *(sandbox-main2)*
                                                    (sandbox-listRepos-test2-commit-tag-branch)

"edkrepo list-repos" should display the Combination under all of the groups it belongs to: branch name, tag name, and commit

combo -v issue

The recently updated "edkrepo combo -v" command, when used on this example combo, is also prioritizing the branch name instead of the higher priority commit or tag values in the Combination definition.

  sandbox-listRepos-test2-commit-tag-branch
    edkrepo          : main
    edkrepo-manifest : main
ashedesimone added a commit to ashedesimone/edk2-edkrepo that referenced this issue Sep 22, 2023
In the List-Repos command a combo referencing a combination of tag,
sha, and branch would only have the branch listed. Update if / elif
block to ensure that all ref types are listed

In the combo commmand a combo containing a combination of tag,
sha and branch would only show the branch. Update the conditionals
such that the printed ref follows EdkRepo's priority order of ref
usage (SHA > Tag > Branch)

Fixes tianocore#182

Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
ashedesimone added a commit to ashedesimone/edk2-edkrepo that referenced this issue Sep 25, 2023
In the List-Repos command a combo referencing a combination of tag,
sha, and branch would only have the branch listed. Update if / elif
block to ensure that all ref types are listed

In the combo commmand a combo containing a combination of tag,
sha and branch would only show the branch. Update the conditionals
such that the printed ref follows EdkRepo's priority order of ref
usage (SHA > Tag > Branch)

Fixes tianocore#182

Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
Reviewed-by: Kevin Sun <kevin.sun@intel.com>
ashedesimone added a commit that referenced this issue Sep 25, 2023
In the List-Repos command a combo referencing a combination of tag,
sha, and branch would only have the branch listed. Update if / elif
block to ensure that all ref types are listed

In the combo commmand a combo containing a combination of tag,
sha and branch would only show the branch. Update the conditionals
such that the printed ref follows EdkRepo's priority order of ref
usage (SHA > Tag > Branch)

Fixes #182

Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
Reviewed-by: Kevin Sun <kevin.sun@intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant