# HG changeset patch
# User Alain Leufroy <alain.leufroy@logilab.fr>
# Date 1334563396 -7200
# Node ID 83b7e2c62ac39693c2a2989cfa4f34487ef343e0
# Parent  94360b577857a4d202aacc88de3c16ea1806aa25
[obsolete] simplify by using the Hg 2.1 api

diff -r 94360b577857 -r 83b7e2c62ac3 hgext/obsolete.py
--- a/hgext/obsolete.py	Tue Apr 03 17:47:15 2012 +0200
+++ b/hgext/obsolete.py	Mon Apr 16 10:03:16 2012 +0200
@@ -363,7 +363,7 @@
 
     opull = repo.pull
     opush = repo.push
-    orollback = repo.rollback
+    o_rollback = repo._rollback
     o_writejournal = repo._writejournal
     ocancopy = repo.cancopy
 
@@ -544,26 +544,20 @@
                 entries.append(journalpath)
             return tuple(entries)
 
-        def rollback(self, dryrun=False, **kwargs):
-            """wrapped version of rollback that restore obsolete data"""
-            wlock = lock = None
-            try:
-                wlock = self.wlock()
-                lock = self.lock()
-                ret = orollback(dryrun, **kwargs)
-                if not (ret or dryrun): #rollback did not failed
-                    src = self.join('undo.obsolete-relations')
-                    dst = self.join('obsolete-relations')
-                    if os.path.exists(src):
-                        util.rename(src, dst)
-                    elif os.path.exists(dst): #unlink in any case
-                        os.unlink(dst)
-                    # invalidate cache
-                    self.__dict__.pop('_obssubrels', None)
-                    self.__dict__.pop('_obsobjrels', None)
-                return ret
-            finally:
-                release(lock, wlock)
+        def _rollback(self, dryrun=False, **kwargs):
+            """wrapped version of _rollback that restore obsolete data"""
+            ret = o_rollback(dryrun, **kwargs)
+            if not (ret or dryrun): #rollback did not failed
+                src = self.join('undo.obsolete-relations')
+                dst = self.join('obsolete-relations')
+                if os.path.exists(src):
+                    util.rename(src, dst)
+                elif os.path.exists(dst): #unlink in any case
+                    os.unlink(dst)
+                # invalidate cache
+                self.__dict__.pop('_obssubrels', None)
+                self.__dict__.pop('_obsobjrels', None)
+            return ret
 
         @storecache('00changelog.i')
         def changelog(self):