Mozilla stuff

Uhm...

2014-10-28

Make a diff of git new and untracked files

make a diff of git new and untracked files: git diff --no-index /dev/null filename

2014-10-23

http://jenkins1.qa.scl3.mozilla.com/

http://jenkins1.qa.scl3.mozilla.com/

https://datazilla.mozilla.org/b2g/

https://datazilla.mozilla.org/b2g/

Gaia Python Functional Integration Tests = gaia-ui tests

Gaia Python Functional Integration Tests = gaia-ui tests
== Gip on treeherder

git checkout -b new_branch from inside other branch

Note to self, when you do git checkout -b new_branch on an old_branch, you are continuing form that old_branch.
So better to start from master, unless you really know what you are doing.

2014-10-22

Squashing commits in github

http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

2014-10-21

Useful links from Richard using github

https://mana.mozilla.org/wiki/display/~rpappalardo@mozilla.com/git#git-Remote&LocalOperations

https://mana.mozilla.org/wiki/display/~rpappalardo@mozilla.com/B2G+Testing

http://rpappalax.wordpress.com/2014/09/03/github-remote-github-remote-github-remote-github-local/ 

https://github.com/rpappalax/demo-fork-branch-rebase

https://github.com/veganbacon/demo-fork-branch-rebase

https://github.com/mwargers/demo-fork-branch-rebase

http://stackoverflow.com/questions/14506910/git-move-changes-off-of-master-branch

Marionette client API documentation

http://marionette-client.readthedocs.org/en/latest/#

Gaia-UI test API documentation

Submitting a Gaia patch

https://developer.mozilla.org/en-US/Firefox_OS/Developing_Gaia/Submitting_a_Gaia_patch

to update your local repository: git pull --rebase upstream master

git pull --rebase upstream master

to get a clean and updated virtualenv for gaia-ui-test

wipeenv
virtualenv new_env
python setup.py develop in gaia-ui-test

2014-10-17

Some git commands

To see all availabe branches (similar to available mercurial queues): git branch
To make a new branch: git branch branch_name
To go to a specific branch: git checkout branch_name

To add changes to a github pull request:
git add . (git add --all also removes entries when there are removed files)
git commit -m "your commit message"
git push https://github.com/mwargers/gaia.git branch_name

To see changed files between master and your branch:
git diff --name-status master..branch_name

To remove file from git: git rm file_name

How to prevent pushing changes to master (at least without warning):
git config push.default nothing

2014-10-14

https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches

https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches

update master

git fetch upstream
git merge upstream/master

Git vs Mercurial

Git Mercurial
git pull hg pull -u
git fetch hg pull
git reset --hard hg update -C
git revert hg backout
git add hg add (Only equivalent when is not tracked.)
git add Not necessary in Mercurial.
git reset Not necessary in Mercurial.
git add -i hg record
git commit -a hg commit
git commit --amend hg commit --amend
git blame hg blame or hg annotate
git blame -C (closest equivalent): hg grep --all
git bisect hg bisect
git rebase --interactive hg histedit (Requires the HisteditExtension.)
git stash hg shelve (Requires the ShelveExtension or the AtticExtension.)
git merge hg merge
git cherry-pick hg graft
git rebase hg rebase -d (Requires the RebaseExtension.)
git format-patch and git send-mail hg email -r (Requires the PatchbombExtension.)
git am hg mimport -m (Requires the MboxExtension and the MqExtension. Imports patches to mq.)
git checkout HEAD hg update
git log -n hg log --limit n
git push hg push

How to create a patch from a github pull request

https://coderwall.com/p/6aw72a

2014-10-13

Local content over local web server

Local content over local web server:
http://mxr.mozilla.org/gaia/source/tests/python/gaia-ui-tests/gaiatest/resources/

https://github.com/mozilla-b2g/gaia/blob/master/tests/python/gaia-ui-tests/gaiatest/tests/functional/cost_control/test_cost_control_reset_wifi.py
search = Search(self.marionette)
search.launch()
search.go_to_url(self.marionette.absolute_url('mozilla.html'))

2014-10-03

Git regarding forking a repo