strip: improve full backup message

mercurial/repair.py

@@ -1,154 +1,154
 # repair.py - functions for repository repair for mercurial
 #
 # Copyright 2005, 2006 Chris Mason <[e-mail]>
 # Copyright 2007 Matt Mackall
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import changegroup
 from node import nullrev, short
 from i18n import _
 import os
 
 def _bundle(repo, bases, heads, node, suffix, extranodes=None):
     """create a bundle with the specified revisions as a backup"""
     cg = repo.changegroupsubset(bases, heads, 'strip', extranodes)
     backupdir = repo.join("strip-backup")
     if not os.path.isdir(backupdir):
         os.mkdir(backupdir)
     name = os.path.join(backupdir, "%s-%s" % (short(node), suffix))
     return changegroup.writebundle(cg, name, "HG10BZ")
 
 def _collectfiles(repo, striprev):
     """find out the filelogs affected by the strip"""
     files = set()
 
     for x in xrange(striprev, len(repo)):
         files.update(repo[x].files())
 
     return sorted(files)
 
 def _collectextranodes(repo, files, link):
     """return the nodes that have to be saved before the strip"""
     def collectone(revlog):
         extra = []
         startrev = count = len(revlog)
         # find the truncation point of the revlog
         for i in xrange(count):
             lrev = revlog.linkrev(i)
             if lrev >= link:
                 startrev = i + 1
                 break
 
         # see if any revision after that point has a linkrev less than link
         # (we have to manually save these guys)
         for i in xrange(startrev, count):
             node = revlog.node(i)
             lrev = revlog.linkrev(i)
             if lrev < link:
                 extra.append((node, cl.node(lrev)))
 
         return extra
 
     extranodes = {}
     cl = repo.changelog
     extra = collectone(repo.manifest)
     if extra:
         extranodes[1] = extra
     for fname in files:
         f = repo.file(fname)
         extra = collectone(f)
         if extra:
             extranodes[fname] = extra
 
     return extranodes
 
 def strip(ui, repo, node, backup="all"):
     cl = repo.changelog
     # TODO delete the undo files, and handle undo of merge sets
     striprev = cl.rev(node)
 
     # Some revisions with rev > striprev may not be descendants of striprev.
     # We have to find these revisions and put them in a bundle, so that
     # we can restore them after the truncations.
     # To create the bundle we use repo.changegroupsubset which requires
     # the list of heads and bases of the set of interesting revisions.
     # (head = revision in the set that has no descendant in the set;
     #  base = revision in the set that has no ancestor in the set)
     tostrip = set((striprev,))
     saveheads = set()
     savebases = []
     for r in xrange(striprev + 1, len(cl)):
         parents = cl.parentrevs(r)
         if parents[0] in tostrip or parents[1] in tostrip:
             # r is a descendant of striprev
             tostrip.add(r)
             # if this is a merge and one of the parents does not descend
             # from striprev, mark that parent as a savehead.
             if parents[1] != nullrev:
                 for p in parents:
                     if p not in tostrip and p > striprev:
                         saveheads.add(p)
         else:
             # if no parents of this revision will be stripped, mark it as
             # a savebase
             if parents[0] < striprev and parents[1] < striprev:
                 savebases.append(cl.node(r))
 
             saveheads.difference_update(parents)
             saveheads.add(r)
 
     saveheads = [cl.node(r) for r in saveheads]
     files = _collectfiles(repo, striprev)
 
     extranodes = _collectextranodes(repo, files, striprev)
 
     # create a changegroup for all the branches we need to keep
     backupfile = None
     if backup == "all":
         backupfile = _bundle(repo, [node], cl.heads(), node, 'backup')
-        repo.ui.status(_("saving bundle to %s\n") % backupfile)
+        repo.ui.status(_("saved backup bundle to %s\n") % backupfile)
     if saveheads or extranodes:
         chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp',
                             extranodes)
 
     mfst = repo.manifest
 
     tr = repo.transaction("strip")
     offset = len(tr.entries)
 
     try:
         tr.startgroup()
         cl.strip(striprev, tr)
         mfst.strip(striprev, tr)
         for fn in files:
             repo.file(fn).strip(striprev, tr)
         tr.endgroup()
 
         try:
             for i in xrange(offset, len(tr.entries)):
                 file, troffset, ignore = tr.entries[i]
                 repo.sopener(file, 'a').truncate(troffset)
             tr.close()
         except:
             tr.abort()
             raise
 
         if saveheads or extranodes:
             ui.status(_("adding branch\n"))
             f = open(chgrpfile, "rb")
             gen = changegroup.readbundle(f, chgrpfile)
             repo.addchangegroup(gen, 'strip', 'bundle:' + chgrpfile, True)
             f.close()
             if backup != "strip":
                 os.unlink(chgrpfile)
     except:
         if backupfile:
             ui.warn("strip failed, full bundle stored in '%s'\n" % backupfile)
         elif saveheads:
             ui.warn("strip failed, partial bundle stored in '%s'\n"
                     % chgrpfile)
         raise
 
     repo.destroyed()

tests/helpers.sh

@@ -1,17 +1,17
 #/bin/sh
 
 hideport() { sed "s/localhost:$HGPORT/localhost:\$HGPORT/"; }
 
 repr() { python -c "import sys; print repr(sys.stdin.read()).replace('\\n', '\n')"; }
 
 hidehex() { python -c 'import sys, re; print re.replace("\b[0-9A-Fa-f]{12,40}", "X" * 12)'; }
 
 hidetmp() { sed "s/$HGTMP/\$HGTMP/"; }
 
