blackbox: add backup bundle paths to blackbox logs
authorDurham Goode <durham@fb.com>
Wed, 13 Mar 2013 10:43:51 -0700
changeset 18766 64b5562550e2
parent 18765 cd2c82510aa2
child 18767 69e4787b6867
child 18775 5b05ceb24a8d
blackbox: add backup bundle paths to blackbox logs Writes the backup bundle paths to the blackbox so it's easy to see which backup bundle is associated with which command when you are debugging an issue. Example output: 2013/03/13 10:39:56 durham> strip tip 2013/03/13 10:39:59 durham> saved backup bundle to /data/users/durham/www-hg/.hg/strip-backup/e5fac262363a-backup.hg 2013/03/13 10:40:03 durham> strip tip exited 0 after 7.97 seconds
mercurial/repair.py
tests/test-blackbox.t
--- a/mercurial/repair.py	Tue Mar 12 10:37:48 2013 -0700
+++ b/mercurial/repair.py	Wed Mar 13 10:43:51 2013 -0700
@@ -119,6 +119,7 @@
     if backup == "all":
         backupfile = _bundle(repo, stripbases, cl.heads(), node, topic)
         repo.ui.status(_("saved backup bundle to %s\n") % backupfile)
+        repo.ui.log("backupbundle", "saved backup bundle to %s\n", backupfile)
     if saveheads or savebases:
         # do not compress partial bundle if we remove it from disk later
         chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp',
--- a/tests/test-blackbox.t	Tue Mar 12 10:37:48 2013 -0700
+++ b/tests/test-blackbox.t	Wed Mar 13 10:43:51 2013 -0700
@@ -16,6 +16,7 @@
   > [extensions]
   > blackbox=
   > mock=`pwd`/mock.py
+  > mq=
   > EOF
   $ hg init blackboxtest
   $ cd blackboxtest
@@ -60,6 +61,20 @@
   1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62
   1970/01/01 00:00:00 bob> pull exited None after * seconds (glob)
 
+backup bundles get logged
+
+  $ touch d
+  $ hg commit -Amd
+  adding d
+  created new head
+  $ hg strip tip
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
+  $ hg blackbox -l 3
+  1970/01/01 00:00:00 bob> strip tip
+  1970/01/01 00:00:00 bob> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
+  1970/01/01 00:00:00 bob> strip exited 0 after * seconds (glob)
+
 extension and python hooks - use the eol extension for a pythonhook
 
   $ echo '[extensions]' >> .hg/hgrc