gitea/tea
gitea/tea
56
128
Fork 64
Code Issues 97 Pull Requests 19 Actions Releases 16 Activity

Add preference flag_defaults.remote, refactor #466

Merged
6543 merged 13 commits from noerw/tea:fix-458 into master 2022-03-28 23:34:14 +00:00
Conversation 2 Commits 13 Files Changed 2 +41 -20
noerw commented 2022-03-10 12:23:09 +00:00
Member
Copy Link

This is a refactor of the code last touched in #458, making the control flow less backwards.

Additionally, this adds a preference preferences.flag_defaults.remote that allows to skip this heuristic and set a custom fixed default value for the --remote flag.
I'm not sure this is actually needed, I can revert that commit.

This is a refactor of the code last touched in #458, making the control flow less backwards. Additionally, this adds a preference `preferences.flag_defaults.remote` that allows to skip this heuristic and set a custom fixed default value for the `--remote` flag. I'm not sure this is actually needed, I can revert that commit.
noerw added 3 commits 2022-03-10 12:23:10 +00:00
add preferences.default_origin 
if set, this skips the main branch based remote selection
All checks were successful
continuous-integration/drone/pr Build is passing
Details
e53c615164
noerw added the
kind
enhancement
 label 2022-03-11 07:40:55 +00:00
noerw added this to the v0.9.0 milestone 2022-03-11 07:41:00 +00:00
noerw added 1 commit 2022-03-11 07:54:55 +00:00
Re-revert #458 (kind of) 
When no main/master/trunk branch is present, fallback the remote
to origin or upstream. The previous PR used this fallback as default
case, which is was bothered me.
All checks were successful
continuous-integration/drone/pr Build is passing
Details
03bd42190f
noerw changed title from Add preference `default_remote` to skip branch based login selection to Fix remote selection priority, add `default_remote` preference 2022-03-11 08:02:00 +00:00
noerw force-pushed fix-458 from 03bd42190f to 366aea4a9d 2022-03-11 08:03:30 +00:00 Compare
noerw added 1 commit 2022-03-11 08:03:47 +00:00
Merge branch 'master' into fix-458
Some checks failed
continuous-integration/drone/pr Build is failing
Details
4ea7bd267d
noerw added the
kind/bug
 label 2022-03-11 08:05:22 +00:00
6543 added 1 commit 2022-03-13 00:55:07 +00:00
Merge branch 'master' into fix-458
All checks were successful
continuous-integration/drone/pr Build is passing
Details
4766c63aba
6543 approved these changes 2022-03-13 00:58:04 +00:00
6543 left a comment
Owner
Copy Link

agree this is more granular

agree this is more granular
noerw added 1 commit 2022-03-13 08:15:27 +00:00
Merge branch 'master' into fix-458
All checks were successful
continuous-integration/drone/pr Build is passing
Details
b0e7538914
noerw added 1 commit 2022-03-16 20:19:52 +00:00
rename config field 
preferences.default_remote -> preferences.flag_defaults.remote
All checks were successful
continuous-integration/drone/pr Build is passing
Details
d91ffe401a
noerw added 1 commit 2022-03-16 20:21:04 +00:00
fixup! rename config field
All checks were successful
continuous-integration/drone/pr Build is passing
Details
389d96ae71
arkamar commented 2022-03-18 11:22:25 +00:00
Contributor
Copy Link

I do like the default_remote change, but #458 does not prefer origin over main branch, actually it is kind of "fallback" when main is not present, you just wrote it in different way.

I do like the `default_remote` change, but #458 does not prefer `origin` over `main` branch, actually it is kind of "fallback" when `main` is not present, you just wrote it in different way.
noerw commented 2022-03-18 11:27:28 +00:00
Author
Member
Copy Link

@arkamar Damn, I just realized that you're totally right and the priority is no different. Should make sure I'm properly awake when reviewing things next time, sorry for the noise!
But I guess this PR makes the code section more readable / less backwards, so mistakes like these are less likely ?

@arkamar Damn, I just realized that you're totally right and the priority is no different. Should make sure I'm properly awake when reviewing things next time, sorry for the noise! But I guess this PR makes the code section more readable / less backwards, so mistakes like these are less likely ?
noerw added
kind
refactor
 and removed
kind/bug
 labels 2022-03-18 11:29:15 +00:00
