diff -r 2394cd58b81f -r da2a7d8354b2 mercurial/vfs.py
--- a/mercurial/vfs.py	Thu Jun 28 21:24:47 2018 +0530
+++ b/mercurial/vfs.py	Thu Jun 28 18:07:22 2018 -0700
@@ -246,8 +246,9 @@
         """Attempt to remove a file, ignoring missing file errors."""
         util.tryunlink(self.join(path))
 
-    def unlinkpath(self, path=None, ignoremissing=False):
-        return util.unlinkpath(self.join(path), ignoremissing=ignoremissing)
+    def unlinkpath(self, path=None, ignoremissing=False, rmdir=True):
+        return util.unlinkpath(self.join(path), ignoremissing=ignoremissing,
+                               rmdir=rmdir)
 
     def utime(self, path=None, t=None):
         return os.utime(self.join(path), t)