diff --git a/hgext3rd/sparse.py b/hgext3rd/fbsparse.py
copy from hgext3rd/sparse.py
copy to hgext3rd/fbsparse.py
--- a/hgext3rd/sparse.py
+++ b/hgext3rd/fbsparse.py
@@ -1,4 +1,4 @@
-# sparse.py - allow sparse checkouts of the working directory
+# fbsparse.py - allow sparse checkouts of the working directory
 #
 # Copyright 2014 Facebook, Inc.
 #
@@ -1006,8 +1006,7 @@
                 dropped.append(file)
 
     # Apply changes to disk
-    typeactions = dict((m, [])
-                       for m in 'a f g am cd dc r dm dg m e k p pr'.split())
+    typeactions = dict((m, []) for m in 'a f g am cd dc r dm dg m e k'.split())
     for f, (m, args, msg) in actions.iteritems():
         if m not in typeactions:
             typeactions[m] = []
diff --git a/tests/test-perftweaks.t b/tests/test-perftweaks.t
--- a/tests/test-perftweaks.t
+++ b/tests/test-perftweaks.t
@@ -148,7 +148,7 @@
   dirstate_size: 1
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > EOF
   $ cat >> profile_base << EOF
   > [include]
diff --git a/tests/test-remotefilelog-sparse.t b/tests/test-remotefilelog-sparse.t
--- a/tests/test-remotefilelog-sparse.t
+++ b/tests/test-remotefilelog-sparse.t
@@ -28,7 +28,7 @@
   searching for changes
   no changes found
   $ cd shallow
-  $ printf "[extensions]\nsparse=$TESTDIR/../hgext3rd/sparse.py\n" >> .hg/hgrc
+  $ printf "[extensions]\nsparse=$TESTDIR/../hgext3rd/fbsparse.py\n" >> .hg/hgrc
 
   $ hg sparse -I x
   $ hg prefetch -r 0
@@ -80,7 +80,7 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
   $ cd shallow2
-  $ printf "[extensions]\nsparse=$TESTDIR/../hgext3rd/sparse.py\n" >> .hg/hgrc
+  $ printf "[extensions]\nsparse=$TESTDIR/../hgext3rd/fbsparse.py\n" >> .hg/hgrc
 
   $ hg up -q 0
   2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
diff --git a/tests/test-sparse-clear.t b/tests/test-sparse-clear.t
--- a/tests/test-sparse-clear.t
+++ b/tests/test-sparse-clear.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > purge=
   > strip=
   > rebase=
diff --git a/tests/test-sparse-clone.t b/tests/test-sparse-clone.t
--- a/tests/test-sparse-clone.t
+++ b/tests/test-sparse-clone.t
@@ -5,7 +5,7 @@
   > ssh = python "$RUNTESTDIR/dummyssh"
   > username = nobody <no.reply@fb.com>
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > purge=
   > strip=
   > rebase=
diff --git a/tests/test-sparse-diff.t b/tests/test-sparse-diff.t
--- a/tests/test-sparse-diff.t
+++ b/tests/test-sparse-diff.t
@@ -2,7 +2,7 @@
   $ cd repo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > EOF
   $ mkdir show hide
   $ echo show-modify-1 > show/modify
diff --git a/tests/test-sparse-extensions.t b/tests/test-sparse-extensions.t
--- a/tests/test-sparse-extensions.t
+++ b/tests/test-sparse-extensions.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > strip=
   > [simplecache]
   > cachedir=$TESTTMP/hgsimplecache
diff --git a/tests/test-sparse-import.t b/tests/test-sparse-import.t
--- a/tests/test-sparse-import.t
+++ b/tests/test-sparse-import.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > purge=
   > strip=
   > rebase=
diff --git a/tests/test-sparse-merges.t b/tests/test-sparse-merges.t
--- a/tests/test-sparse-merges.t
+++ b/tests/test-sparse-merges.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > EOF
 
   $ echo foo > foo
diff --git a/tests/test-sparse-notsparse.t b/tests/test-sparse-notsparse.t
--- a/tests/test-sparse-notsparse.t
+++ b/tests/test-sparse-notsparse.t
@@ -7,7 +7,7 @@
   $ cd base
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > journal=
   > EOF
 
diff --git a/tests/test-sparse-profiles.t b/tests/test-sparse-profiles.t
--- a/tests/test-sparse-profiles.t
+++ b/tests/test-sparse-profiles.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > purge=
   > strip=
   > rebase=
@@ -252,7 +252,7 @@
   $ cd sparseperm
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > EOF
   $ touch a b
   $ cat > .hgsparse <<EOF
diff --git a/tests/test-sparse-verbose-json.t b/tests/test-sparse-verbose-json.t
--- a/tests/test-sparse-verbose-json.t
+++ b/tests/test-sparse-verbose-json.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > strip=
   > EOF
 
diff --git a/tests/test-sparse.t b/tests/test-sparse.t
--- a/tests/test-sparse.t
+++ b/tests/test-sparse.t
@@ -4,7 +4,7 @@
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > strip=
   > EOF
 
@@ -364,7 +364,7 @@
   $ cd sparserepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/sparse.py
+  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
   > EOF
   $ cd ../nonsparserepo
   $ echo x > x && hg add x && hg commit -qAm x
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -138,7 +138,7 @@
 Test treemanifest with sparse enabled
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > sparse = $TESTDIR/../hgext3rd/sparse.py
+  > sparse = $TESTDIR/../hgext3rd/fbsparse.py
   > reset = $TESTDIR/../hgext3rd/reset.py
   > EOF
   $ hg sparse -I subdir