This change only updates the log calls; D1650 also includes the test output changes.
Details
Details
- Reviewers
- None
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D1651
tests: change log templates to include hashesAbandonedPublic
tests: change log templates to include hashes
AbandonedPublic
Authored by phillco on Dec 11 2017, 12:58 AM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-mq-header-date.t (6 lines) | |||
| M | tests/test-mq-header-from.t (4 lines) | |||
| M | tests/test-mq-pull-from-bundle.t (2 lines) | |||
| M | tests/test-rebase-base-flag.t (2 lines) | |||
| M | tests/test-rebase-bookmarks.t (2 lines) | |||
| M | tests/test-rebase-collapse.t (4 lines) | |||
| M | tests/test-rebase-dest.t (2 lines) | |||
| M | tests/test-rebase-detach.t (2 lines) | |||
| M | tests/test-rebase-interruptions.t (4 lines) | |||
| M | tests/test-rebase-issue-noparam-single-rev.t (2 lines) | |||
| M | tests/test-rebase-mq-skip.t (2 lines) | |||
| M | tests/test-rebase-mq.t (2 lines) | |||
| M | tests/test-rebase-named-branches.t (2 lines) | |||
| M | tests/test-rebase-newancestor.t (2 lines) | |||
| M | tests/test-rebase-parameters.t (2 lines) | |||
| M | tests/test-rebase-partial.t (2 lines) | |||
| M | tests/test-rebase-pull.t (2 lines) | |||
| M | tests/test-rebase-rename.t (2 lines) | |||
| M | tests/test-rebase-scenario-global.t (2 lines) |
Diff 4344
Diff 4344
tests/test-mq-header-date.t
| $ cat <<EOF >> $HGRCPATH | $ cat <<EOF >> $HGRCPATH | ||||
| > [extensions] | > [extensions] | ||||
| > mq = | > mq = | ||||
| > [diff] | > [diff] | ||||
| > nodates = true | > nodates = true | ||||
| > EOF | > EOF | ||||
| $ catpatch() { | $ catpatch() { | ||||
| > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ | > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ | ||||
| > -e "s/^\(# Parent \).*/\1/" | > -e "s/^\(# Parent \).*/\1/" | ||||
| > } | > } | ||||
| $ catlog() { | $ catlog() { | ||||
| > catpatch $1 | > catpatch $1 | ||||
| > hg log --template "{rev}: {desc} - {author}\n" | > hg log --template "{rev}: {node|short} {desc} - {author}\n" | ||||
| > } | > } | ||||
| $ catlogd() { | $ catlogd() { | ||||
| > catpatch $1 | > catpatch $1 | ||||
| > hg log --template "{rev}: {desc} - {author} - {date}\n" | > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n" | ||||
| > } | > } | ||||
| $ drop() { | $ drop() { | ||||
| > hg qpop | > hg qpop | ||||
| > hg qdel $1.patch | > hg qdel $1.patch | ||||
| > } | > } | ||||
| $ runtest() { | $ runtest() { | ||||
| > echo ==== init | > echo ==== init | ||||
| > hg init a | > hg init a | ||||
| > catlog 9 | > catlog 9 | ||||
| > | > | ||||
| > drop 9 | > drop 9 | ||||
| > | > | ||||
| > | > | ||||
| > echo ==== "qpop -a / qpush -a" | > echo ==== "qpop -a / qpush -a" | ||||
| > hg qpop -a | > hg qpop -a | ||||
| > hg qpush -a | > hg qpush -a | ||||
| > hg log --template "{rev}: {desc} - {author} - {date}\n" | > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n" | ||||
| > } | > } | ||||
| ======= plain headers | ======= plain headers | ||||
| $ echo "[mq]" >> $HGRCPATH | $ echo "[mq]" >> $HGRCPATH | ||||
| $ echo "plain=true" >> $HGRCPATH | $ echo "plain=true" >> $HGRCPATH | ||||
| $ mkdir sandbox | $ mkdir sandbox | ||||
| $ (cd sandbox ; runtest) | $ (cd sandbox ; runtest) | ||||
tests/test-mq-header-from.t
| $ echo "[extensions]" >> $HGRCPATH | $ echo "[extensions]" >> $HGRCPATH | ||||
| $ echo "mq=" >> $HGRCPATH | $ echo "mq=" >> $HGRCPATH | ||||
| $ echo "[diff]" >> $HGRCPATH | $ echo "[diff]" >> $HGRCPATH | ||||
| $ echo "nodates=true" >> $HGRCPATH | $ echo "nodates=true" >> $HGRCPATH | ||||
| $ catlog() { | $ catlog() { | ||||
| > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ | > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ | ||||
| > -e "s/^\(# Parent \).*/\1/" | > -e "s/^\(# Parent \).*/\1/" | ||||
| > hg log --template "{rev}: {desc} - {author}\n" | > hg log --template "{rev}: {node|short} {desc} - {author}\n" | ||||
| > } | > } | ||||
| $ runtest() { | $ runtest() { | ||||
| > echo ==== init | > echo ==== init | ||||
| > hg init a | > hg init a | ||||
| > cd a | > cd a | ||||
| > hg qinit | > hg qinit | ||||
| > | > | ||||
| > | > | ||||
| > echo ==== hg qref -u | > echo ==== hg qref -u | ||||
| > hg qref -u johndeere | > hg qref -u johndeere | ||||
| > catlog 6 | > catlog 6 | ||||
| > | > | ||||
| > | > | ||||
| > echo ==== "qpop -a / qpush -a" | > echo ==== "qpop -a / qpush -a" | ||||
| > hg qpop -a | > hg qpop -a | ||||
| > hg qpush -a | > hg qpush -a | ||||
| > hg log --template "{rev}: {desc} - {author}\n" | > hg log --template "{rev}: {node|short} {desc} - {author}\n" | ||||
| > } | > } | ||||
| ======= plain headers | ======= plain headers | ||||
| $ echo "[mq]" >> $HGRCPATH | $ echo "[mq]" >> $HGRCPATH | ||||
| $ echo "plain=true" >> $HGRCPATH | $ echo "plain=true" >> $HGRCPATH | ||||
| $ mkdir sandbox | $ mkdir sandbox | ||||
| $ (cd sandbox ; runtest) | $ (cd sandbox ; runtest) | ||||
tests/test-mq-pull-from-bundle.t
| $ cat <<EOF >> $HGRCPATH | $ cat <<EOF >> $HGRCPATH | ||||
| > [extensions] | > [extensions] | ||||
| > mq= | > mq= | ||||
| > [alias] | > [alias] | ||||
| > tlog = log --template "{rev}: {desc}\\n" | > tlog = log --template "{rev}: {node|short} {desc}\\n" | ||||
| > theads = heads --template "{rev}: {desc}\\n" | > theads = heads --template "{rev}: {desc}\\n" | ||||
| > tincoming = incoming --template "{rev}: {desc}\\n" | > tincoming = incoming --template "{rev}: {desc}\\n" | ||||
| > EOF | > EOF | ||||
| Setup main: | Setup main: | ||||
| $ hg init base | $ hg init base | ||||
| $ cd base | $ cd base | ||||
tests/test-rebase-base-flag.t
| Test the "--base" flag of the rebase command. (Tests unrelated to the "--base" | Test the "--base" flag of the rebase command. (Tests unrelated to the "--base" | ||||
| flag should probably live in somewhere else) | flag should probably live in somewhere else) | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: {desc}" | > tglog = log -G --template "{rev}: {node|short} {desc}" | ||||
| > EOF | > EOF | ||||
| $ rebasewithdag() { | $ rebasewithdag() { | ||||
| > N=`$PYTHON -c "print($N+1)"` | > N=`$PYTHON -c "print($N+1)"` | ||||
| > hg init repo$N && cd repo$N | > hg init repo$N && cd repo$N | ||||
| > hg debugdrawdag | > hg debugdrawdag | ||||
| > hg rebase "$@" > _rebasetmp | > hg rebase "$@" > _rebasetmp | ||||
| > r=$? | > r=$? | ||||
tests/test-rebase-bookmarks.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n" | ||||
| > EOF | > EOF | ||||
| Create a repo with several bookmarks | Create a repo with several bookmarks | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ echo a > a | $ echo a > a | ||||
| $ hg ci -Am A | $ hg ci -Am A | ||||
tests/test-rebase-collapse.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > mq= | > mq= | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" | > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| Create repo a: | Create repo a: | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ hg unbundle "$TESTDIR/bundles/rebase.hg" | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||||
| adding changesets | adding changesets | ||||
tests/test-rebase-dest.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [ui] | > [ui] | ||||
| > allowemptycommit=1 | > allowemptycommit=1 | ||||
| > [extensions] | > [extensions] | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)' | > tglog = log -G --template "{rev}: {node|short} {desc} {instabilities}" -r 'sort(all(), topo)' | ||||
| > [extensions] | > [extensions] | ||||
| > maprevset=$TESTTMP/maprevset.py | > maprevset=$TESTTMP/maprevset.py | ||||
| > [experimental] | > [experimental] | ||||
| > evolution=true | > evolution=true | ||||
| > EOF | > EOF | ||||
| $ rebasewithdag() { | $ rebasewithdag() { | ||||
| > N=`$PYTHON -c "print($N+1)"` | > N=`$PYTHON -c "print($N+1)"` | ||||
tests/test-rebase-detach.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}'\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}'\n" | ||||
| > | > | ||||
| > [extensions] | > [extensions] | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > EOF | > EOF | ||||
| Rebasing D onto B detaching from C (one commit): | Rebasing D onto B detaching from C (one commit): | ||||
| $ hg init a1 | $ hg init a1 | ||||
tests/test-rebase-interruptions.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" | > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ echo A > A | $ echo A > A | ||||
| $ hg ci -Am A | $ hg ci -Am A | ||||
tests/test-rebase-issue-noparam-single-rev.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ echo c1 > c1 | $ echo c1 > c1 | ||||
| $ hg ci -Am c1 | $ hg ci -Am c1 | ||||
tests/test-rebase-mq-skip.t
| This emulates the effects of an hg pull --rebase in which the remote repo | This emulates the effects of an hg pull --rebase in which the remote repo | ||||
| already has one local mq patch | already has one local mq patch | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [format] | > [format] | ||||
| > usegeneraldelta=yes | > usegeneraldelta=yes | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > mq= | > mq= | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ hg qinit -c | $ hg qinit -c | ||||
| $ echo c1 > c1 | $ echo c1 > c1 | ||||
tests/test-rebase-mq.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > mq= | > mq= | ||||
| > | > | ||||
| > [mq] | > [mq] | ||||
| > plain=true | > plain=true | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ hg qinit -c | $ hg qinit -c | ||||
| $ echo c1 > f | $ echo c1 > f | ||||
tests/test-rebase-named-branches.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ hg unbundle "$TESTDIR/bundles/rebase.hg" | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
tests/test-rebase-newancestor.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [format] | > [format] | ||||
| > usegeneraldelta=yes | > usegeneraldelta=yes | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init repo | $ hg init repo | ||||
| $ cd repo | $ cd repo | ||||
| $ echo A > a | $ echo A > a | ||||
| $ echo >> a | $ echo >> a | ||||
| $ hg ci -Am A | $ hg ci -Am A | ||||
tests/test-rebase-parameters.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ hg unbundle "$TESTDIR/bundles/rebase.hg" | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
tests/test-rebase-partial.t
| Tests rebasing with part of the rebase set already in the | Tests rebasing with part of the rebase set already in the | ||||
| destination (issue5422) | destination (issue5422) | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > | > | ||||
| > [experimental] | > [experimental] | ||||
| > evolution.createmarkers=True | > evolution.createmarkers=True | ||||
| > evolution.allowunstable=True | > evolution.allowunstable=True | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: {desc}" | > tglog = log -G --template "{rev}: {node|short} {desc}" | ||||
| > EOF | > EOF | ||||
| $ rebasewithdag() { | $ rebasewithdag() { | ||||
| > N=`$PYTHON -c "print($N+1)"` | > N=`$PYTHON -c "print($N+1)"` | ||||
| > hg init repo$N && cd repo$N | > hg init repo$N && cd repo$N | ||||
| > hg debugdrawdag | > hg debugdrawdag | ||||
| > hg rebase "$@" > _rebasetmp | > hg rebase "$@" > _rebasetmp | ||||
| > r=$? | > r=$? | ||||
tests/test-rebase-pull.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > histedit= | > histedit= | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ echo C1 > C1 | $ echo C1 > C1 | ||||
| $ hg ci -Am C1 | $ hg ci -Am C1 | ||||
tests/test-rebase-rename.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tlog = log --template "{rev}: '{desc}' {branches}\n" | > tlog = log --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > tglog = tlog --graph | > tglog = tlog --graph | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ mkdir d | $ mkdir d | ||||
tests/test-rebase-scenario-global.t
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > drawdag=$TESTDIR/drawdag.py | > drawdag=$TESTDIR/drawdag.py | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish=False | > publish=False | ||||
| > | > | ||||
| > [alias] | > [alias] | ||||
| > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ hg unbundle "$TESTDIR/bundles/rebase.hg" | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||