-hidebackup() { sed 's/\(saving bundle to \).*/\1/'; }
+hidebackup() { sed 's/\(saved backup bundle to \).*/\1/'; }
 
 cleanrebase() {
     sed -e 's/\(Rebase status stored to\).*/\1/'  \
         -e 's/\(Rebase status restored from\).*/\1/' \
-        -e 's/\(saving bundle to \).*/\1/';
+        -e 's/\(saved backup bundle to \).*/\1/';
 }

tests/test-bookmarks-strip

@@ -1,44 +1,45
 #!/bin/sh
 
+source $TESTDIR/helpers.sh
 echo "[extensions]" >> $HGRCPATH
 echo "bookmarks=" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 hg init
 
 echo qqq>qqq.txt
 
 echo % add file
 hg add
 
 echo % commit first revision
 hg ci -m 1 -u user -d "1 0"
 
 echo % set bookmark
 hg book test
 
 echo www>>qqq.txt
 
 echo % commit second revision
 hg ci -m 2 -u usr -d "1 0"
 
 echo % set bookmark
 hg book test2
 
 echo % update to -2
 hg update -r -2
 
 echo eee>>qqq.txt
 
 echo % commit new head
 hg ci -m 3 -u user -d "1 0"
 
 echo % bookmarks updated?
 hg book
 
 echo % strip to revision 1
-hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg strip 1 | hidebackup
 
 echo % list bookmarks
 hg book
 

tests/test-bookmarks-strip.out

@@ -1,23 +1,23
 % add file
 adding qqq.txt
 % commit first revision
 % set bookmark
 % commit second revision
 % set bookmark
 % update to -2
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % commit new head
 created new head
 % bookmarks updated?
    test                      1:16b24da7e457
    test2                     1:16b24da7e457
 % strip to revision 1
-saving bundle to 
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % list bookmarks
  * test                      1:9f1b7e78eff8
  * test2                     1:9f1b7e78eff8

tests/test-mq

@@ -1,620 +1,622
 #!/bin/sh
 
