Bug 110073 – Add a script to automatically configure a git clone

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Ryosuke Niwa]

http://trac.webkit.org/wiki/UsingGitWithWebKit has a lot of instruction on how to setup a git clone.

e.g.
git svn init --prefix=origin/ -T trunk http://svn.webkit.org/repository/webkit
git config --replace svn-remote.svn.fetch trunk:refs/remotes/origin/master

git config core.webKitBranchBuild true

git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %A %B"

git config color.status auto
git config color.diff auto
git config color.branch auto

All of this should be automated in a script so that we don't have to remember to execute them. Since some of the configurations depend on the workflow a particular contributor uses, the script should probably ask a couple of questions at the beginning and set things up automatically based on the answers.

[Eric Seidel (no email)]

Don't forget the github workflows too. :)

[Ryosuke Niwa]

(In reply to comment #1)
> Don't forget the github workflows too. :)

Yeah, that's probably the first thing the script should ask.

As is, there are too many miscellaneous things each contributor needs to do before he/she can start submitting patches on a git clone while you can just run "svn co" and start writing patches on a subversion checkout.

[Eric Seidel (no email)]

Perhaps.  We could make a much more straight-forward git contribution path, but currently we're using several divergent git contribution paths as there is no officially sanctioned one.  You can't actually use git to contribute directly from a normal git pull/push model, but rather have to use the git-svn bridge.  And git.webkit.org itself isn't writeable, so you have to use github for any branches you'd like. :)  I'm not saying this is necessarily bad, but they do contribute to this proliferation of secondary solutions.

Given the results of Maciej's latest survey, which showed git-usage very high, I'm glad we're considering improving the workflow. :)
https://lists.webkit.org/pipermail/webkit-dev/2012-April/020198.html

[Ryosuke Niwa]

FYI, I'm not intending to work on this bug. I just filed it for the record so if anyone's interested in adding such a script, please do so.

[Ryosuke Niwa]

Created attachment 218339 [details]
Adds a new webkit-patch command

[Benjamin Poulain]

Comment on attachment 218339 [details]
Adds a new webkit-patch command

View in context: https://bugs.webkit.org/attachment.cgi?id=218339&action=review

Great idea!

> Tools/Scripts/webkitpy/tool/commands/setupgitclone.py:49
> +        run_git(["svn", "init", "--prefix=origin/", "-T", "trunk", "http://svn.webkit.org/repository/webkit"])

Should this be using https?

[Ryosuke Niwa]

Created attachment 218341 [details]
Patch for landing

[Ryosuke Niwa]

Comment on attachment 218341 [details]
Patch for landing

Clearing flags on attachment: 218341

Committed r160039: <http://trac.webkit.org/changeset/160039>

[Ryosuke Niwa]

All reviewed patches have been landed.  Closing bug.

[Ryosuke Niwa]

Committed r160043: <http://trac.webkit.org/changeset/160043>