diff -r e40af07e518e -r dfab6edb98e3 mercurial/scmutil.py
--- a/mercurial/scmutil.py	Mon Nov 02 16:52:34 2015 +0000
+++ b/mercurial/scmutil.py	Mon Nov 02 15:59:12 2015 +0000
@@ -1173,8 +1173,13 @@
 
 def gdinitconfig(ui):
     """helper function to know if a repo should be created as general delta
+    """
+    # experimental config: format.generaldelta
+    return (ui.configbool('format', 'generaldelta', False)
+            or ui.configbool('format', 'usegeneraldelta', False))
 
-    This currently depends on a single config option but this will get more
-    complicated soon."""
+def gddeltaconfig(ui):
+    """helper function to know if incoming delta should be optimised
+    """
     # experimental config: format.generaldelta
     return ui.configbool('format', 'generaldelta', False)