Git Repo Relative Path

[GavinOsborn]

Hey folks,

When you're terminal session is within a git repo is it possible to evaluate the path relative to the root of the repo?
eg: if the root of my repo was ~/code/github/foo/ and I was currently in ~/code/github/foo/baz/bar then the path evaluated would be baz/bar.

It feels like the Mapped Locations sample was in response to a similar question - but I was hoping for something that was contextual to the current repo.

That in itself would be great. Making it available to the path formatting styles functions would be better still.

Thanks

[JanDeDobbeleer]

@GavinOsborn let me have a quick play around with it as I think this can be done using cross segment properties.

[JanDeDobbeleer]

@GavinOsborn when #2719 lands, you can do something like this:

"template": "{{ if and .Segments.Git.RepoName (ne .Segments.Git.RepoName .Path) }} \uf1d2 {{ .Segments.Git.RepoName }} \uf554 {{ trimPrefix .Segments.Git.Dir .PWD }}{{ else }} \uf74a {{ path .Path .Location }}{{ end }}"

[GavinOsborn]

Wow, thanks @JanDeDobbeleer for such a prompt response!

So the solution you posted works great unless you're in the root of the repo in which case it prints the full path which isn't quite what I was after. This happens because the .Segments.Git.Dir is suffixed with a trailing \ but .PWD is not. My knowledge of Go templates is limited to what I could google but I resolved it by appending a \ to .PWD before evaluation.

"template": "{{ if and .Segments.Git.RepoName (ne .Segments.Git.RepoName .Path) }}{{ $repoRoot := .Segments.Git.Dir }}{{ $repoPath := list .PWD \"\\\\\" | join \"\"  }} \uF408 \uf554 {{ replace $repoRoot \"\" $repoPath  }}{{ else }}<#f2f200> \ue5ff </>{{ path .Path .Location }}{{ end }}"

I don't know oh-my-posh well enough to comment usefully yet but from this first contact experience I would suggest a couple of things:

• Standardize how paths are returned from the various segments you support.
  • eg: a directory paths is never (or always?) suffixed with a path separator.
• Consider support for common literals like / and \
  • better still perhaps a value that correctly represents the path separator for the local OS?

But take my feedback with a pinch of salt - I'm still figuring my way around 😊

Thanks again for your help!

[JanDeDobbeleer]

@GavinOsborn git is always using those paths, I'll trim it off. Expect a fix asap (probably tomorrow as it's 23:00 here).

[GavinOsborn]

Take your time. It's only software 😄

…

On Mon, 29 Aug 2022, 07:01 Jan De Dobbeleer, ***@***.***> wrote: @GavinOsborn <https://github.com/GavinOsborn> git is always using those paths, I'll trim it off. Expect a fix asap (probably tomorrow as it's 23:00 here). — Reply to this email directly, view it on GitHub <#2717 (reply in thread)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAEN7VBZL7BNWRUUGDWOPJ3V3PHSJANCNFSM572TVMIQ> . You are receiving this because you were mentioned.Message ID: ***@***.*** com>

[JanDeDobbeleer]

We could, but is there an issue with testing in this case? It's been a long while that function was implemented. You can try.

[lewis-yeung]

@JanDeDobbeleer No yet. I have just read through the code and found the differences between them, since the current implementation works fine, I won't change it. :)

[lewis-yeung]

@JanDeDobbeleer Oops. We know that Windows accepts / as path separator. Now I know why .RepoName was populated with :/Users/user/rep_test (mentioned here). I believe we need to adjust these:

oh-my-posh/src/environment/shell.go

Line 792 in 2a1fdff

for len(path) > 0 && string(path[len(path)-1]) == env.PathSeparator() {

oh-my-posh/src/environment/shell.go

Line 802 in 2a1fdff

for i >= 0 && string(path[i]) != env.PathSeparator() {

just like that in filepath.Base, we should use os.IsPathSeparator instead implement a simple function like os.IsPathSeparator.

[lewis-yeung]

@matcls The bug has been fixed. Please try the latest release.

[matcls]

@matcls The bug has been fixed. Please try the latest release.

Awesome, thanks!