# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1354319769 28800
# Node ID ec02eef0b6869c4e76e33fd3f9302fdeb758008f
# Parent  e248bff2d8ddd658a8e4f2188735dec3008a4856# Parent  2a393df0f5ccf3ba67ecaeebda7ef1dc06b6a9b6
Merge with crew

diff -r e248bff2d8dd -r ec02eef0b686 hgext/largefiles/reposetup.py
--- a/hgext/largefiles/reposetup.py	Fri Nov 30 15:55:09 2012 -0800
+++ b/hgext/largefiles/reposetup.py	Fri Nov 30 15:56:09 2012 -0800
@@ -91,7 +91,7 @@
         # self.lfstatus is False.
         # XXX large file status is buggy when used on repo proxy.
         # XXX this needs to be investigated.
-        @localrepo.unfilteredmeth
+        @localrepo.unfilteredmethod
         def status(self, node1='.', node2=None, match=None, ignored=False,
                 clean=False, unknown=False, listsubrepos=False):
             listignored, listclean, listunknown = ignored, clean, unknown
diff -r e248bff2d8dd -r ec02eef0b686 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Nov 30 15:55:09 2012 -0800
+++ b/mercurial/localrepo.py	Fri Nov 30 15:56:09 2012 -0800
@@ -51,7 +51,7 @@
     """check if an repo and a unfilteredproperty cached value for <name>"""
     return name in vars(repo.unfiltered())
 
-def unfilteredmeth(orig):
+def unfilteredmethod(orig):
     """decorate method that always need to be run on unfiltered version"""
     def wrapper(repo, *args, **kwargs):
         return orig(repo.unfiltered(), *args, **kwargs)
@@ -422,7 +422,7 @@
     def hook(self, name, throw=False, **args):
         return hook.hook(self.ui, self, name, throw, **args)
 
-    @unfilteredmeth
+    @unfilteredmethod
     def _tag(self, names, node, message, local, user, date, extra={}):
         if isinstance(names, str):
             names = (names,)
@@ -642,7 +642,7 @@
 
         return partial
 
-    @unfilteredmeth # Until we get a smarter cache management
+    @unfilteredmethod # Until we get a smarter cache management
     def updatebranchcache(self):
         tip = self.changelog.tip()
         if self._branchcache is not None and self._branchcachetip == tip:
@@ -695,7 +695,7 @@
             bt[bn] = self._branchtip(heads)
         return bt
 
-    @unfilteredmeth # Until we get a smarter cache management
+    @unfilteredmethod # Until we get a smarter cache management
     def _readbranchcache(self):
         partial = {}
         try:
@@ -728,7 +728,7 @@
             partial, last, lrev = {}, nullid, nullrev
         return partial, last, lrev
 
-    @unfilteredmeth # Until we get a smarter cache management
+    @unfilteredmethod # Until we get a smarter cache management
     def _writebranchcache(self, branches, tip, tiprev):
         try:
             f = self.opener("cache/branchheads", "w", atomictemp=True)
@@ -740,7 +740,7 @@
         except (IOError, OSError):
             pass
 
-    @unfilteredmeth # Until we get a smarter cache management
+    @unfilteredmethod # Until we get a smarter cache management
     def _updatebranchcache(self, partial, ctxgen):
         """Given a branchhead cache, partial, that may have extra nodes or be
         missing heads, and a generator of nodes that are at least a superset of
@@ -1006,7 +1006,7 @@
         finally:
             release(lock, wlock)
 
-    @unfilteredmeth # Until we get smarter cache management
+    @unfilteredmethod # Until we get smarter cache management
     def _rollback(self, dryrun, force):
         ui = self.ui
         try:
@@ -1265,7 +1265,7 @@
 
         return fparent1
 
-    @unfilteredmeth
+    @unfilteredmethod
     def commit(self, text="", user=None, date=None, match=None, force=False,
                editor=False, extra={}):
         """Add a new revision to current repository.
@@ -1436,7 +1436,7 @@
         self._afterlock(commithook)
         return ret
 
-    @unfilteredmeth
+    @unfilteredmethod
     def commitctx(self, ctx, error=False):
         """Add a new revision to current repository.
         Revision information is passed via the context argument.
@@ -1518,7 +1518,7 @@
                 tr.release()
             lock.release()
 
-    @unfilteredmeth
+    @unfilteredmethod
     def destroyed(self, newheadnodes=None):
         '''Inform the repository that nodes have been destroyed.
         Intended for use by strip and rollback, so there's a common
@@ -2113,7 +2113,7 @@
         return self.getlocalbundle(source,
                                    discovery.outgoing(cl, common, heads))
 
-    @unfilteredmeth
+    @unfilteredmethod
     def _changegroupsubset(self, commonrevs, csets, heads, source):
 
         cl = self.changelog
@@ -2225,7 +2225,7 @@
         # to avoid a race we use changegroupsubset() (issue1320)
         return self.changegroupsubset(basenodes, self.heads(), source)
 
-    @unfilteredmeth
+    @unfilteredmethod
     def _changegroup(self, nodes, source):
         """Compute the changegroup of all nodes that we have that a recipient
         doesn't.  Return a chunkbuffer object whose read() method will return
@@ -2319,7 +2319,7 @@
 
         return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
 
-    @unfilteredmeth
+    @unfilteredmethod
     def addchangegroup(self, source, srctype, url, emptyok=False):
         """Add the changegroup returned by source.read() to this repo.
         srctype is a string like 'push', 'pull', or 'unbundle'.  url is
diff -r e248bff2d8dd -r ec02eef0b686 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Nov 30 15:55:09 2012 -0800
+++ b/tests/test-obsolete.t	Fri Nov 30 15:56:09 2012 -0800
@@ -173,6 +173,13 @@
 
 And that we can't push bumped changeset
 
+  $ hg push ../tmpa -r 0 --force #(make repo)
+  pushing to ../tmpa
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
   $ hg push ../tmpa
   pushing to ../tmpa
   searching for changes