1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

Bump gocui

... and import stefanhaller's tcell fork for real rather than just replacing it

This solves the problem that people trying to
"go install github.com/jesseduffield/lazygit@latest" would get the error

go: github.com/jesseduffield/lazygit@latest (in github.com/jesseduffield/lazygit@v0.40.0):
  The go.mod file for the module providing named packages contains one or
  more replace directives. It must not contain directives that would cause
  it to be interpreted differently than if it were the main module.
This commit is contained in:
Stefan Haller
2023-08-06 12:01:08 +02:00
parent 9cc18bd7e6
commit 7ccb871a45
139 changed files with 538 additions and 292 deletions

View File

@ -1,58 +0,0 @@
// Copyright 2020 The TCell Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use file except in compliance with the License.
// You may obtain a copy of the license at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// Package extended contains an extended set of terminal descriptions.
// Applications desiring to have a better chance of Just Working by
// default should include this package. This will significantly increase
// the size of the program.
package extended
import (
// The following imports just register themselves --
// these are the terminal types we aggregate in this package.
_ "github.com/gdamore/tcell/v2/terminfo/a/aixterm"
_ "github.com/gdamore/tcell/v2/terminfo/a/alacritty"
_ "github.com/gdamore/tcell/v2/terminfo/a/ansi"
_ "github.com/gdamore/tcell/v2/terminfo/b/beterm"
_ "github.com/gdamore/tcell/v2/terminfo/c/cygwin"
_ "github.com/gdamore/tcell/v2/terminfo/d/dtterm"
_ "github.com/gdamore/tcell/v2/terminfo/e/emacs"
_ "github.com/gdamore/tcell/v2/terminfo/f/foot"
_ "github.com/gdamore/tcell/v2/terminfo/g/gnome"
_ "github.com/gdamore/tcell/v2/terminfo/h/hpterm"
_ "github.com/gdamore/tcell/v2/terminfo/k/konsole"
_ "github.com/gdamore/tcell/v2/terminfo/k/kterm"
_ "github.com/gdamore/tcell/v2/terminfo/l/linux"
_ "github.com/gdamore/tcell/v2/terminfo/p/pcansi"
_ "github.com/gdamore/tcell/v2/terminfo/r/rxvt"
_ "github.com/gdamore/tcell/v2/terminfo/s/screen"
_ "github.com/gdamore/tcell/v2/terminfo/s/simpleterm"
_ "github.com/gdamore/tcell/v2/terminfo/s/sun"
_ "github.com/gdamore/tcell/v2/terminfo/t/termite"
_ "github.com/gdamore/tcell/v2/terminfo/t/tmux"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt100"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt102"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt220"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt320"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt400"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt420"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt52"
_ "github.com/gdamore/tcell/v2/terminfo/w/wy50"
_ "github.com/gdamore/tcell/v2/terminfo/w/wy60"
_ "github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi"
_ "github.com/gdamore/tcell/v2/terminfo/x/xfce"
_ "github.com/gdamore/tcell/v2/terminfo/x/xterm"
_ "github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty"
_ "github.com/gdamore/tcell/v2/terminfo/x/xterm_termite"
)

View File

@ -4,7 +4,7 @@
package gocui
import "github.com/gdamore/tcell/v2"
import "github.com/stefanhaller/tcell/v2"
// Attribute affects the presentation of characters, such as color, boldness, etc.
type Attribute uint64

View File

@ -12,9 +12,9 @@ import (
"sync"
"time"
"github.com/gdamore/tcell/v2"
"github.com/go-errors/errors"
"github.com/mattn/go-runewidth"
"github.com/stefanhaller/tcell/v2"
)
// OutputMode represents an output mode, which determines how colors

View File

@ -7,7 +7,7 @@ package gocui
import (
"strings"
"github.com/gdamore/tcell/v2"
"github.com/stefanhaller/tcell/v2"
)
// Key represents special keys or keys combinations.

View File

@ -5,8 +5,8 @@
package gocui
import (
"github.com/gdamore/tcell/v2"
"github.com/mattn/go-runewidth"
"github.com/stefanhaller/tcell/v2"
)
// We probably don't want this being a global variable for YOLO for now

View File

@ -13,9 +13,9 @@ import (
"unicode"
"unicode/utf8"
"github.com/gdamore/tcell/v2"
"github.com/go-errors/errors"
"github.com/mattn/go-runewidth"
"github.com/stefanhaller/tcell/v2"
)
// Constants for overlapping edges

View File

@ -172,7 +172,7 @@ import (
"fmt"
"log"
"github.com/gdamore/tcell/v2"
"github.com/stefanhaller/tcell/v2"
)
func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string) {

View File

@ -18,7 +18,7 @@ import (
"errors"
"time"
"github.com/gdamore/tcell/v2/terminfo"
"github.com/stefanhaller/tcell/v2/terminfo"
)
var (

View File

@ -2,7 +2,7 @@
package aixterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package alacritty
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package alacritty
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package ansi
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package beterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -24,9 +24,9 @@ package base
import (
// The following imports just register themselves --
// thse are the terminal types we aggregate in this package.
_ "github.com/gdamore/tcell/v2/terminfo/a/ansi"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt100"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt102"
_ "github.com/gdamore/tcell/v2/terminfo/v/vt220"
_ "github.com/gdamore/tcell/v2/terminfo/x/xterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/a/ansi"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt100"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt102"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt220"
_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm"
)

View File

@ -2,7 +2,7 @@
package cygwin
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package dtterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -29,7 +29,7 @@ import (
"strconv"
"strings"
"github.com/gdamore/tcell/v2/terminfo"
"github.com/stefanhaller/tcell/v2/terminfo"
)
type termcap struct {

View File

@ -2,7 +2,7 @@
package emacs
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -0,0 +1,58 @@
// Copyright 2020 The TCell Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use file except in compliance with the License.
// You may obtain a copy of the license at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// Package extended contains an extended set of terminal descriptions.
// Applications desiring to have a better chance of Just Working by
// default should include this package. This will significantly increase
// the size of the program.
package extended
import (
// The following imports just register themselves --
// these are the terminal types we aggregate in this package.
_ "github.com/stefanhaller/tcell/v2/terminfo/a/aixterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/a/alacritty"
_ "github.com/stefanhaller/tcell/v2/terminfo/a/ansi"
_ "github.com/stefanhaller/tcell/v2/terminfo/b/beterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/c/cygwin"
_ "github.com/stefanhaller/tcell/v2/terminfo/d/dtterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/e/emacs"
_ "github.com/stefanhaller/tcell/v2/terminfo/f/foot"
_ "github.com/stefanhaller/tcell/v2/terminfo/g/gnome"
_ "github.com/stefanhaller/tcell/v2/terminfo/h/hpterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/k/konsole"
_ "github.com/stefanhaller/tcell/v2/terminfo/k/kterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/l/linux"
_ "github.com/stefanhaller/tcell/v2/terminfo/p/pcansi"
_ "github.com/stefanhaller/tcell/v2/terminfo/r/rxvt"
_ "github.com/stefanhaller/tcell/v2/terminfo/s/screen"
_ "github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/s/sun"
_ "github.com/stefanhaller/tcell/v2/terminfo/t/termite"
_ "github.com/stefanhaller/tcell/v2/terminfo/t/tmux"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt100"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt102"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt220"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt320"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt400"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt420"
_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt52"
_ "github.com/stefanhaller/tcell/v2/terminfo/w/wy50"
_ "github.com/stefanhaller/tcell/v2/terminfo/w/wy60"
_ "github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi"
_ "github.com/stefanhaller/tcell/v2/terminfo/x/xfce"
_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm"
_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty"
_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite"
)

View File

@ -2,7 +2,7 @@
package foot
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package gnome
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package hpterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package konsole
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package kterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package linux
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package pcansi
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package rxvt
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package screen
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package simpleterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -20,7 +20,7 @@
package sun
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package termite
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package tmux
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt100
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt102
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt220
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt320
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt400
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt420
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package vt52
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package wy50
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package wy60
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package wy99_ansi
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package xfce
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -20,7 +20,7 @@
package xterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package xterm
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package xterm_kitty
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -2,7 +2,7 @@
package xterm_termite
import "github.com/gdamore/tcell/v2/terminfo"
import "github.com/stefanhaller/tcell/v2/terminfo"
func init() {

View File

@ -20,5 +20,5 @@ package tcell
import (
// This imports the default terminal entries. To disable, use the
// tcell_minimal build tag.
_ "github.com/gdamore/tcell/v2/terminfo/extended"
_ "github.com/stefanhaller/tcell/v2/terminfo/extended"
)

View File

@ -25,8 +25,8 @@ import (
// also don't support Android here, because you really don't want
// to run external programs there. Generally the android terminals
// will be automatically included anyway.
"github.com/gdamore/tcell/v2/terminfo"
"github.com/gdamore/tcell/v2/terminfo/dynamic"
"github.com/stefanhaller/tcell/v2/terminfo"
"github.com/stefanhaller/tcell/v2/terminfo/dynamic"
)
func loadDynamicTerminfo(term string) (*terminfo.Terminfo, error) {

View File

@ -20,7 +20,7 @@ package tcell
import (
"errors"
"github.com/gdamore/tcell/v2/terminfo"
"github.com/stefanhaller/tcell/v2/terminfo"
)
func loadDynamicTerminfo(_ string) (*terminfo.Terminfo, error) {

View File

@ -31,10 +31,10 @@ import (
"golang.org/x/term"
"golang.org/x/text/transform"
"github.com/gdamore/tcell/v2/terminfo"
"github.com/stefanhaller/tcell/v2/terminfo"
// import the stock terminals
_ "github.com/gdamore/tcell/v2/terminfo/base"
_ "github.com/stefanhaller/tcell/v2/terminfo/base"
)
// NewTerminfoScreen returns a Screen that uses the stock TTY interface