pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This vendors backups extension from hg-experimental.
Listing backups and having some utility to apply them is nice. I know we have
obsmarkers now, but this will help a lot of end users who still uses strip
until
we get evolve out of experimental.
This is RFC because:
- I am not sure whether we want this in core
- I copied the code from hg-experimental and looks like there is some code
deduplication which needs to be done
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7932
AFFECTED FILES
mercurial/debugcommands.py
tests/test-debugbackup.t
CHANGE DETAILS
diff --git a/tests/test-debugbackup.t b/tests/test-debugbackup.t
new file mode 100644
--- /dev/null
+++ b/tests/test-debugbackup.t
@@ -0,0 +1,36 @@
+ $ cat >> $HGRCPATH << EOF
+ > [extensions]
+ > strip=
+ > EOF
+
+Setup repo
+
+ $ hg init repo
+ $ cd repo
+
+Test backups list and recover
+
+ $ mkcommit() {
+ >echo "$1" > "$1"
+ >hg add "$1"
+ >hg ci -l $1
+ > }
+ $ mkcommit a
+ $ mkcommit b
+ $ hg strip .
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ saved backup bundle to
$TESTTMP/repo/.hg/strip-backup/d2ae7f538514-2953539b-backup.hg (glob)
+ $ hg debugbackups
+ Recover changesets using: hg debugbackups --recover
+
+ Available backup changesets:
+ * (glob)
+ d2ae7f538514 b
+
+ $ hg debugbackups --recover d2ae7f538514
+ Unbundling d2ae7f538514
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ new changesets d2ae7f538514 (1 drafts)
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -11,6 +11,7 @@
import collections
import difflib
import errno
+import glob
import operator
import os
import random
@@ -38,6 +39,7 @@
)
from . import (
bundle2,
+bundlerepo,
changegroup,
cmdutil,
color,
@@ -130,6 +132,137 @@
@command(
+"debugbackups",
+[
+(
+"",
+"recover",
+"",
+"brings the specified changeset back into the repository",
+)
+]
++ cmdutil.logopts,
+_("hg debugbackups [--recover HASH]"),
+)
+def debugbackups(ui, repo, *pats, **opts):
+"""lists the changesets available in backup bundles
+
+Without any arguments, this command prints a list of the changesets in each
+backup bundle.
+
+--recover takes a changeset hash and unbundles the first bundle that
+contains that hash, which puts that changeset back in your repository.
+
+--verbose will print the entire commit message and the bundle path for that
+backup.
+"""
+backuppath = repo.vfs.join("strip-backup")
+backups = filter(os.path.isfile, glob.glob(backuppath + "/*.hg"))
+backups.sort(key=lambda x: os.path.getmtime(x), reverse=True)
+
+opts["bundle"] = ""
+opts["force"] = None
+
+def display(other, chlist, displayer):
+limit = logcmdutil.getlimit(opts)
+if opts.get("newest_first"):
+chlist.reverse()
+count = 0
+for n in chlist:
+if limit is not None and count >= limit:
+break
+parents = [p for p in other.changelog.parents(n) if p != nullid]
+if opts.get("no_merges") and len(parents) == 2:
+continue
+count += 1
+displayer.show(other[n])
+
+recovernode = opts.get("recover")
+if recovernode:
+if scmutil.isrevsymbol(repo, recovernode):
+ui.warn(_("%s already exists in the repo\n") % recovernode)
+return
+else:
+msg = _(
+"Recover changesets using: hg debugbackups --recover "
+"\n\nAvailable backup changesets:"
+)
+ui.status(msg, label="status.removed")
+
+for backup in backups:
+# Much of this is copied from the hg incoming logic
+source = os.path.relpath(backup, encoding.getcwd())
+source = ui.expandpath(source)
+source, branches = hg.parseurl(source, opts.get("branch"))
+try:
+other = hg.peer(repo, opts, source)
+except error.LookupError as ex:
+msg = _("\nwarning: unable to open bundle %s") % source
+hint = _("\n(missing parent rev %s)\n") % short(ex.name)
+ui.warn(msg)
+ui.warn(hint)
+continue
+revs, checkout = hg.addbranchrevs(
+repo, other, branches, opts.get("rev")
+)
+
+if revs:
+revs = [other.lookup(rev) for rev in revs]
+
+quiet = ui.quiet
+try:
+ui.quiet = True
+other, chlist, cleanupfn = bundlerepo.getremotechanges(
+ui, repo, other, revs, opts["bundle"], opts["force"]
+
