Gitpod: track remote trac branch

[tobiasdiez]

Currently, gitpod tracks the branch on github as the remote. Thus, one might accidentally changes to github instead of trac. With this ticket, the remote is changed to trac.

CC: @mkoeppe

Component: build

Author: Tobias Diez

Branch/Commit: bbe8724

Reviewer: Matthias Koeppe

Issue created by migration from https://trac.sagemath.org/ticket/33589

[mkoeppe]

comment:2

I think git remote set-url --push origin git@trac.sagemath.org:sage.git would also be good to add

[tobiasdiez]

comment:3

Not sure if that's really a good idea. The git manual contains

Note that the push URL and the fetch URL, even though they can be set differently, must still refer to the same place. What you pushed to the push URL should be what you would see if you immediately fetched from the fetch URL. If you are trying to fetch from one place (e.g. your upstream) and push to another (e.g. your publishing repository), use two separate remotes.

Your idea was to prevent accidental commits to github, right? Would it be possible to restrict write access for the trac mirror repo to only allow the sync-hook to have write access?

[mkoeppe]

comment:4

It's already documented as standard procedure in src/doc/en/developer/manual_git.rst

[tobiasdiez]

comment:5

Where exactly? I can only find git remote set-url --push trac git@trac.sagemath.org:sage.git at https://doc.sagemath.org/html/en/developer/manual_git.html

[mkoeppe]

comment:6

Yes, that's the one.

[tobiasdiez]

comment:7

This is already included in the gitpod config:

      git remote add trac git@trac.sagemath.org:sage.git -t master -t develop -t $(git branch --show-current)
      git remote set-url --push trac git@trac.sagemath.org:sage.git
      git fetch trac
      git branch -u trac/$(git branch --show-current)

[mkoeppe]

comment:8

No, the first line is setting the wrong URL for fetching.

[tobiasdiez]

comment:9

I took this from the docs: https://doc.sagemath.org/html/en/developer/manual_git.html#the-trac-server

git remote add trac git@trac.sagemath.org:sage.git -t master

What is then the correct url?

[mkoeppe]

comment:10

Further up in the same section.

[tobiasdiez]

comment:11

git remote add trac https://github.com/sagemath/sagetrac-mirror.git -t master

Does not work well. If you then push something to trac, VS still notifies you that there are changes between your local and remote branch. The reason is that VS invokes git fetch directly after pushing, but then the sync hook has not yet been executed so it still fetches the old branch on github.