Development/gerrit/compare

From The Document Foundation Wiki
Jump to navigation Jump to search
Gnome-document-open-recent.svg

This page was marked as inactive and is retained for historical reference.
Either the page is no longer relevant or consensus on its purpose has become unclear. To revive discussion, seek broader input via a forum such as one of our mailing lists.


Comparison of fd.o git and gerrit

This assumes we have completed the migration and gerrit.libreoffice.org is the default push-to location.

host git on fd.o gerrit (bypassing review) gerrit (with review)
group fd.o account had an fd.o account and completed gerrit setup submit = everyone / review = fd.o accounters
submitting
push local change to master git commit -a && git pull -r && git push git commit -a && git pull -r && git push n/a
submit local changes for review git commit -a && git format-patch -1 && send REVIEW mail with attached patch n/a git commit -a && ./logerrit submit (for release branches: git cherry-pick -x HASH && git push logerrit libreoffice-3-6:refs/for/libreoffice-3-6, if that doesn't work try e.g. git cherry-pick -x HASH && git push ssh://USERNAME@gerrit.libreoffice.org:29418/core libreoffice-3-6:refs/for/libreoffice-3-6)
querying
finding patches waiting for review not possible n/a ./logerrit query status:open
finding writer patches waiting for review not possible n/a email notification via "watched projects" / file:"^sc/" <- quotes are important
finding a patch for fdo#37737 waiting for review grep for subject and hope for the best n/a ./logerrit query message:fdo#37737
reviewing on commandline (or from scripts) only
getting the patch from the commandline not possible n/a ./logerrit checkout CHANGEID (or ./logerrit cherry-pick CHANGEID)*
build and approve commit from the commandline

(not last reviewer)

not possible n/a make && ./logerrit review (answer +, +, -)
build and approve commit from the commandline

(last reviewer)

not possible n/a make && ./logerrit review (answer +, +, +)
reviewing with browser/mail client
getting the patch with browser/mail client save attachment && git am p.patch && rm p.patch n/a paste command from browser
build and approve commit with browser/mail client

(not last reviewer)

make && reply REVIEWED to mail n/a make && "review" in the web UI
build and approve commit with browser/email

(last reviewer)

make && git pull -r && git push && send PUSHED mail n/a make && "review and submit" in the web UI
conflict resolution on push on push reviewer

(submitter never has conflicts)

tinderboxes
tinderbox runs after review/on master n/a before review (if submitter had commit access on fd.o before)

after initial review, but before merge to master (for anonymous submitters)

  • Where CHANGEID can be the "I<sha1>" identifier, or just the int number from the URL.