Add `./mach cargoup`

1 files changed, 17 insertions, 1 deletions

diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index d414a3324bc..314c5c2b8c1 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -233,7 +233,7 @@ class MachCommands(CommandBase):
         commit = json.load(urllib2.urlopen(url))["object"]["sha"]
         filename = path.join(self.context.topdir, "rust-commit-hash")
         with open(filename, "w") as f:
-            f.write(commit)
+            f.write(commit + "\n")
 
         # Reset self.config["tools"]["rust-root"]
         self._rust_version = None
@@ -241,6 +241,22 @@ class MachCommands(CommandBase):
 
         self.fetch()
 
+    @Command('cargoup',
+             description='Update the Cargo version to latest master',
+             category='devenv')
+    def cargoup(self):
+        url = "https://api.github.com/repos/rust-lang/cargo/git/refs/heads/master"
+        commit = json.load(urllib2.urlopen(url))["object"]["sha"]
+        filename = path.join(self.context.topdir, "cargo-commit-hash")
+        with open(filename, "w") as f:
+            f.write(commit + "\n")
+
+        # Reset self.config["tools"]["cargo-root"]
+        self._cargo_build_id = None
+        self.set_cargo_root()
+
+        self.fetch()
+
     @Command('fetch',
              description='Fetch Rust, Cargo and Cargo dependencies',
              category='devenv')