Mercurial > hg
annotate tests/test-check-commit.t @ 45587:768412472663
merge: store cases when a file is absent post merge in commitinfo
Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.
User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.
We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.
Differential Revision: https://phab.mercurial-scm.org/D9003
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 24 Aug 2020 15:35:34 +0530 |
parents | 33817e09c663 |
children |
rev | line source |
---|---|
22067
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 #require test-repo |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 Enable obsolescence to avoid the warning issue when obsmarker are found |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
29219
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
28293
diff
changeset
|
5 $ . "$TESTDIR/helpers-testrepo.sh" |
22067
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 Go back in the hg repo |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 $ cd $TESTDIR/.. |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
37816
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
11 $ REVSET='not public() and ::. and not desc("# no-check-commit")' |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
12 |
37687
8872d46643b6
test-check-commit: don't run hg per commit
Yuya Nishihara <yuya@tcha.org>
parents:
33204
diff
changeset
|
13 $ mkdir "$TESTTMP/p" |
37816
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
14 $ REVS=`testrepohg log -r "$REVSET" -T.` |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
15 $ if [ -n "$REVS" ] ; then |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
16 > testrepohg export --git -o "$TESTTMP/p/%n-%h" -r "$REVSET" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
17 > for f in `ls "$TESTTMP/p"`; do |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
18 > contrib/check-commit < "$TESTTMP/p/$f" > "$TESTTMP/check-commit.out" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
19 > if [ $? -ne 0 ]; then |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
20 > node="${f##*-}" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
21 > echo "Revision $node does not comply with rules" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
22 > echo '------------------------------------------------------' |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
23 > cat ${TESTTMP}/check-commit.out |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
24 > echo |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
25 > fi |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
26 > done |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
27 > fi |