##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.
Martin Geisler - - Load All Authors

File last commit:

r20117:aa9385f9 default
r23524:a1a7c94d default
Show More
test-strip-cross.t
143 lines | 5.3 KiB | text/troff | Tads3Lexer
/ tests / test-strip-cross.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: unify test-strip-cross
 r12492 test stripping of filelogs where the linkrev doesn't always increase
$ echo '[extensions]' >> $HGRCPATH
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ echo 'strip =' >> $HGRCPATH
Matt Mackall
tests: unify test-strip-cross
 r12492 $ hg init orig
$ cd orig
$ commit()
> {
> hg up -qC null
> count=1
> for i in "$@"; do
Adrian Buehlmann
tests: fix tabs/indentation in test-strip-cross.t
 r12537 > for f in $i; do
> echo $count > $f
> done
> count=`expr $count + 1`
Matt Mackall
tests: unify test-strip-cross
 r12492 > 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
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 $ cd crossed
Sune Foldager
debugindex etc.: add --changelog and --manifest options...
 r14323 $ hg debugindex --manifest
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 112 ..... 0 6f105cbb914d 000000000000 000000000000 (re)
1 112 56 ..... 3 1b55917b3699 000000000000 000000000000 (re)
2 168 123 ..... 1 8f3d04e263e5 000000000000 000000000000 (re)
3 291 122 ..... 2 f0ef8726ac4f 000000000000 000000000000 (re)
4 413 87 ..... 4 0b76e38b4070 000000000000 000000000000 (re)
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182
$ for i in 012 021 102 120 201 210 manifest-file; do
> echo $i
> hg debugindex $i
> echo
> done
012
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re)
2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 021
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re)
2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 102
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re)
2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 120
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re)
2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 201
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re)
2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 210
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re)
2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 manifest-file
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
 r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 3 b8e02f643373 000000000000 000000000000 (re)
1 3 3 ..... 4 5d9299349fc0 000000000000 000000000000 (re)
Matt Mackall
tests: unify test-strip-cross
 r12492
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 $ cd ..
Matt Mackall
tests: unify test-strip-cross
 r12492 $ for i in 0 1 2 3 4; do
> hg clone -q -U --pull crossed $i
> echo "% Trying to strip revision $i"
Mads Kiilerich
tests: remove redundant globs...
 r12640 > hg --cwd $i strip $i
Matt Mackall
tests: unify test-strip-cross
 r12492 > echo "% Verifying"
> hg --cwd $i verify
> echo
> done
% Trying to strip revision 0
Mads Kiilerich
tests: remove redundant globs...
 r12640 saved backup bundle to $TESTTMP/0/.hg/strip-backup/*-backup.hg (glob)
Matt Mackall
tests: unify test-strip-cross
 r12492 % 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
Mads Kiilerich
tests: remove redundant globs...
 r12640 saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob)
Matt Mackall
tests: unify test-strip-cross
 r12492 % 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
Mads Kiilerich
tests: remove redundant globs...
 r12640 saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob)
Matt Mackall
tests: unify test-strip-cross
 r12492 % 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
Mads Kiilerich
tests: remove redundant globs...
 r12640 saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob)
Matt Mackall
tests: unify test-strip-cross
 r12492 % 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
Mads Kiilerich
tests: remove redundant globs...
 r12640 saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob)
Matt Mackall
tests: unify test-strip-cross
 r12492 % Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 19 total revisions