Mercurial > hg
changeset 12204:c55d69c5fb77
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Fri, 10 Sep 2010 17:59:17 +0200 |
| parents | d346089095ac |
| children | b4d0d646b3f7 |
| files | tests/test-issue1438 tests/test-issue1438.out tests/test-issue1438.t tests/test-issue2137 tests/test-issue2137.out tests/test-issue2137.t |
| diffstat | 6 files changed, 79 insertions(+), 75 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-issue1438 Fri Sep 10 20:11:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -#!/bin/sh -"$TESTDIR/hghave" symlink || exit 80 - -rm -rf a -hg init a -cd a - -ln -s foo link -hg add link -hg ci -mbad link -hg rm link -hg ci -mok -hg diff -g -r 0:1 > bad.patch -hg up 0 -hg import --no-commit bad.patch -hg st
--- a/tests/test-issue1438.out Fri Sep 10 20:11:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -applying bad.patch -R link -? bad.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue1438.t Fri Sep 10 17:59:17 2010 +0200 @@ -0,0 +1,23 @@ +# http://mercurial.selenic.com/bts/issue1438 + + $ "$TESTDIR/hghave" symlink || exit 80 + + $ hg init + + $ ln -s foo link + $ hg add link + $ hg ci -mbad link + $ hg rm link + $ hg ci -mok + $ hg diff -g -r 0:1 > bad.patch + + $ hg up 0 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ hg import --no-commit bad.patch + applying bad.patch + + $ hg status + R link + ? bad.patch +
--- a/tests/test-issue2137 Fri Sep 10 20:11:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh - -echo "% setup" - -# create a little extension that has 3 side-effects: -# 1) ensure changelog data is not inlined -# 2) make revlog to use lazyparser -# 3) test that repo.lookup() works -# 1 and 2 are preconditions for the bug; 3 is the bug. -cat > commitwrapper.py <<EOF -from mercurial import extensions, node, revlog - -def reposetup(ui, repo): - def wrapcommit(orig, *args, **kwargs): - result = orig(*args, **kwargs) - tip1 = node.short(repo.changelog.tip()) - tip2 = node.short(repo.lookup(tip1)) - assert tip1 == tip2 - ui.write('new tip: %s\n' % tip1) - return result - - extensions.wrapfunction(repo, 'commit', wrapcommit) - -def extsetup(ui): - revlog._maxinline = 8 # split out 00changelog.d early - revlog._prereadsize = 8 # use revlog.lazyparser -EOF - -cat >> $HGRCPATH <<EOF -[extensions] -commitwrapper = `pwd`/commitwrapper.py -EOF - -hg init repo1 -cd repo1 -echo a > a -hg commit -A -m'add a with a long commit message to make the changelog a bit bigger' - -echo "" -echo "% test that new changesets are visible to repo.lookup()" -echo a >> a -hg commit -m'one more commit to demonstrate the bug' -hg tip
--- a/tests/test-issue2137.out Fri Sep 10 20:11:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -% setup -adding a -new tip: 553596fad57b - -% test that new changesets are visible to repo.lookup() -new tip: 799ae3599e0e -changeset: 1:799ae3599e0e -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: one more commit to demonstrate the bug -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue2137.t Fri Sep 10 17:59:17 2010 +0200 @@ -0,0 +1,56 @@ +# http://mercurial.selenic.com/bts/issue2137 + +Setup: + +# create a little extension that has 3 side-effects: +# 1) ensure changelog data is not inlined +# 2) make revlog to use lazyparser +# 3) test that repo.lookup() works +# 1 and 2 are preconditions for the bug; 3 is the bug. + + $ cat > commitwrapper.py <<EOF + > from mercurial import extensions, node, revlog + > + > def reposetup(ui, repo): + > def wrapcommit(orig, *args, **kwargs): + > result = orig(*args, **kwargs) + > tip1 = node.short(repo.changelog.tip()) + > tip2 = node.short(repo.lookup(tip1)) + > assert tip1 == tip2 + > ui.write('new tip: %s\n' % tip1) + > return result + > + > extensions.wrapfunction(repo, 'commit', wrapcommit) + > + > def extsetup(ui): + > revlog._maxinline = 8 # split out 00changelog.d early + > revlog._prereadsize = 8 # use revlog.lazyparser + > EOF + + $ cat >> $HGRCPATH <<EOF + > [extensions] + > commitwrapper = `pwd`/commitwrapper.py + > EOF + + $ hg init repo1 + $ cd repo1 + $ echo a > a + $ hg commit -A -m'add a with a long commit message to make the changelog a bit bigger' + adding a + new tip: 553596fad57b + + +Test that new changesets are visible to repo.lookup(): + + $ echo a >> a + $ hg commit -m'one more commit to demonstrate the bug' + new tip: 799ae3599e0e + + $ hg tip + changeset: 1:799ae3599e0e + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: one more commit to demonstrate the bug + +