summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-01-07 21:22:16 -0600
committerJeff Carr <[email protected]>2025-01-07 21:22:16 -0600
commitf6e303a1d25f325138c348af79244564770a65f4 (patch)
tree27b00614d3ebf05795fadc01d76394f94704ae70
parentea35f3c0fb4d3ac45569ed6a4715f7f1a25e4a02 (diff)
gitpb.Reload() after commitv0.22.38
-rw-r--r--newRepo.go13
-rw-r--r--scan.go2
2 files changed, 8 insertions, 7 deletions
diff --git a/newRepo.go b/newRepo.go
index 2a4d0ef..651259f 100644
--- a/newRepo.go
+++ b/newRepo.go
@@ -88,7 +88,6 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) {
newRepo.hidden = false
r.allrepos[pb.GetGoPath()] = newRepo
- // newRepo.NewScan()
newRepo.lastTag = r.reposgrid.NewLabel("")
newRepo.masterVersion = r.reposgrid.NewLabel("")
@@ -110,6 +109,9 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) {
log.Log(WARN, "show diff masterVersion =", newRepo.masterVersion.String())
// newRepo.Status.XtermNohup([]string{"git diff"})
newRepo.Xterm("git diff; bash")
+ pb := newRepo.pb
+ pb.Reload()
+ newRepo.NewScan()
r.reposbox.Enable()
})
@@ -131,12 +133,13 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) {
newRepo.XtermWait("git add --all")
newRepo.XtermWait("git commit -a")
newRepo.XtermWait("git push")
- if newRepo.Status.CheckDirty() {
- // commit was not done, restore diff
+ // this is paused here until the user closes the xterm window
+ if pb.CheckDirty() {
+ // commit was not actually done, restore the diff
pb.RunRealtimeVerbose([]string{"git", "restore", "--staged", "."})
- } else {
- newRepo.NewScan()
}
+ pb.Reload()
+ newRepo.NewScan()
r.reposbox.Enable()
})
diff --git a/scan.go b/scan.go
index 39e2836..e68747f 100644
--- a/scan.go
+++ b/scan.go
@@ -56,8 +56,6 @@ func (r *RepoRow) NewScan() int {
return changed
}
- pb.Reload()
-
if r.lastTag != nil {
r.lastTag.SetLabel(pb.GetLastTag())
}