Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package powerline-go for openSUSE:Factory checked in at 2023-07-18 21:54:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerline-go (Old) and /work/SRC/openSUSE:Factory/.powerline-go.new.3193 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerline-go" Tue Jul 18 21:54:03 2023 rev:2 rq:1098928 version:1.24 Changes: -------- --- /work/SRC/openSUSE:Factory/powerline-go/powerline-go.changes 2023-03-21 17:41:43.933888861 +0100 +++ /work/SRC/openSUSE:Factory/.powerline-go.new.3193/powerline-go.changes 2023-07-18 21:54:10.942313505 +0200 @@ -1,0 +2,14 @@ +Sun Jul 16 10:57:41 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- update to 1.24: + * Add exit codes for an IBM Z OS, named 'zos' + * Goreleaser pipeline to build more archs and make release + workflow more reliable + * AWS module try to use AWS_VAULT when AWS_PROFILE is not set + * Use altermative prompt from python venv + * Background tasks should use --no-optional-locks to prevent + issues with other tools running at the same time. + * Add "git branch" symbol to gitlite module (if git mode is not + "compact") + +------------------------------------------------------------------- Old: ---- powerline-go-1.22.1.tar.gz New: ---- powerline-go-1.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerline-go.spec ++++++ --- /var/tmp/diff_new_pack.snUZ7C/_old 2023-07-18 21:54:11.774318096 +0200 +++ /var/tmp/diff_new_pack.snUZ7C/_new 2023-07-18 21:54:11.778318118 +0200 @@ -17,7 +17,7 @@ Name: powerline-go -Version: 1.22.1 +Version: 1.24 Release: 0 Summary: A Powerline like prompt for Bash, ZSH and Fish License: GPL-3.0-or-later @@ -25,8 +25,8 @@ URL: https://github.com/justjanne/powerline-go Source0: https://github.com/justjanne/powerline-go/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.17 BuildRequires: golang-packaging +BuildRequires: golang(API) = 1.20 %{go_nostrip} %description ++++++ powerline-go-1.22.1.tar.gz -> powerline-go-1.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/.github/workflows/build.yml new/powerline-go-1.24/.github/workflows/build.yml --- old/powerline-go-1.22.1/.github/workflows/build.yml 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/.github/workflows/build.yml 2023-05-25 11:04:53.000000000 +0200 @@ -1,42 +1,24 @@ name: Build -on: push +on: + pull_request: {} + merge_group: + types: [checks_requested] + push: {} jobs: - release: - name: Build release binaries + build: runs-on: ubuntu-latest - strategy: - matrix: - os: [ 'darwin', 'windows', 'freebsd', 'netbsd', 'openbsd' ] - arch: [ 'amd64' ] - go-version: [ '1.15', '1.16', '1.17' ] + name: Build binaries steps: - - name: Checkout the repository - uses: actions/checkout@master - - name: Setup Golang - uses: actions/setup-go@v1 + - uses: actions/checkout@v3 with: - go-version: ${{ matrix.go-version }} - - run: go build -o release/powerline-go-$GOOS-$GOARCH - env: - CGO_ENABLED: 0 - GOOS: ${{ matrix.os }} - GOARCH: ${{ matrix.arch }} - release-linux: - name: Build release binaries for linux - runs-on: ubuntu-latest - strategy: - matrix: - arch: [ 'amd64', 'arm64', 'arm' ] - go-version: [ '1.15', '1.16', '1.17' ] - steps: - - name: Checkout the repository - uses: actions/checkout@master - - name: Setup Golang - uses: actions/setup-go@v1 + fetch-depth: 0 + - run: git fetch --force --tags + - uses: actions/setup-go@v4 + with: + go-version: "1.20" + - uses: goreleaser/goreleaser-action@v4 with: - go-version: ${{ matrix.go-version }} - - run: go build -o release/powerline-go-$GOOS-$GOARCH - env: - CGO_ENABLED: 0 - GOOS: linux - GOARCH: ${{ matrix.arch }} + distribution: goreleaser + version: latest + args: build --clean --snapshot + - run: dist/powerline-go_linux_amd64_v1/powerline-go --help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/.github/workflows/release.yml new/powerline-go-1.24/.github/workflows/release.yml --- old/powerline-go-1.22.1/.github/workflows/release.yml 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/.github/workflows/release.yml 2023-05-25 11:04:53.000000000 +0200 @@ -1,105 +1,26 @@ name: Release on: - release: - types: [created] + push: + tags: + - v* +permissions: + contents: write jobs: - release-linux: - name: Build release binaries for linux - runs-on: ubuntu-latest - strategy: - matrix: - arch: [ 'amd64', 'arm64', 'arm' ] - steps: - - name: Checkout the repository - uses: actions/checkout@master - - name: Setup Golang - uses: actions/setup-go@v1 - with: - go-version: '1.15' - - run: go build -o release/powerline-go-$GOOS-$GOARCH - env: - CGO_ENABLED: 0 - GOOS: linux - GOARCH: ${{ matrix.arch }} - - name: Upload the artifacts - uses: skx/github-action-publish-binaries@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - args: 'release/powerline-go-*' - release-macos: - name: Build release binaries for macOS - runs-on: ubuntu-latest - strategy: - matrix: - arch: [ 'amd64' ] - # arm64 for darwin is disabled as it's not currently supported by the go - # compiler for our use case - steps: - - name: Checkout the repository - uses: actions/checkout@master - - name: Setup Golang - uses: actions/setup-go@v1 - with: - go-version: '1.15' - - run: go build -o release/powerline-go-$GOOS-$GOARCH - env: - CGO_ENABLED: 0 - GOOS: darwin - GOARCH: ${{ matrix.arch }} - - name: Upload the artifacts - uses: skx/github-action-publish-binaries@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - args: 'release/powerline-go-*' - release-windows: - name: Build release binaries for windows - runs-on: ubuntu-latest - strategy: - matrix: - arch: [ 'amd64' ] - # arm64 for windows is disabled as it's not currently supported by the - # go compiler for our use case - steps: - - name: Checkout the repository - uses: actions/checkout@master - - name: Setup Golang - uses: actions/setup-go@v1 - with: - go-version: '1.15' - - run: go build -o release/powerline-go-$GOOS-$GOARCH - env: - CGO_ENABLED: 0 - GOOS: windows - GOARCH: ${{ matrix.arch }} - - name: Upload the artifacts - uses: skx/github-action-publish-binaries@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - args: 'release/powerline-go-*' - release-bsd: - name: Build release binaries for BSD + release: runs-on: ubuntu-latest - strategy: - matrix: - os: [ 'freebsd', 'netbsd', 'openbsd' ] + name: Release binaries steps: - - name: Checkout the repository - uses: actions/checkout@master - - name: Setup Golang - uses: actions/setup-go@v1 + - uses: actions/checkout@v3 with: - go-version: '1.15' - - run: go build -o release/powerline-go-$GOOS-$GOARCH - env: - CGO_ENABLED: 0 - GOOS: ${{ matrix.os }} - GOARCH: amd64 - - name: Upload the artifacts - uses: skx/github-action-publish-binaries@master + fetch-depth: 0 + - run: git fetch --force --tags + - uses: actions/setup-go@v4 + with: + go-version: "1.20" + - uses: goreleaser/goreleaser-action@v4 + with: + distribution: goreleaser + version: latest + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - args: 'release/powerline-go-*' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/.gitignore new/powerline-go-1.24/.gitignore --- old/powerline-go-1.22.1/.gitignore 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/.gitignore 2023-05-25 11:04:53.000000000 +0200 @@ -4,6 +4,7 @@ *.so *.dylib powerline-go +/dist/ # Test binary, build with `go test -c` *.test @@ -15,4 +16,5 @@ .glide/ /.idea/ -~ + +.vscode/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/.goreleaser.yaml new/powerline-go-1.24/.goreleaser.yaml --- old/powerline-go-1.22.1/.goreleaser.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/powerline-go-1.24/.goreleaser.yaml 2023-05-25 11:04:53.000000000 +0200 @@ -0,0 +1,42 @@ +project_name: powerline-go + +before: + hooks: + - go mod download + +builds: + - binary: powerline-go + env: + - CGO_ENABLED=0 + goarch: + - amd64 + - arm + - arm64 + - "386" + goos: + - darwin + - linux + - windows + - freebsd + - netbsd + - openbsd + ignore: + - goos: darwin + goarch: "386" + - goos: openbsd + goarch: arm + flags: + - -trimpath + ldflags: + - -s + - -w + +archives: + - name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}" + format: binary + +checksum: + name_template: checksums.txt + +changelog: + use: github diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/exitcode/exitcode_zos.go new/powerline-go-1.24/exitcode/exitcode_zos.go --- old/powerline-go-1.22.1/exitcode/exitcode_zos.go 1970-01-01 01:00:00.000000000 +0100 +++ new/powerline-go-1.24/exitcode/exitcode_zos.go 2023-05-25 11:04:53.000000000 +0200 @@ -0,0 +1,38 @@ +package exitcode + +var Signals = map[int]string{ + 0x01: "SIGHUP", + 0x02: "SIGINT", + 0x03: "SIGABRT", + 0x04: "SIGILL", + 0x05: "SIGPOLL", + 0x06: "SIGURG", + 0x07: "SIGSTOP", + 0x08: "SIGFPE", + 0x09: "SIGKILL", + 0x0a: "SIGBUS", + 0x0b: "SIGSEGV", + 0x0c: "SIGSYS", + 0x0d: "SIGPIPE", + 0x0e: "SIGALRM", + 0x0f: "SIGTERM", + 0x10: "SIGUSR1", + 0x11: "SIGUSR2", + 0x12: "SIGABND", + 0x13: "SIGCONT", + 0x14: "SIGCHLD", + 0x15: "SIGTTIN", + 0x16: "SIGTTOU", + 0x17: "SIGIO", + 0x18: "SIGQUIT", + 0x19: "SIGTSTP", + 0x1a: "SIGTRAP", + 0x1b: "SIGIOERR", + 0x1c: "SIGWINCH", + 0x1d: "SIGXCPU", + 0x1e: "SIGXFSZ", + 0x1f: "SIGVTALRM", + 0x20: "SIGPROF", + 0x26: "SIGDCE", + 0x27: "SIGDUMP", +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/go.mod new/powerline-go-1.24/go.mod --- old/powerline-go-1.22.1/go.mod 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/go.mod 2023-05-25 11:04:53.000000000 +0200 @@ -5,8 +5,9 @@ require ( github.com/mattn/go-runewidth v0.0.9 github.com/shirou/gopsutil/v3 v3.22.3 - golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 - golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 - golang.org/x/text v0.3.4 + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + golang.org/x/text v0.3.8 + gopkg.in/ini.v1 v1.66.4 gopkg.in/yaml.v2 v2.4.0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/go.sum new/powerline-go-1.24/go.sum --- old/powerline-go-1.22.1/go.sum 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/go.sum 2023-05-25 11:04:53.000000000 +0200 @@ -22,22 +22,44 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/segment-aws.go new/powerline-go-1.24/segment-aws.go --- old/powerline-go-1.22.1/segment-aws.go 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/segment-aws.go 2023-05-25 11:04:53.000000000 +0200 @@ -10,7 +10,10 @@ profile := os.Getenv("AWS_PROFILE") region := os.Getenv("AWS_DEFAULT_REGION") if profile == "" { - return []pwl.Segment{} + profile = os.Getenv("AWS_VAULT") + if profile == "" { + return []pwl.Segment{} + } } var r string if region != "" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/segment-cwd.go new/powerline-go-1.24/segment-cwd.go --- old/powerline-go-1.22.1/segment-cwd.go 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/segment-cwd.go 2023-05-25 11:04:53.000000000 +0200 @@ -105,7 +105,13 @@ pathSeparator := string(os.PathSeparator) pathSegments := make([]pathSegment, 0) - if strings.HasPrefix(cwd, p.userInfo.HomeDir) { + if cwd == p.userInfo.HomeDir { + pathSegments = append(pathSegments, pathSegment{ + path: "~", + home: true, + }) + cwd = "" + } else if strings.HasPrefix(cwd, p.userInfo.HomeDir+pathSeparator) { pathSegments = append(pathSegments, pathSegment{ path: "~", home: true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/segment-git.go new/powerline-go-1.24/segment-git.go --- old/powerline-go-1.22.1/segment-git.go 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/segment-git.go 2023-05-25 11:04:53.000000000 +0200 @@ -121,9 +121,9 @@ } func getGitDetachedBranch(p *powerline) string { - out, err := runGitCommand("git", "rev-parse", "--short", "HEAD") + out, err := runGitCommand("git", "--no-optional-locks", "rev-parse", "--short", "HEAD") if err != nil { - out, err := runGitCommand("git", "symbolic-ref", "--short", "HEAD") + out, err := runGitCommand("git", "--no-optional-locks", "symbolic-ref", "--short", "HEAD") if err != nil { return "Error" } @@ -160,7 +160,7 @@ } func repoRoot(path string) (string, error) { - out, err := runGitCommand("git", "rev-parse", "--show-toplevel") + out, err := runGitCommand("git", "--no-optional-locks", "rev-parse", "--show-toplevel") if err != nil { return "", err } @@ -187,7 +187,7 @@ } args := []string{ - "status", "--porcelain", "-b", "--ignore-submodules", + "--no-optional-locks", "status", "--porcelain", "-b", "--ignore-submodules", } if p.cfg.GitAssumeUnchangedSize > 0 { @@ -262,7 +262,7 @@ } if stashEnabled { - out, err = runGitCommand("git", "rev-list", "-g", "refs/stash") + out, err = runGitCommand("git", "--no-optional-locks", "rev-list", "-g", "refs/stash") if err == nil { stats.stashed = strings.Count(out, "\n") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/segment-gitlite.go new/powerline-go-1.24/segment-gitlite.go --- old/powerline-go-1.22.1/segment-gitlite.go 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/segment-gitlite.go 2023-05-25 11:04:53.000000000 +0200 @@ -1,6 +1,7 @@ package main import ( + "fmt" "strings" pwl "github.com/justjanne/powerline-go/powerline" @@ -8,7 +9,7 @@ func segmentGitLite(p *powerline) []pwl.Segment { if len(p.ignoreRepos) > 0 { - out, err := runGitCommand("git", "rev-parse", "--show-toplevel") + out, err := runGitCommand("git", "--no-optional-locks", "rev-parse", "--show-toplevel") if err != nil { return []pwl.Segment{} } @@ -18,7 +19,7 @@ } } - out, err := runGitCommand("git", "rev-parse", "--abbrev-ref", "HEAD") + out, err := runGitCommand("git", "--no-optional-locks", "rev-parse", "--abbrev-ref", "HEAD") if err != nil { return []pwl.Segment{} } @@ -32,6 +33,10 @@ branch = status } + if p.cfg.GitMode != "compact" && len(p.symbols.RepoBranch) > 0 { + branch = fmt.Sprintf("%s %s", p.symbols.RepoBranch, branch) + } + return []pwl.Segment{{ Name: "git-branch", Content: branch, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerline-go-1.22.1/segment-virtualenv.go new/powerline-go-1.24/segment-virtualenv.go --- old/powerline-go-1.22.1/segment-virtualenv.go 2022-04-21 10:54:05.000000000 +0200 +++ new/powerline-go-1.24/segment-virtualenv.go 2023-05-25 11:04:53.000000000 +0200 @@ -4,6 +4,8 @@ "os" "path" + "gopkg.in/ini.v1" + pwl "github.com/justjanne/powerline-go/powerline" ) @@ -11,6 +13,12 @@ var env string if env == "" { env, _ = os.LookupEnv("VIRTUAL_ENV") + if env != "" { + cfg, err := ini.Load(path.Join(env, "pyvenv.cfg")) + if err == nil { + env = cfg.Section("").Key("prompt").String() + } + } } if env == "" { env, _ = os.LookupEnv("CONDA_ENV_PATH") ++++++ vendor.tar.gz ++++++ ++++ 24906 lines of diff (skipped)
