[firefox] support uploading multiple commits to phabricator with phla…

…y and moz-phab

firefox/firefox-cinnabar.dockerfile

@@ -32,12 +32,17 @@ RUN sudo apt-get update \
  && python python/mozboot/bin/bootstrap.py --no-interactive --application-choice=browser \
  && sudo rm -rf /var/lib/apt/lists/*
 
-# Set up Mercurial extensions for Firefox.
+# Set up VCS extensions for Firefox.
 RUN mkdir -p /home/user/.mozbuild \
  && ./mach vcs-setup -u \
- && echo "\n# Add Mozilla's git commands to the PATH." >> /home/user/.bashrc \
+ && echo "\n# Add Mozilla's Git commands to the PATH." >> /home/user/.bashrc \
  && echo "PATH=\"\$PATH:/home/user/.mozbuild/version-control-tools/git/commands\"" >> /home/user/.bashrc
 
+# Install Phlay to support uploading multiple commits to Phabricator.
+RUN git clone https://github.com/mystor/phlay/ /home/user/.phlay \
+ && echo "\n# Add Phlay to the PATH." >> /home/user/.bashrc \
+ && echo "PATH=\"\$PATH:/home/user/.phlay\"" >> /home/user/.bashrc
+
 # Configure the IDEs to use Firefox's source directory as workspace.
 ENV WORKSPACE /home/user/firefox/
 

firefox/firefox-git.dockerfile

@@ -29,12 +29,17 @@ RUN sudo apt-get update \
  && python python/mozboot/bin/bootstrap.py --no-interactive --application-choice=browser \
  && sudo rm -rf /var/lib/apt/lists/*
 
-# Set up Mercurial extensions for Firefox.
+# Set up VCS extensions for Firefox.
 RUN mkdir -p /home/user/.mozbuild \
  && ./mach vcs-setup -u \
- && echo "\n# Add Mozilla's git commands to the PATH." >> /home/user/.bashrc \
+ && echo "\n# Add Mozilla's Git commands to the PATH." >> /home/user/.bashrc \
  && echo "PATH=\"\$PATH:/home/user/.mozbuild/version-control-tools/git/commands\"" >> /home/user/.bashrc
 
+# Install Phlay to support uploading multiple commits to Phabricator.
+RUN git clone https://github.com/mystor/phlay/ /home/user/.phlay \
+ && echo "\n# Add Phlay to the PATH." >> /home/user/.bashrc \
+ && echo "PATH=\"\$PATH:/home/user/.phlay\"" >> /home/user/.bashrc
+
 # Configure the IDEs to use Firefox's source directory as workspace.
 ENV WORKSPACE /home/user/firefox/
 

firefox/firefox-hg.dockerfile

@@ -20,6 +20,11 @@ RUN sudo apt-get update \
 RUN mkdir -p /home/user/.mozbuild \
  && ./mach vcs-setup -u
 
+# Install moz-phab to support uploading multiple commits to Phabricator.
+RUN git clone https://github.com/mozilla-conduit/review/ /home/user/.moz-phab \
+ && echo "\n# Add moz-phab to the PATH." >> /home/user/.bashrc \
+ && echo "PATH=\"\$PATH:/home/user/.moz-phab\"" >> /home/user/.bashrc
+
 # Configure the IDEs to use Firefox's source directory as workspace.
 ENV WORKSPACE /home/user/firefox/
 

firefox/janitor-cinnabar.json

@@ -34,6 +34,6 @@
     },
     "Clobber build": "./mach clobber",
     "Update source code": "git pull --rebase origin master",
-    "Send to code review (Phabricator)": "arc diff"
+    "Send to code review": "phlay"
   }
 }

firefox/janitor-git.json

@@ -34,6 +34,6 @@
     },
     "Clobber build": "./mach clobber",
     "Update source code": "git pull --rebase origin master",
-    "Send to code review (Phabricator)": "arc diff"
+    "Send to code review": "phlay"
   }
 }

firefox/janitor-hg.json

@@ -34,6 +34,6 @@
     },
     "Clobber build": "./mach clobber",
     "Update source code": "hg pull -u",
-    "Send to code review": "arc diff"
+    "Send to code review": "moz-phab submit"
   }
 }