noerw changed title from Fix remote selection priority, add `default_remote` preference to Add preference `flag_defaults.remote`, refactor 2022-03-18 11:29:47 +00:00
arkamar requested changes 2022-03-18 11:44:03 +00:00
modules/context/context.go Outdated
@ -162,4 +167,1 @@
if len(gitConfig.Remotes) >= 1 && len(remoteValue) == 0 {
for remote := range gitConfig.Remotes {
remoteValue = remote
}
arkamar commented 2022-03-18 11:43:51 +00:00
Contributor
Copy Link

You made tea by default unusable for repositories with just one remote by this change. This was here to selecet at least some remote if availeble but you moved it to a part for more than one remotes. In case of one remote tea pr prints this.

2022/03/18 12:42:17 Remote '' not found in this Git repository
You made `tea` by default unusable for repositories with just one remote by this change. This was here to selecet at least some remote if availeble but you moved it to a part for more than one remotes. In case of one remote `tea pr` prints this. ``` 2022/03/18 12:42:17 Remote '' not found in this Git repository ```
👍 1
noerw commented 2022-03-18 11:54:36 +00:00
Author
Member
Copy Link

fixed

fixed
noerw marked this conversation as resolved
noerw added 1 commit 2022-03-18 11:53:50 +00:00
fix logic for len(remotes)==1
All checks were successful
continuous-integration/drone/pr Build is passing
Details
82f89c271c
arkamar approved these changes 2022-03-18 12:18:30 +00:00
modules/context/context.go
@ -184,0 +188,4 @@
// make sure a remote is selected
if len(remoteValue) == 0 {
for remote := range gitConfig.Remotes {
remoteValue = remote
arkamar commented 2022-03-18 12:10:31 +00:00
Contributor
Copy Link

Maybe we can break after the first remote, there is no need to iterate through all of them.

Maybe we can break after the first remote, there is no need to iterate through all of them.
noerw commented 2022-03-19 11:12:54 +00:00
Author
Member
Copy Link

this is breaking though for little benefit in 99% of cases

this is breaking though for little benefit in 99% of cases
👍 1
6543 marked this conversation as resolved
6543 added 2 commits 2022-03-28 21:52:23 +00:00
Merge branch 'master' into fix-458
Some checks failed
continuous-integration/drone/pr Build is failing
Details
149b00e0e5
6543 approved these changes 2022-03-28 21:53:36 +00:00
zeripath added 1 commit 2022-03-28 23:18:54 +00:00
Merge branch 'master' into fix-458
All checks were successful
continuous-integration/drone/pr Build is passing
Details
1d25f40e65
zeripath approved these changes 2022-03-28 23:22:36 +00:00
6543 merged commit 6663d9f19b into master 2022-03-28 23:34:14 +00:00
6543 deleted branch fix-458 2022-03-28 23:34:14 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
arkamar
6543
zeripath
Labels
Clear labels   
kind/breaking

   
kind/bug

   
kind/build

   
kind/dependency

   
kind/deployment

   
kind/docs
  
kind
enhancement

  
kind
feature

  
kind/proposal
  
kind
question

  
kind
refactor

  
kind/security

   
kind/testing

   
kind/translation

   
priority/critical

   
priority/high

   
priority/low

   
priority/medium

   
reviewed/duplicate

   
reviewed/invalid

   
reviewed/wontfix

   
skip-changelog

   
status/blocked

   
status/has-backport

   
status/has-pull

   
status/needs-backport

   
status/needs-feedback

   
status/needs-reviews

   
status/wip

   
upstream/gitea

   
upstream/sdk
No Label
kind/breaking
kind/bug
kind/build
kind/dependency
kind/deployment
kind/docs
kind
enhancement
kind
feature
kind/proposal
kind
question
kind
refactor
kind/security
kind/testing
kind/translation
priority/critical
priority/high
priority/low
priority/medium
reviewed/duplicate
reviewed/invalid
reviewed/wontfix
skip-changelog
status/blocked
status/has-backport
status/has-pull
status/needs-backport
status/needs-feedback
status/needs-reviews
status/wip
upstream/gitea
upstream/sdk
Milestone
Clear milestone
No items
No Milestone
v0.9.0
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: gitea/tea#466
No description provided.
Delete Branch "noerw/tea:fix-458"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?