{"id":179,"date":"2007-10-16T16:14:04","date_gmt":"2007-10-16T20:14:04","guid":{"rendered":"http:\/\/benjamin.smedbergs.us\/blog\/2007-10-16\/sharing-mercurial-queues-to-develop-xpcomgc\/"},"modified":"2007-10-16T16:14:04","modified_gmt":"2007-10-16T20:14:04","slug":"sharing-mercurial-queues-to-develop-xpcomgc","status":"publish","type":"post","link":"http:\/\/benjamin.smedbergs.us\/blog\/2007-10-16\/sharing-mercurial-queues-to-develop-xpcomgc\/","title":{"rendered":"Sharing Mercurial Queues to Develop XPCOMGC"},"content":{"rendered":"<p>One of the development techniques we&#8217;re experimenting with for Mozilla2 is the use of <a href=\"http:\/\/hgbook.red-bean.com\/hgbookch12.html\">Mercurial Queues<\/a> (MQ). Queues are a way of maintaining a set of patches on top of a base repository.<\/p>\n<p>There are a few features of MQ that have made it very useful:<\/p>\n<ul>\n<li>You can merge a stack of patches with changes in the underlying repository, instead of ending up with patches that don&#8217;t apply and <tt>.rej<\/tt> files. The magic you are looking for is <tt>hg qsave -e -c; hg qpush -m<\/tt>.\n<li>Patches can be versioned: you can create a mercurial repository of patches, commit and push that repository to share patches between developers.\n<li>Patches can be reordered, folded together, and with some special tricks even split apart into multiple patches.\n<\/ul>\n<p>MQ is ideal for doing large coding experiments such as XPCOMGC: it can keep track of manual rewriting and automatic patches separately; patches can be saved for review and merging upstream without delaying coding work; and the patch repository can be shared between the team doing the work.<\/p>\n<p>The XPCOMGC patch repository is available publicly at <a href=\"http:\/\/hg.mozilla.org\/users\/bsmedberg_mozilla.com\/xpcomgc-patches\/\">http:\/\/hg.mozilla.org\/users\/bsmedberg_mozilla.com\/xpcomgc-patches\/<\/a>. The patches are against the <a href=\"http:\/\/hg.mozilla.org\/actionmonkey\/\">ActionMonkey<\/a> tree&#8230; please don&#8217;t expect much more than &#8220;it builds&#8221; yet&#8230; the browser won&#8217;t start yet, due to various unrooted objects, bad assumptions, and other undiagnosed problems.<\/p>\n<p><strong>Caution:<\/strong> To use MQ effectively, you must set the following settings in your ~\/.hgrc:<\/p>\n<pre>[extensions]\r\nhgext.mq =\r\n[diff]\r\ngit = 1<\/pre>\n<p>You must turn on git-style patches, or bad things will happen if you try to add\/remove\/move files!<\/p>\n","protected":false},"excerpt":{"rendered":"<p>One of the development techniques we&#8217;re experimenting with for Mozilla2 is the use of Mercurial Queues (MQ). Queues are a way of maintaining a set of patches on top of a base repository. There are a few features of MQ that have made it very useful: You can merge a stack of patches with changes [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[2],"tags":[41,56],"class_list":["post-179","post","type-post","status-publish","format-standard","hentry","category-mozilla","tag-mercurial","tag-mozilla2"],"_links":{"self":[{"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/posts\/179","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/comments?post=179"}],"version-history":[{"count":0,"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/posts\/179\/revisions"}],"wp:attachment":[{"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/media?parent=179"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/categories?post=179"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/benjamin.smedbergs.us\/blog\/wp-json\/wp\/v2\/tags?post=179"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}