+source $TESTDIR/helpers.sh
+
 checkundo()
 {
     if [ -f .hg/store/undo ]; then
 	echo ".hg/store/undo still exists after $1"
     fi
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 echo "[mq]" >> $HGRCPATH
 echo "plain=true" >> $HGRCPATH
 
 echo % help
 hg help mq
 
 hg init a
 cd a
 echo a > a
 hg ci -Ama
 
 hg clone . ../k
 
 mkdir b
 echo z > b/z
 hg ci -Ama
 
 echo % qinit
 
 hg qinit
 
 cd ..
 hg init b
 
 echo % -R qinit
 
 hg -R b qinit
 
 hg init c
 
 echo % qinit -c
 
 hg --cwd c qinit -c
 hg -R c/.hg/patches st
 
 echo '% qinit; qinit -c'
 hg init d
 cd d
 hg qinit
 hg qinit -c
 # qinit -c should create both files if they don't exist
 echo '  .hgignore:'
 cat .hg/patches/.hgignore
 echo '  series:'
 cat .hg/patches/series
 hg qinit -c 2>&1 | sed -e 's/repository.*already/repository already/'
 cd ..
 
 echo '% qinit; <stuff>; qinit -c'
 hg init e
 cd e
 hg qnew A
 checkundo qnew
 echo foo > foo
 hg add foo
 hg qrefresh
 hg qnew B
 echo >> foo
 hg qrefresh
 echo status >> .hg/patches/.hgignore
 echo bleh >> .hg/patches/.hgignore
 hg qinit -c
 hg -R .hg/patches status
 # qinit -c shouldn't touch these files if they already exist
 echo '  .hgignore:'
 cat .hg/patches/.hgignore
 echo '  series:'
 cat .hg/patches/series
 cd ..
 
 echo '% init --mq without repo'
 mkdir f
 cd f
 hg init --mq
 cd ..
 
 echo '% init --mq with repo path'
 hg init g
 hg init --mq g
 test -d g/.hg/patches/.hg && echo "ok" || echo "failed"
 
 echo '% init --mq with nonexistent directory'
 hg init --mq nonexistentdir
 
 echo '% init --mq with bundle (non "local")'
 hg -R a bundle --all a.bundle >/dev/null
 hg init --mq a.bundle
 
 cd a
 
 hg qnew -m 'foo bar' test.patch
 
 echo % qrefresh
 
 echo a >> a
 hg qrefresh
 sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \
     -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch
 
 echo % empty qrefresh
 
 hg qrefresh -X a
 echo 'revision:'
 hg diff -r -2 -r -1
 echo 'patch:'
 cat .hg/patches/test.patch
 echo 'working dir diff:'
 hg diff --nodates -q
 # restore things
 hg qrefresh
 checkundo qrefresh
 
 echo % qpop
 
 hg qpop
 checkundo qpop
 
 echo % qpush with dump of tag cache
 
 # Dump the tag cache to ensure that it has exactly one head after qpush.
 rm -f .hg/tags.cache
 hg tags > /dev/null
 echo ".hg/tags.cache (pre qpush):"
 sed 's/ [0-9a-f]*//' .hg/tags.cache
 hg qpush
 hg tags > /dev/null
 echo ".hg/tags.cache (post qpush):"
 sed 's/ [0-9a-f]*//' .hg/tags.cache
 
 checkundo qpush
 
 cd ..
 
 echo % pop/push outside repo
 
 hg -R a qpop
 hg -R a qpush
 
 cd a
 hg qnew test2.patch
 
 echo % qrefresh in subdir
 
 cd b
 echo a > a
 hg add a
 hg qrefresh
 
 echo % pop/push -a in subdir
 
 hg qpop -a
 hg --traceback qpush -a
 
 # setting columns & interactive tests truncating (issue1912)
 echo % qseries
 COLUMNS=4 hg qseries --config ui.interactive=true
 COLUMNS=20 hg qseries --config ui.interactive=true -vs
 hg qpop
 hg qseries -vs
 hg sum | grep mq
 hg qpush
 hg sum | grep mq
 
 echo % qapplied
 hg qapplied
 
 echo % qtop
 hg qtop
 
 echo % prev
 hg qapp -1
 
 echo % next
 hg qunapp -1
 
 hg qpop
 echo % commit should fail
 hg commit
 
 echo % push should fail
 hg push ../../k
 
 echo % import should fail
 hg st .
 echo foo >> ../a
 hg diff > ../../import.diff
 hg revert --no-backup ../a
 hg import ../../import.diff
 hg st
 echo % import --no-commit should succeed
 hg import --no-commit ../../import.diff
 hg st
 hg revert --no-backup ../a
 
 echo % qunapplied
 hg qunapplied
 
 echo % qpush/qpop with index
 hg qnew test1b.patch
 echo 1b > 1b
 hg add 1b
 hg qrefresh
 hg qpush 2
 hg qpop 0
 hg qpush test.patch+1
 hg qpush test.patch+2
 hg qpop test2.patch-1
 hg qpop test2.patch-2
 hg qpush test1b.patch+1
 
 echo % qpush --move
 hg qpop -a
 hg qpush --move test2.patch # move to front
 hg qpush --move test1b.patch
 hg qpush --move test.patch # noop move
 hg qseries -v
 hg qpop -a
 hg qpush --move test.patch # cleaning up
 hg qpush --move test1b.patch
 hg qpush --move bogus # nonexistent patch
 hg qpush --move test.patch # already applied
 hg qpush
 
 echo % pop, qapplied, qunapplied
 hg qseries -v
 echo % qapplied -1 test.patch
 hg qapplied -1 test.patch
 echo % qapplied -1 test1b.patch
 hg qapplied -1 test1b.patch
 echo % qapplied -1 test2.patch
 hg qapplied -1 test2.patch
 echo % qapplied -1
 hg qapplied -1
 echo % qapplied
 hg qapplied
 echo % qapplied test1b.patch
 hg qapplied test1b.patch
 echo % qunapplied -1
 hg qunapplied -1
 echo % qunapplied
 hg qunapplied
 echo % popping
 hg qpop
 echo % qunapplied -1
 hg qunapplied -1
 echo % qunapplied
 hg qunapplied
 echo % qunapplied test2.patch
 hg qunapplied test2.patch
 echo % qunapplied -1 test2.patch
 hg qunapplied -1 test2.patch
 echo % popping -a
 hg qpop -a
 echo % qapplied
 hg qapplied
 echo % qapplied -1
 hg qapplied -1
 hg qpush
 
 echo % push should succeed
 hg qpop -a
 hg push ../../k
 
 echo % qpush/qpop error codes
 errorcode()
 {
     hg "$@" && echo "  $@ succeeds" || echo "  $@ fails"
 }
 
 # we want to start with some patches applied
 hg qpush -a
 echo "  % pops all patches and succeeds"
 errorcode qpop -a
 echo "  % does nothing and succeeds"
 errorcode qpop -a
 echo "  % fails - nothing else to pop"
 errorcode qpop
 echo "  % pushes a patch and succeeds"
 errorcode qpush
 echo "  % pops a patch and succeeds"
 errorcode qpop
 echo "  % pushes up to test1b.patch and succeeds"
 errorcode qpush test1b.patch
 echo "  % does nothing and succeeds"
 errorcode qpush test1b.patch
 echo "  % does nothing and succeeds"
 errorcode qpop test1b.patch
 echo "  % fails - can't push to this patch"
 errorcode qpush test.patch
 echo "  % fails - can't pop to this patch"
 errorcode qpop test2.patch
 echo "  % pops up to test.patch and succeeds"
 errorcode qpop test.patch
 echo "  % pushes all patches and succeeds"
 errorcode qpush -a
 echo "  % does nothing and succeeds"
 errorcode qpush -a
 echo "  % fails - nothing else to push"
 errorcode qpush
 echo "  % does nothing and succeeds"
 errorcode qpush test2.patch
 
 
 echo % strip
 cd ../../b
 echo x>x
 hg ci -Ama
-hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg strip tip | hidebackup
 hg unbundle .hg/strip-backup/*
 
 echo % strip with local changes, should complain
 hg up
 echo y>y
 hg add y
-hg strip tip | sed 's/\(saving bundle to \).*/\1/'
+hg strip tip | hidebackup
 echo % --force strip with local changes
-hg strip -f tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg strip -f tip | hidebackup
 
 echo '% cd b; hg qrefresh'
 hg init refresh
 cd refresh
 echo a > a
 hg ci -Ama
 hg qnew -mfoo foo
 echo a >> a
 hg qrefresh
 mkdir b
 cd b
 echo f > f
 hg add f
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
 echo % hg qrefresh .
 hg qrefresh .
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
 hg status
 
 echo % qpush failure
 cd ..
 hg qrefresh
 hg qnew -mbar bar
 echo foo > foo
 echo bar > bar
 hg add foo bar
 hg qrefresh
 hg qpop -a
 echo bar > foo
 hg qpush -a
 hg st
 
 echo % mq tags
 hg log --template '{rev} {tags}\n' -r qparent:qtip
 
 echo % bad node in status
 hg qpop
 hg strip -qn tip
 hg tip 2>&1 | sed -e 's/unknown node .*/unknown node/'
 hg branches 2>&1 | sed -e 's/unknown node .*/unknown node/'
 hg qpop 2>&1 | sed -e 's/unknown node .*/unknown node/'
 
 cat >>$HGRCPATH <<EOF
 [diff]
 git = True
 EOF
 cd ..
 hg init git
 cd git
 hg qinit
 
 hg qnew -m'new file' new
 echo foo > new
 chmod +x new
 hg add new
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new
 
 hg qnew -m'copy file' copy
 hg cp new copy
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy
 
 hg qpop
 hg qpush
 hg qdiff
 cat >>$HGRCPATH <<EOF
 [diff]
 git = False
 EOF
 hg qdiff --git
 cd ..
 
 echo % test file addition in slow path
 hg init slow
 cd slow
 hg qinit
 echo foo > foo
 hg add foo
 hg ci -m 'add foo'
 hg qnew bar
 echo bar > bar
 hg add bar
 hg mv foo baz
 hg qrefresh --git
 hg up -C 0
 echo >> foo
 hg ci -m 'change foo'
 hg up -C 1
 hg qrefresh --git 2>&1 | grep -v 'saving bundle'
 cat .hg/patches/bar
 hg log -v --template '{rev} {file_copies}\n' -r .
 hg qrefresh --git
 cat .hg/patches/bar
 hg log -v --template '{rev} {file_copies}\n' -r .
 hg qrefresh
 grep 'diff --git' .hg/patches/bar
 
 echo % test file move chains in the slow path
 hg up -C 1
 echo >> foo
 hg ci -m 'change foo again'
 hg up -C 2
 hg mv bar quux
 hg mv baz bleh
 hg qrefresh --git 2>&1 | grep -v 'saving bundle'
 cat .hg/patches/bar
 hg log -v --template '{rev} {file_copies}\n' -r .
 hg mv quux fred
 hg mv bleh barney
 hg qrefresh --git
 cat .hg/patches/bar
 hg log -v --template '{rev} {file_copies}\n' -r .
 
 echo % refresh omitting an added file
 hg qnew baz
 echo newfile > newfile
 hg add newfile
 hg qrefresh
 hg st -A newfile
 hg qrefresh -X newfile
 hg st -A newfile
 hg revert newfile
 rm newfile
 hg qpop
 hg qdel baz
 
 echo % create a git patch
 echo a > alexander
 hg add alexander
 hg qnew -f --git addalexander
 grep diff .hg/patches/addalexander
 
 echo % create a git binary patch
 cat > writebin.py <<EOF
 import sys
 path = sys.argv[1]
 open(path, 'wb').write('BIN\x00ARY')
 EOF
 python writebin.py bucephalus
 
 python "$TESTDIR/md5sum.py" bucephalus
 hg add bucephalus
 hg qnew -f --git addbucephalus
 grep diff .hg/patches/addbucephalus
 
 echo % check binary patches can be popped and pushed
 hg qpop
 test -f bucephalus && echo % bucephalus should not be there
 hg qpush
 test -f bucephalus || echo % bucephalus should be there
 python "$TESTDIR/md5sum.py" bucephalus
 
 
 echo '% strip again'
 cd ..
 hg init strip
 cd strip
 touch foo
 hg add foo
 hg ci -m 'add foo'
 echo >> foo
 hg ci -m 'change foo 1'
 hg up -C 0
 echo 1 >> foo
 hg ci -m 'change foo 2'
 HGMERGE=true hg merge
 hg ci -m merge
 hg log
-hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg strip 1 | hidebackup
 checkundo strip
 hg log
 cd ..
 
 echo '% qclone'
 qlog()
 {
     echo 'main repo:'
     hg log --template '    rev {rev}: {desc}\n'
     echo 'patch repo:'
     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
 }
 hg init qclonesource
 cd qclonesource
 echo foo > foo
 hg add foo
 hg ci -m 'add foo'
 hg qinit
 hg qnew patch1
 echo bar >> foo
 hg qrefresh -m 'change foo'
 cd ..
 
 # repo with unversioned patch dir
 hg qclone qclonesource failure
 
 cd qclonesource
 hg qinit -c
 hg qci -m checkpoint
 qlog
 cd ..
 
 # repo with patches applied
 hg qclone qclonesource qclonedest
 cd qclonedest
 qlog
 cd ..
 
 # repo with patches unapplied
 cd qclonesource
 hg qpop -a
 qlog
 cd ..
 hg qclone qclonesource qclonedest2
 cd qclonedest2
 qlog
 cd ..
 
 echo % 'test applying on an empty file (issue 1033)'
 hg init empty
 cd empty
 touch a
 hg ci -Am addempty
 echo a > a
 hg qnew -f -e changea
 hg qpop
 hg qpush
 cd ..
 
 echo % test qpush with --force, issue1087
 hg init forcepush
 cd forcepush
 echo hello > hello.txt
 echo bye > bye.txt
 hg ci -Ama
 hg qnew -d '0 0' empty
 hg qpop
 echo world >> hello.txt
 
 echo % qpush should fail, local changes
 hg qpush
 
 echo % apply force, should not discard changes with empty patch
 hg qpush -f 2>&1 | sed 's,^.*/patch,patch,g'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p
 hg qref -d '0 0'
 hg qpop
 echo universe >> hello.txt
 echo universe >> bye.txt
 
 echo % qpush should fail, local changes
 hg qpush
 
 echo % apply force, should discard changes in hello, but not bye
 hg qpush -f
 hg st
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 
 echo % test popping revisions not in working dir ancestry
 hg qseries -v
 hg up qparent
 hg qpop
 
 cd ..
 hg init deletion-order
 cd deletion-order
 
 touch a
 hg ci -Aqm0
 
 hg qnew rename-dir
 hg rm a
 hg qrefresh
 
 mkdir a b
 touch a/a b/b
 hg add -q a b
 hg qrefresh
 
 echo % test popping must remove files added in subdirectories first
 hg qpop
 cd ..

tests/test-mq-strip

@@ -1,53 +1,55
 #!/bin/sh
 
+source $TESTDIR/helpers.sh
+
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 teststrip() {
     hg up -C $1
     echo % before update $1, strip $2
     hg parents
-    hg strip $2 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+    hg strip $2 | hidebackup
     echo % after update $1, strip $2
     hg parents
     hg unbundle -q .hg/strip-backup/*
     rm .hg/strip-backup/*
 }
 
 hg init test
 cd test
 
 echo foo > bar
 hg ci -Ama
 
 echo more >> bar
 hg ci -Amb
 
 echo blah >> bar
 hg ci -Amc
 
 hg up 1
 echo blah >> bar
 hg ci -Amd
 
 echo final >> bar
 hg ci -Ame
 
 hg log
 
 teststrip 4 4
 teststrip 4 3
 teststrip 1 4
 teststrip 4 2
 teststrip 4 1
 teststrip null 4
 
 hg log
 
 hg up -C 2
 hg merge 4
 echo % before strip of merge parent
 hg parents
-hg strip 4 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg strip 4 2>&1 | hidebackup
 echo % after strip of merge parent
 hg parents

tests/test-mq-strip.out

@@ -1,172 +1,172
 adding bar
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 changeset:   3:65bd5f99a4a3
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   2:264128213d29
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:9ab35a2d17cb
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 4
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 % after update 4, strip 4
 changeset:   3:65bd5f99a4a3
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 3
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 % after update 4, strip 3
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 1, strip 4
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
-saving bundle to 
+saved backup bundle to 
 % after update 1, strip 4
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 2
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
-saving bundle to 
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 % after update 4, strip 2
 changeset:   3:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 1
 changeset:   4:264128213d29
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 % after update 4, strip 1
 changeset:   0:9ab35a2d17cb
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % before update null, strip 4
-saving bundle to 
+saved backup bundle to 
 % after update null, strip 4
 changeset:   4:264128213d29
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 changeset:   3:443431ffac4f
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 changeset:   2:65bd5f99a4a3
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:9ab35a2d17cb
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % before strip of merge parent
 changeset:   2:65bd5f99a4a3
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   4:264128213d29
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 % after strip of merge parent
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 

tests/test-mq.out

@@ -1,650 +1,650
 % help
 mq extension - manage a stack of patches
 
 This extension lets you work with a stack of patches in a Mercurial
 repository. It manages two stacks of patches - all known patches, and applied
 patches (subset of known patches).
 
 Known patches are represented as patch files in the .hg/patches directory.
 Applied patches are both patch files and changesets.
 
 Common tasks (use "hg help command" for more details):
 
   create new patch                          qnew
   import existing patch                     qimport
 
   print patch series                        qseries
   print applied patches                     qapplied
 
   add known patch to applied stack          qpush
   remove patch from applied stack           qpop
   refresh contents of top applied patch     qrefresh
 
 By default, mq will automatically use git patches when required to avoid
 losing file mode changes, copy records, binary files or empty files creations
 or deletions. This behaviour can be configured with:
 
   [mq]
   git = auto/keep/yes/no
 
 If set to 'keep', mq will obey the [diff] section configuration while
 preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
 will override the [diff] section and always generate git or regular patches,
 possibly losing data in the second case.
 
 list of commands:
 
  qapplied     print the patches already applied
  qclone       clone main and patch repository at same time
  qdelete      remove patches from queue
  qdiff        diff of the current patch and subsequent modifications
  qfinish      move applied patches into repository history
  qfold        fold the named patches into the current patch
  qgoto        push or pop patches until named patch is at top of stack
  qguard       set or print guards for a patch
  qheader      print the header of the topmost or specified patch
  qimport      import a patch
  qnew         create a new patch
  qnext        print the name of the next patch
  qpop         pop the current patch off the stack
  qprev        print the name of the previous patch
  qpush        push the next patch onto the stack
  qrefresh     update the current patch
  qrename      rename a patch
  qselect      set or print guarded patches to push
  qseries      print the entire series file
  qtop         print the name of the current patch
  qunapplied   print the patches not yet applied
  strip        strip a changeset and all its descendants from the repository
 
 use "hg -v help mq" to show aliases and global options
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b/z
 % qinit
 % -R qinit
 % qinit -c
 A .hgignore
 A series
 % qinit; qinit -c
   .hgignore:
 ^\.hg
 ^\.mq
 syntax: glob
 status
 guards
   series:
 abort: repository already exists!
 % qinit; <stuff>; qinit -c
 adding .hg/patches/A
 adding .hg/patches/B
 A .hgignore
 A A
 A B
 A series
   .hgignore:
 status
 bleh
   series:
 A
 B
 % init --mq without repo
 abort: There is no Mercurial repository here (.hg not found)
 % init --mq with repo path
 ok
 % init --mq with nonexistent directory
 abort: repository nonexistentdir not found!
 % init --mq with bundle (non "local")
 abort: only a local queue repository may be initialized
 % qrefresh
 foo bar
 
 diff -r  xa
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 % empty qrefresh
 revision:
 patch:
 foo bar
 
 working dir diff:
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 % qpop
 popping test.patch
 patch queue now empty
 % qpush with dump of tag cache
 .hg/tags.cache (pre qpush):
 1
 
 applying test.patch
 now at: test.patch
 .hg/tags.cache (post qpush):
 2
 
 % pop/push outside repo
 popping test.patch
 patch queue now empty
 applying test.patch
 now at: test.patch
 % qrefresh in subdir
 % pop/push -a in subdir
 popping test2.patch
 popping test.patch
 patch queue now empty
 applying test.patch
 applying test2.patch
 now at: test2.patch
 % qseries
 test.patch
 test2.patch
 0 A test.patch: f...
 1 A test2.patch: 
 popping test2.patch
 now at: test.patch
 0 A test.patch: foo bar
 1 U test2.patch: 
 mq:     1 applied, 1 unapplied
 applying test2.patch
 now at: test2.patch
 mq:     2 applied
 % qapplied
 test.patch
 test2.patch
 % qtop
 test2.patch
 % prev
 test.patch
 % next
 all patches applied
 popping test2.patch
 now at: test.patch
 % commit should fail
 abort: cannot commit over an applied mq patch
 % push should fail
 pushing to ../../k
 abort: source has mq patches applied
 % import should fail
 abort: cannot import over an applied patch
 % import --no-commit should succeed
 applying ../../import.diff
 M a
 % qunapplied
 test2.patch
 % qpush/qpop with index
 applying test2.patch
 now at: test2.patch
 popping test2.patch
 popping test1b.patch
 now at: test.patch
 applying test1b.patch
 now at: test1b.patch
 applying test2.patch
 now at: test2.patch
 popping test2.patch
 now at: test1b.patch
 popping test1b.patch
 now at: test.patch
 applying test1b.patch
 applying test2.patch
 now at: test2.patch
 % qpush --move
 popping test2.patch
 popping test1b.patch
 popping test.patch
 patch queue now empty
 applying test2.patch
 now at: test2.patch
 applying test1b.patch
 now at: test1b.patch
 applying test.patch
 now at: test.patch
 0 A test2.patch
 1 A test1b.patch
 2 A test.patch
 popping test.patch
 popping test1b.patch
 popping test2.patch
 patch queue now empty
 applying test.patch
 now at: test.patch
 applying test1b.patch
 now at: test1b.patch
 abort: patch bogus not in series
 abort: cannot push to a previous patch: test.patch
 applying test2.patch
 now at: test2.patch
 % pop, qapplied, qunapplied
 0 A test.patch
 1 A test1b.patch
 2 A test2.patch
 % qapplied -1 test.patch
 only one patch applied
 % qapplied -1 test1b.patch
 test.patch
 % qapplied -1 test2.patch
 test1b.patch
 % qapplied -1
 test1b.patch
 % qapplied
 test.patch
 test1b.patch
 test2.patch
 % qapplied test1b.patch
 test.patch
 test1b.patch
 % qunapplied -1
 all patches applied
 % qunapplied
 % popping
 popping test2.patch
 now at: test1b.patch
 % qunapplied -1
 test2.patch
 % qunapplied
 test2.patch
 % qunapplied test2.patch
 % qunapplied -1 test2.patch
 all patches applied
 % popping -a
 popping test1b.patch
 popping test.patch
 patch queue now empty
 % qapplied
 % qapplied -1
 no patches applied
 applying test.patch
 now at: test.patch
 % push should succeed
 popping test.patch
 patch queue now empty
 pushing to ../../k
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % qpush/qpop error codes
 applying test.patch
 applying test1b.patch
 applying test2.patch
 now at: test2.patch
   % pops all patches and succeeds
 popping test2.patch
 popping test1b.patch
 popping test.patch
 patch queue now empty
   qpop -a succeeds
   % does nothing and succeeds
 no patches applied
   qpop -a succeeds
   % fails - nothing else to pop
 no patches applied
   qpop fails
   % pushes a patch and succeeds
 applying test.patch
 now at: test.patch
   qpush succeeds
   % pops a patch and succeeds
 popping test.patch
 patch queue now empty
   qpop succeeds
   % pushes up to test1b.patch and succeeds
 applying test.patch
 applying test1b.patch
 now at: test1b.patch
   qpush test1b.patch succeeds
   % does nothing and succeeds
 qpush: test1b.patch is already at the top
   qpush test1b.patch succeeds
   % does nothing and succeeds
 qpop: test1b.patch is already at the top
   qpop test1b.patch succeeds
   % fails - can't push to this patch
 abort: cannot push to a previous patch: test.patch
   qpush test.patch fails
   % fails - can't pop to this patch
 abort: patch test2.patch is not applied
   qpop test2.patch fails
   % pops up to test.patch and succeeds
 popping test1b.patch
 now at: test.patch
   qpop test.patch succeeds
   % pushes all patches and succeeds
 applying test1b.patch
 applying test2.patch
 now at: test2.patch
   qpush -a succeeds
   % does nothing and succeeds
 all patches are currently applied
   qpush -a succeeds
   % fails - nothing else to push
 patch series already fully applied
   qpush fails
   % does nothing and succeeds
 qpush: test2.patch is already at the top
   qpush test2.patch succeeds
 % strip
 adding x
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 % strip with local changes, should complain
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 abort: local changes found
 % --force strip with local changes
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 % cd b; hg qrefresh
 adding a
 foo
 
 diff -r cb9a9f314b8b a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 diff -r cb9a9f314b8b b/f
 --- /dev/null
 +++ b/b/f
 @@ -0,0 +1,1 @@
 +f
 % hg qrefresh .
 foo
 
 diff -r cb9a9f314b8b b/f
 --- /dev/null
 +++ b/b/f
 @@ -0,0 +1,1 @@
 +f
 M a
 % qpush failure
 popping bar
 popping foo
 patch queue now empty
 applying foo
 applying bar
 file foo already exists
 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
 patch failed, unable to continue (try -v)
 patch failed, rejects left in working dir
 errors during apply, please fix and refresh bar
 ? foo
 ? foo.rej
 % mq tags
 0 qparent
 1 foo qbase
 2 bar qtip tip
 % bad node in status
 popping bar
 now at: foo
 changeset:   0:cb9a9f314b8b
 mq status file refers to unknown node
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 mq status file refers to unknown node
 default                        0:cb9a9f314b8b
 abort: trying to pop unknown node
 new file
 
 diff --git a/new b/new
 new file mode 100755
 --- /dev/null
 +++ b/new
 @@ -0,0 +1,1 @@
 +foo
 copy file
 
 diff --git a/new b/copy
 copy from new
 copy to copy
 popping copy
 now at: new
 applying copy
 now at: copy
 diff --git a/new b/copy
 copy from new
 copy to copy
 diff --git a/new b/copy
 copy from new
 copy to copy
 % test file addition in slow path
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
 +++ b/bar
 @@ -0,0 +1,1 @@
 +bar
 diff --git a/foo b/baz
 rename from foo
 rename to baz
 2 baz (foo)
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
 +++ b/bar
 @@ -0,0 +1,1 @@
 +bar
 diff --git a/foo b/baz
 rename from foo
 rename to baz
 2 baz (foo)
 diff --git a/bar b/bar
 diff --git a/foo b/baz
 % test file move chains in the slow path
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 diff --git a/foo b/bleh
 rename from foo
 rename to bleh
 diff --git a/quux b/quux
 new file mode 100644
 --- /dev/null
 +++ b/quux
 @@ -0,0 +1,1 @@
 +bar
 3 bleh (foo)
 diff --git a/foo b/barney
 rename from foo
 rename to barney
 diff --git a/fred b/fred
 new file mode 100644
 --- /dev/null
 +++ b/fred
 @@ -0,0 +1,1 @@
 +bar
 3 barney (foo)
 % refresh omitting an added file
 C newfile
 A newfile
 popping baz
 now at: bar
 % create a git patch
 diff --git a/alexander b/alexander
 % create a git binary patch
 8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 diff --git a/bucephalus b/bucephalus
 % check binary patches can be popped and pushed
 popping addbucephalus
 now at: addalexander
 applying addbucephalus
 now at: addbucephalus
 8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 % strip again
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging foo
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 changeset:   3:99615015637b
 tag:         tip
 parent:      2:20cbbe65cff7
 parent:      1:d2871fc282d4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     merge
 
 changeset:   2:20cbbe65cff7
 parent:      0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 2
 
 changeset:   1:d2871fc282d4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 1
 
 changeset:   0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saving bundle to 
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 changeset:   1:20cbbe65cff7
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 2
 
 changeset:   0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
 % qclone
 abort: versioned patch repository not found (see init --mq)
 adding .hg/patches/patch1
 main repo:
     rev 1: change foo
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 popping patch1
 patch queue now empty
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 % test applying on an empty file (issue 1033)
 adding a
 popping changea
 patch queue now empty
 applying changea
 now at: changea
 % test qpush with --force, issue1087
 adding bye.txt
 adding hello.txt
 popping empty
 patch queue now empty
 % qpush should fail, local changes
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
 patch empty is empty
 now at: empty
 diff -r bf5fc3f07a0a hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,2 @@
  hello
 +world
 diff -r 9ecee4f634e3 hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,2 @@
  hello
 +world
 changeset:   1:bf5fc3f07a0a
 tag:         empty
 tag:         qbase
 tag:         qtip
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     imported patch empty
 
 
 popping empty
 patch queue now empty
 % qpush should fail, local changes
 abort: local changes found, refresh first
 % apply force, should discard changes in hello, but not bye
 applying empty
 now at: empty
 M bye.txt
 diff -r ba252371dbc1 bye.txt
 --- a/bye.txt
 +++ b/bye.txt
 @@ -1,1 +1,2 @@
  bye
 +universe
 diff -r 9ecee4f634e3 bye.txt
 --- a/bye.txt
 +++ b/bye.txt
 @@ -1,1 +1,2 @@
  bye
 +universe
 diff -r 9ecee4f634e3 hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,3 @@
  hello
 +world
 +universe
 % test popping revisions not in working dir ancestry
 0 A empty
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 popping empty
 patch queue now empty
 % test popping must remove files added in subdirectories first
 popping rename-dir
 patch queue now empty

tests/test-repair-strip.out

@@ -1,92 +1,92
 % before update 0, strip 2
 changeset:   0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
-saving bundle
+saved backup bundle
 transaction abort!
 failed to truncate data/b.i
 rollback failed - please run hg recover
 strip failed, full bundle
 abort: Permission denied .hg/store/data/b.i
 % after update 0, strip 2
 abandoned transaction found - run hg recover
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
  b@?: rev 1 points to nonexistent changeset 2
  (expected 1)
  b@?: 736c29771fba not in manifests
 warning: orphan revlog 'data/c.i'
 2 files, 2 changesets, 3 total revisions
 2 warnings encountered!
 2 integrity errors encountered!
 % journal contents
 00changelog.i
 00manifest.i
 data/b.i
 data/c.i
 rolling back interrupted transaction
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions
 % before update 0, strip 2
 changeset:   0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 abort: Permission denied .hg/store/data/b.i
 % after update 0, strip 2
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 4 changesets, 4 total revisions
 % journal contents
 (no journal)
 % before update 0, strip 2
 changeset:   0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
-saving bundle
+saved backup bundle
 transaction abort!
 failed to truncate 00manifest.i
 rollback failed - please run hg recover
 strip failed, full bundle
 abort: Permission denied .hg/store/00manifest.i
 % after update 0, strip 2
 abandoned transaction found - run hg recover
 checking changesets
 checking manifests
  manifest@?: rev 2 points to nonexistent changeset 2
  manifest@?: 3362547cdf64 not in changesets
  manifest@?: rev 3 points to nonexistent changeset 3
  manifest@?: 265a85892ecb not in changesets
 crosschecking files in changesets and manifests
  c@3: in manifest but not in changeset
 checking files
  b@?: rev 1 points to nonexistent changeset 2
  (expected 1)
  c@?: rev 0 points to nonexistent changeset 3
 3 files, 2 changesets, 4 total revisions
 1 warnings encountered!
 7 integrity errors encountered!
 (first damaged changeset appears to be 3)
 % journal contents
 00changelog.i
 00manifest.i
 data/b.i
 data/c.i
 rolling back interrupted transaction
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions

tests/test-strip-cross

@@ -1,68 +1,64
 #!/bin/sh
 
 # test stripping of filelogs where the linkrev doesn't always increase
 
+source $TESTDIR/helpers.sh
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.mq =' >> $HGRCPATH
 
 hg init orig
 cd orig
 
-hidefilename()
-{
-    sed -e 's/saving bundle to .*strip-backup/saving bundle to strip-backup/'
-}
-
 commit()
 {
     hg up -qC null
     count=1
     for i in "$@"; do
 	for f in $i; do
 	    echo $count > $f
 	done
 	count=`expr $count + 1`
     done
     hg commit -qAm "$*"
 }
 
 # 2 1 0 2 0 1 2
 commit '201 210'
 
 commit '102 120' '210'
 
 commit '021'
 
 commit '201' '021 120'
 
 commit '012 021' '102 201' '120 210'
 
 commit 'manifest-file'
 
 commit '102 120' '012 210' '021 201'
 
 commit '201 210' '021 120' '012 102'
 
 HGUSER=another-user; export HGUSER
 commit 'manifest-file'
 
 commit '012' 'manifest-file'
 
 cd ..
 hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
 
 for i in crossed/.hg/store/00manifest.i crossed/.hg/store/data/*.i; do
     echo $i
     hg debugindex $i
     echo
 done
 
 for i in 0 1 2 3 4; do
     hg clone -q -U --pull crossed $i
     echo "% Trying to strip revision $i"
-    hg --cwd $i strip $i 2>&1 | hidefilename
+    hg --cwd $i strip $i | hidebackup
     echo "% Verifying"
     hg --cwd $i verify
     echo
 done
 

tests/test-strip-cross.out

@@ -1,114 +1,114
 crossed/.hg/store/00manifest.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0     112      0       0 6f105cbb914d 000000000000 000000000000
      1       112      56      1       3 1b55917b3699 000000000000 000000000000
      2       168     123      1       1 8f3d04e263e5 000000000000 000000000000
      3       291     122      1       2 f0ef8726ac4f 000000000000 000000000000
      4       413      87      4       4 0b76e38b4070 000000000000 000000000000
 
 crossed/.hg/store/data/012.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       3      1       1 5d9299349fc0 000000000000 000000000000
      2         6       3      2       2 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/021.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       3      1       2 5d9299349fc0 000000000000 000000000000
      2         6       3      2       1 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/102.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       1 b8e02f643373 000000000000 000000000000
      1         3       3      1       0 5d9299349fc0 000000000000 000000000000
      2         6       3      2       2 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/120.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       1 b8e02f643373 000000000000 000000000000
      1         3       3      1       2 5d9299349fc0 000000000000 000000000000
      2         6       3      2       0 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/201.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       2 b8e02f643373 000000000000 000000000000
      1         3       3      1       0 5d9299349fc0 000000000000 000000000000
      2         6       3      2       1 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/210.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       2 b8e02f643373 000000000000 000000000000
      1         3       3      1       1 5d9299349fc0 000000000000 000000000000
      2         6       3      2       0 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/manifest-file.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       3 b8e02f643373 000000000000 000000000000
      1         3       3      1       4 5d9299349fc0 000000000000 000000000000
 
 % Trying to strip revision 0
-saving bundle to strip-backup/cbb8c2f0a2e3-backup
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 15 changes to 7 files (+3 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 15 total revisions
 
 % Trying to strip revision 1
-saving bundle to strip-backup/124ecc0cbec9-backup
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 12 changes to 7 files (+3 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 14 total revisions
 
 % Trying to strip revision 2
-saving bundle to strip-backup/f6439b304a1a-backup
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 8 changes to 6 files (+2 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 14 total revisions
 
 % Trying to strip revision 3
-saving bundle to strip-backup/6e54ec5db740-backup
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 2 files (+1 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 19 total revisions
 
 % Trying to strip revision 4
-saving bundle to strip-backup/9147ea23c156-backup
+saved backup bundle to 
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 19 total revisions