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

gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' #587

Merged
merged 1 commit into from
Jun 29, 2023
Merged

gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' #587

merged 1 commit into from
Jun 29, 2023

Conversation

bartlettroscoe
Copy link
Member

The output is much more useful when in a detached head state.

Produces something like:

$ gitdist-status 
----------------------------------------------------------------------------------------------------
| ID | Repo Dir                         | Branch                    | Tracking Branch  | C | M | ? |
|----|----------------------------------|---------------------------|------------------|---|---|---|
|  0 | Trilinos (Base)                  | 11976-package_source-fix2 |                  |   |   |   |
|  1 | packages/framework/GenConfig     | 924a08a                   |                  |   |   |   |
|  2 | packages/framework/son-ini-files | master                    | glex-tril/master |   |   |   |
|  3 | packages/framework/srn-ini-files | master                    | origin/master    |   |   |   |
|  4 | TriBITS                          | gitdist-head-tag-and-sha1 |                  |   | 1 |   |
|  5 | kokkos                           | 4.1.00                    |                  |   |   |   |
|  6 | kokkos-kernels                   | 4.1.00                    |                  |   |   |   |
----------------------------------------------------------------------------------------------------

instead of:

$ gitdist-status 
--------------------------------------------------------------------------------------------------------------------
| ID | Repo Dir                         | Branch                    | Tracking Branch                  | C | M | ? |
|----|----------------------------------|---------------------------|----------------------------------|---|---|---|
|  0 | Trilinos (Base)                  | 11976-package_source-fix2 |                                  |   |   |   |
|  1 | packages/framework/GenConfig     | HEAD                      |                                  |   |   |   |
|  2 | packages/framework/son-ini-files | master                    | glex-tril/master                 |   |   |   |
|  3 | packages/framework/srn-ini-files | master                    | origin/master                    |   |   |   |
|  4 | TriBITS                          | gitdist-head-tag-and-sha1 | github/gitdist-head-tag-and-sha1 |   |   |   |
|  5 | kokkos                           | HEAD                      |                                  |   |   |   |
|  6 | kokkos-kernels                   | HEAD                      |                                  |   |   |   |
--------------------------------------------------------------------------------------------------------------------

@bartlettroscoe bartlettroscoe added this to In Progress in TriBITS Refactor via automation Jun 29, 2023
@bartlettroscoe bartlettroscoe moved this from In Progress to In Review in TriBITS Refactor Jun 29, 2023
rabartlett1972
rabartlett1972 previously approved these changes Jun 29, 2023
View reviewed changes
Copy link
Collaborator

@rabartlett1972 rabartlett1972 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes are simple and the tests are strong. I tested this manually on an actual set of git repos (as shown in the top comment) and this looks great. I am going to allow this to merge without outside reveiw.

@bartlettroscoe
gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD'
b9b7ae6 
The output is much more useful when in a detached head state.
rabartlett1972
rabartlett1972 approved these changes Jun 29, 2023
View reviewed changes
Copy link
Collaborator

@rabartlett1972 rabartlett1972 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The amended commit passed the tests. Let's merge.

@bartlettroscoe bartlettroscoe merged commit a72ca8e into master Jun 29, 2023
6 checks passed
TriBITS Refactor automation moved this from In Review to Done Jun 29, 2023
@bartlettroscoe bartlettroscoe removed this from Done in TriBITS Refactor Jun 30, 2023
@bartlettroscoe bartlettroscoe added this to Done in TriBITS Jun 30, 2023
This was referenced Jun 30, 2023
Closed
Merged
bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Jul 7, 2023
@bartlettroscoe
Merge branch 'tribits_github_snapshot' into 11545-11976-cleanup-and-t…
e61bf3e 
…ribits-update

This pulls in the new TriBITS PRs:

* TriBITSPub/TriBITS#583
* TriBITSPub/TriBITS#585
* TriBITSPub/TriBITS#586
* TriBITSPub/TriBITS#587
* TriBITSPub/TriBITS#588
* TriBITSPub/TriBITS#590
bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Sep 23, 2023
@bartlettroscoe
Merge branch 'tribits_github_snapshot' into tribits-582-raw-cmake-tri…
cb8e964 
…bits

This brings in the following TriBITS PRs:

* TriBITSPub/TriBITS#591: Allow 100% raw CMake to be used in a
  TriBITS-compliant package (TriBITSPub/TriBITS#582)

* TriBITSPub/TriBITS#588: gitdist: Pass in '-c color.status=always' when
  --dist-no-color is not added

* TriBITSPub/TriBITS#590: Fix: gitdist: dist-repo-status: Display tag or SHA1
  instead of 'HEAD'

* TriBITSPub/TriBITS#587: gitdist: dist-repo-status: Display tag or SHA1
  instead of 'HEAD'

* TriBITSPub/TriBITS#586: More cleanup of packaging support
  (trilinos#11976)

This goes back to TriBITS commits from June 2023.
@bartlettroscoe bartlettroscoe mentioned this pull request Sep 23, 2023
Merged
bartlettroscoe added a commit that referenced this pull request Jan 4, 2024
@bartlettroscoe
Print the stdout/stderr from the failed git command (#587)
80191d4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rabartlett1972 rabartlett1972 rabartlett1972 approved these changes

Assignees
No one assigned
Labels
component: python_utils type: enhancement
Projects
TriBITS
Status: Done
TriBITS
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@bartlettroscoe @rabartlett1972