tea pr checkout: dont create local branches #314

noerw · 2020-12-17T18:15:01Z

noerw commented

2020-12-17 18:15:01 +00:00

This avoids creation of local branches, to avoid cluttering the local repo:

if the commit already exists on the tip of a local branch, check that one out
otherwise check out the remote tracking branch (refs/remotes/<remote>/<head>), and suggest what to do if you want to make changes.

I'm not certain this behaviour is actually better, I suggest leaving this open for a while for people to try out the new behaviour:

tea pr checkout 314
make install

fixes #293

This avoids creation of local branches, to avoid cluttering the local repo: - if the commit already exists on the tip of a local branch, check that one out - otherwise check out the remote tracking branch (`refs/remotes/<remote>/<head>`), and suggest what to do if you want to make changes. I'm not certain this behaviour is actually better, I suggest leaving this open for a while for people to try out the new behaviour: ``` tea pr checkout 314 make install ``` fixes #293

noerw added the

kind

enhancement

status/needs-feedback

labels 2020-12-17 18:15:01 +00:00

noerw added 1 commit 2020-12-17 18:15:01 +00:00

dont create local branch for remotes

if matching branch exists, use it, otherwise use remote tracking branch.
this avoids cluttering the local repo too much.

continuous-integration/drone/pr Build is passing

Details

750f8fa43e

6543 commented

2020-12-17 18:19:56 +00:00

can we add a flag to let tea do, what normaly would be only suggested?
"-b to create the branch ..." ?

can we add a flag to let tea do, what normaly would be only suggested? "`-b` to create the branch ..." ?

👍 1

noerw added 1 commit 2020-12-17 19:25:15 +00:00

Merge branch 'master' into checkout-use-remote-tracking-branch

continuous-integration/drone/pr Build is passing

Details

a36b36b3a8

lunny commented

2020-12-18 04:12:18 +00:00

can we add a flag to let tea do, what normaly would be only suggested?
"-b to create the branch ..." ?

I like the idea. If the -b is given, use that.

> can we add a flag to let tea do, what normaly would be only suggested? > "`-b` to create the branch ..." ? I like the idea. If the `-b` is given, use that.

noerw added 1 commit 2020-12-19 10:20:57 +00:00

add --branch flag 039a5036ad

noerw commented

2020-12-19 10:22:06 +00:00

added the --branch / -b boolean flag. providing a branch name is not supported, as then the case of using the default branch name would be quite awkward:

# this is not supported
tea pr checkout -b "foobar" 314 # checkout to localbranch "foobar"
tea pr checkout -b "" 314       # checkout to default branch name ("pulls/<idx>-<head-branch-name>")

added the `--branch` / `-b` **boolean** flag. providing a branch name is not supported, as then the case of using the default branch name would be quite awkward: ``` # this is not supported tea pr checkout -b "foobar" 314 # checkout to localbranch "foobar" tea pr checkout -b "" 314 # checkout to default branch name ("pulls/<idx>-<head-branch-name>") ```

noerw added 1 commit 2020-12-21 13:41:40 +00:00

Merge branch 'master' into checkout-use-remote-tracking-branch

continuous-integration/drone/pr Build is passing

Details

5454184f3b

6543 reviewed 2020-12-21 14:59:58 +00:00

Dismissed

modules/task/pull_checkout.go Outdated

						
				@ -8,3 +8,3 @@

					"fmt"

					"code.gitea.io/tea/modules/config"

					"code.gitea.io/tea/modules/context"

6543 commented

2020-12-21 14:59:58 +00:00

unessesary adding context into task

6543 marked this conversation as resolved

6543 commented

2020-12-21 16:09:27 +00:00

i thing it still should be a boolean flag not a string ...

in the case a branch with same name exist but it is not the same one it should simply fail with a meningfull error

i thing it still should be a boolean flag not a string ... in the case a branch with same name exist but it is not the same one it should simply fail with a meningfull error

noerw added 1 commit 2020-12-21 17:24:41 +00:00

Merge remote-tracking branch 'upstream/master' into checkout-use-remote-tracking-branch

continuous-integration/drone/pr Build is passing

Details

df57026ad5

6543 added 1 commit 2020-12-25 00:28:52 +00:00

Merge branch 'master' into checkout-use-remote-tracking-branch

continuous-integration/drone/pr Build is passing

Details

5cdc20fa9b

noerw added

status/needs-reviews