--- a/hgext/infinitepush/__init__.py Fri Feb 09 13:39:15 2018 +0530
+++ b/hgext/infinitepush/__init__.py Sat Feb 03 17:54:55 2018 +0530
@@ -130,7 +130,6 @@
)
from . import (
- backupcommands,
bundleparts,
common,
infinitepushcommands,
@@ -178,9 +177,6 @@
configitem('infinitepush', 'metadatafilelimit',
default=100,
)
-configitem('infinitepushbackup', 'autobackup',
- default=False,
-)
configitem('experimental', 'server-bundlestore-bookmark',
default='',
)
@@ -203,8 +199,8 @@
scratchbranchparttype = bundleparts.scratchbranchparttype
cmdtable = infinitepushcommands.cmdtable
-revsetpredicate = backupcommands.revsetpredicate
-templatekeyword = backupcommands.templatekeyword
+revsetpredicate = registrar.revsetpredicate()
+templatekeyword = registrar.templatekeyword()
_scratchbranchmatcher = lambda x: False
_maybehash = re.compile(r'^[a-f0-9]+$').search
@@ -299,13 +295,6 @@
extensions._order = order
def extsetup(ui):
- # Allow writing backup files outside the normal lock
- localrepo.localrepository._wlockfreeprefix.update([
- backupcommands._backupstatefile,
- backupcommands._backupgenerationfile,
- backupcommands._backuplatestinfofile,
- ])
-
commonsetup(ui)
if _isserver(ui):
serverextsetup(ui)
@@ -393,19 +382,6 @@
partorder.insert(
index, partorder.pop(partorder.index(scratchbranchparttype)))
- def wrapsmartlog(loaded):
- if not loaded:
- return
- smartlogmod = extensions.find('smartlog')
- extensions.wrapcommand(smartlogmod.cmdtable, 'smartlog', _smartlog)
- extensions.afterloaded('smartlog', wrapsmartlog)
- backupcommands.extsetup(ui)
-
-def _smartlog(orig, ui, repo, **opts):
- res = orig(ui, repo, **opts)
- backupcommands.smartlogsummary(ui, repo)
- return res
-
def _showbookmarks(ui, bookmarks, **opts):
# Copy-paste from commands.py
fm = ui.formatter('bookmarks', opts)