# HG changeset patch # User Gregory Szorc # Date 2018-03-04 15:34:09 # Node ID 17692fefc8f251098bc3fa4f9bae3666845bb923 # Parent a318bb154d42c6b4e5616a907404f9a6a004bcdc repair: rename _backup to backupbundle A future commit will introduce a caller from outside the module. The function should have already been public because histedit was calling it. Differential Revision: https://phab.mercurial-scm.org/D2666 diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1317,8 +1317,8 @@ def _newhistedit(ui, repo, state, revs, # Create a backup so we can always abort completely. backupfile = None if not obsolete.isenabled(repo, obsolete.createmarkersopt): - backupfile = repair._bundle(repo, [parentctxnode], [topmost], root, - 'histedit') + backupfile = repair.backupbundle(repo, [parentctxnode], + [topmost], root, 'histedit') state.backupfile = backupfile def _getsummary(ctx): diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -27,7 +27,8 @@ from . import ( util, ) -def _bundle(repo, bases, heads, node, suffix, compress=True, obsolescence=True): +def backupbundle(repo, bases, heads, node, suffix, compress=True, + obsolescence=True): """create a bundle with the specified revisions as a backup""" backupdir = "strip-backup" @@ -166,7 +167,7 @@ def strip(ui, repo, nodelist, backup=Tru vfs = repo.vfs node = nodelist[-1] if backup: - backupfile = _bundle(repo, stripbases, cl.heads(), node, topic) + backupfile = backupbundle(repo, stripbases, cl.heads(), node, topic) repo.ui.status(_("saved backup bundle to %s\n") % vfs.join(backupfile)) repo.ui.log("backupbundle", "saved backup bundle to %s\n", @@ -179,8 +180,8 @@ def strip(ui, repo, nodelist, backup=Tru # we are trying to strip. This is harmless since the stripped markers # are already backed up and we did not touched the markers for the # saved changesets. - tmpbundlefile = _bundle(repo, savebases, saveheads, node, 'temp', - compress=False, obsolescence=False) + tmpbundlefile = backupbundle(repo, savebases, saveheads, node, 'temp', + compress=False, obsolescence=False) try: with repo.transaction("strip") as tr: