tig: add subcommand to browse an umpf and its context interactively #40
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The 'tig' subcommand makes it possible to browse an umpf interactively in tig(1) while showing the local and remote state of all topic branches. This can give a broader overview how the topic branches have developed before building another umpf. For simplicity sake, also limit the range of the topics to the history leading up from the umpf-base. Signed-off-by: Roland Hieber <rhi@pengutronix.de>
michaelolbrich
requested changes
Apr 19, 2024
Comment on lines
+1870
to
+1885
| local reply | ||
| find_branch_rev "${content}" | ||
| if [ -n "${reply}" ]; then | ||
| echo "${reply}" >> "${STATE}/refs" | ||
| fi | ||
|
|
||
| # possibly-existing local topic branch | ||
| if ${GIT} rev-parse --verify -q "${content}" >/dev/null 2>&1; then | ||
| echo "${content}" >> "${STATE}/refs" | ||
| fi | ||
|
|
||
| # possibly-existing remote-tracking topic branch | ||
| # (might be different from the remote chosen above) | ||
| if ${GIT} rev-parse --verify -q "${content}@{u}" >/dev/null 2>&1; then | ||
| echo "${content}@{u}" >> "${STATE}/refs" | ||
| fi |
There was a problem hiding this comment.
There may be other remotes with relevant branches, so I think it would be better to replace the whole thing with:
${GIT} show-ref -s "${content}" >> "${STATE}/refs"
That should get you the commit-ish of all remote and local branches with that name.
This has the extra benefit, that umpf will not ask, which branch should be used, because we want so see all of them anyways.
Comment on lines
+1906
to
+1913
| ranges= | ||
|
|
||
| # cut off each ref at base | ||
| for ref in "${refs[@]}"; do | ||
| ranges="${ranges} ${base}^..${ref}" | ||
| done | ||
|
|
||
| tig ${ranges} |
There was a problem hiding this comment.
You can do this instead, much simpler:
tig "${refs[@]}" "^${base}^"
| ### command: tig ### | ||
|
|
||
| do_tig () { | ||
| local refs base ranges |
There was a problem hiding this comment.
refs is an array, so I think it should be declared as one here.
local base
local -a refs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The 'tig' subcommand makes it possible to browse an umpf interactively while showing the local and remote state of all topic branches. This can give an overview how the topic branches have developed before building another umpf.
For simplicity sake, also limit the range of the topics to the history leading up from the umpf-base.