tests: don't load unnecessary graphlog extension
Since graphlog is in core, we can use 'hg log -G' instead.
--- a/tests/bzr-definitions Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/bzr-definitions Fri Nov 22 19:14:17 2013 +0100
@@ -5,11 +5,10 @@
TERM=dumb; export TERM
echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH
-echo 'hgext.graphlog = ' >> $HGRCPATH
glog()
{
- hg glog --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
+ hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
}
manifest()
--- a/tests/test-alias.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-alias.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,8 +1,5 @@
$ HGFOO=BAR; export HGFOO
$ cat >> $HGRCPATH <<EOF
- > [extensions]
- > graphlog=
- >
> [alias]
> # should clobber ci but not commit (issue2993)
> ci = version
@@ -34,7 +31,7 @@
> count = !hg log -r "\$@" --template=. | wc -c | sed -e 's/ //g'
> mcount = !hg log \$@ --template=. | wc -c | sed -e 's/ //g'
> rt = root
- > tglog = glog --template "{rev}:{node|short}: '{desc}' {branches}\n"
+ > tglog = log -G --template "{rev}:{node|short}: '{desc}' {branches}\n"
> idalias = id
> idaliaslong = id
> idaliasshell = !echo test
--- a/tests/test-bookmarks.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-bookmarks.t Fri Nov 22 19:14:17 2013 +0100
@@ -549,7 +549,7 @@
test stripping a non-checked-out but bookmarked revision
- $ hg --config extensions.graphlog= log --graph
+ $ hg log --graph
o changeset: 4:9ba5f110a0b3
| branch: test
| tag: tip
@@ -587,7 +587,7 @@
saved backup bundle to * (glob)
should-end-on-two should end up pointing to revision 2, as that's the
tipmost surviving ancestor of the stripped revision.
- $ hg --config extensions.graphlog= log --graph
+ $ hg log --graph
@ changeset: 3:9ba5f110a0b3
| branch: test
| bookmark: four
--- a/tests/test-bundle-vs-outgoing.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-bundle-vs-outgoing.t Fri Nov 22 19:14:17 2013 +0100
@@ -75,12 +75,9 @@
$ mkrev 8
rev 8
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
-
the story so far
- $ hg glog --template "{rev}\n"
+ $ hg log -G --template "{rev}\n"
@ 8
|
| o 7
--- a/tests/test-commit-multiple.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-commit-multiple.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat <<EOF >> $HGRCPATH
> [extensions]
> transplant =
- > graphlog =
> EOF
$ hg init repo
$ cd repo
@@ -39,7 +38,7 @@
$ echo fix2 > bugfix
$ echo fix2 >> file1
$ hg ci -Am"fix 2"
- $ hg glog --template="$template"
+ $ hg log -G --template="$template"
@ 3 fix 2 [fixes]
|
o 2 fix 1 [fixes]
@@ -59,7 +58,7 @@
[0-9a-f]{12} transplanted to [0-9a-f]{12} (re)
applying [0-9a-f]{12} (re)
[0-9a-f]{12} transplanted to [0-9a-f]{12} (re)
- $ hg glog --template="$template"
+ $ hg log -G --template="$template"
@ 5 fix 2 [release]
|
o 4 fix 1 [release]
--- a/tests/test-commit-unresolved.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-commit-unresolved.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,3 @@
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
-
$ addcommit () {
> echo $1 > $1
> hg add $1
--- a/tests/test-convert-baz.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-baz.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'graphlog =' >> $HGRCPATH
create baz archive
$ baz make-archive baz@mercurial--convert hg-test-convert-baz
@@ -129,7 +128,7 @@
$ glog()
> {
- > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
+ > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
> }
show graph log
--- a/tests/test-convert-cvs-branch.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-cvs-branch.t Fri Nov 22 19:14:17 2013 +0100
@@ -8,7 +8,6 @@
> }
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert = " >> $HGRCPATH
- $ echo "graphlog = " >> $HGRCPATH
$ echo "[convert]" >> $HGRCPATH
$ echo "cvsps.cache=0" >> $HGRCPATH
@@ -79,7 +78,7 @@
Check the result
- $ hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
+ $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} files: {files}\n'
o 5 () update tags files: .hgtags
|
| o 4 (BRANCH) mod a again files: a
--- a/tests/test-convert-cvs-detectmerge.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-cvs-detectmerge.t Fri Nov 22 19:14:17 2013 +0100
@@ -24,7 +24,6 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert = " >> $HGRCPATH
- $ echo "graphlog = " >> $HGRCPATH
$ echo "[convert]" >> $HGRCPATH
$ echo "cvsps.cache=0" >> $HGRCPATH
$ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
@@ -210,7 +209,7 @@
graphical log
- $ hg -R proj.hg glog --template="$template"
+ $ hg -R proj.hg log -G --template="$template"
o 9: '' fix file1 [MERGE from v1-1]
|
| o 8: 'v1_1' fix file1
--- a/tests/test-convert-cvs-synthetic.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-cvs-synthetic.t Fri Nov 22 19:14:17 2013 +0100
@@ -3,7 +3,6 @@
$ "$TESTDIR/hghave" cvs || exit 80
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert = " >> $HGRCPATH
- $ echo "graphlog = " >> $HGRCPATH
create cvs repository with one project
@@ -153,9 +152,9 @@
1 MERGE from HEAD: add file6
0 MERGE from v1_2: add file5
-hg glog output (#1)
+hg log -G output (#1)
- $ hg -R proj.hg glog --template "{rev} {desc}\n"
+ $ hg -R proj.hg log -G --template "{rev} {desc}\n"
o 8 MERGE from v1_2: add file5
|
| o 7 MERGE from HEAD: add file6
@@ -200,9 +199,9 @@
1 MERGE from HEAD: add file6
0 MERGE from v1_2: add file5
-hg glog output (#2)
+hg log -G output (#2)
- $ hg -R proj.hg2 glog --template "{rev} {desc}\n"
+ $ hg -R proj.hg2 log -G --template "{rev} {desc}\n"
o 8 MERGE from v1_2: add file5
|
| o 7 MERGE from HEAD: add file6
--- a/tests/test-convert-cvs.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-cvs.t Fri Nov 22 19:14:17 2013 +0100
@@ -10,7 +10,6 @@
> }
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert = " >> $HGRCPATH
- $ echo "graphlog = " >> $HGRCPATH
$ cat > cvshooks.py <<EOF
> def cvslog(ui,repo,hooktype,log):
> print "%s hook: %d entries"%(hooktype,len(log))
@@ -307,7 +306,7 @@
2 funny
1 fuzzy
0 fuzzy
- $ hg -R src-hg glog --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
+ $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
o 8 (branch) fuzzy date: * -1000 files: b/c (glob)
|
o 7 (branch) fuzzy date: * -1000 files: a (glob)
--- a/tests/test-convert-cvsnt-mergepoints.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-cvsnt-mergepoints.t Fri Nov 22 19:14:17 2013 +0100
@@ -22,7 +22,6 @@
> }
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert = " >> $HGRCPATH
- $ echo "graphlog = " >> $HGRCPATH
create cvs repository
--- a/tests/test-convert-darcs.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-darcs.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ "$TESTDIR/hghave" darcs || exit 80
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'graphlog =' >> $HGRCPATH
$ DARCS_EMAIL='test@example.org'; export DARCS_EMAIL
initialize darcs repo
--- a/tests/test-convert-datesort.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-datesort.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert=
- > graphlog=
> EOF
$ hg init t
$ cd t
@@ -83,7 +82,7 @@
graph converted repo
- $ hg -R t-datesort glog --template '{rev} "{desc}"\n'
+ $ hg -R t-datesort log -G --template '{rev} "{desc}"\n'
o 12 "c1"
|\
| o 11 "b2x"
@@ -134,7 +133,7 @@
graph converted repo
- $ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
+ $ hg -R t-sourcesort log -G --template '{rev} "{desc}"\n'
o 12 "c1"
|\
| o 11 "b2x"
@@ -185,7 +184,7 @@
graph converted repo
- $ hg -R t-closesort glog --template '{rev} "{desc}"\n'
+ $ hg -R t-closesort log -G --template '{rev} "{desc}"\n'
o 12 "c1"
|\
| o 11 "c0"
--- a/tests/test-convert-filemap.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-filemap.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,11 +1,10 @@
$ HGMERGE=true; export HGMERGE
$ echo '[extensions]' >> $HGRCPATH
- $ echo 'graphlog =' >> $HGRCPATH
$ echo 'convert =' >> $HGRCPATH
$ glog()
> {
- > hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
+ > hg log -G --template '{rev} "{desc}" files: {files}\n' "$@"
> }
$ hg init source
$ cd source
@@ -473,7 +472,7 @@
$ glog()
> {
- > hg glog --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@"
+ > hg log -G --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@"
> }
test anonymous branch pruning
--- a/tests/test-convert-git.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-git.t Fri Nov 22 19:14:17 2013 +0100
@@ -6,7 +6,6 @@
$ echo "autocrlf = false" >> $HOME/.gitconfig
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'hgext.graphlog =' >> $HGRCPATH
$ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
$ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
$ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
@@ -114,7 +113,7 @@
$ cd ..
$ glog()
> {
- > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
+ > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
> }
$ splitrepo()
> {
--- a/tests/test-convert-hg-startrev.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-hg-startrev.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,7 +1,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog =
> convert =
> [convert]
> hg.saverev = yes
@@ -9,7 +8,7 @@
$ glog()
> {
- > hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n'
+ > hg -R "$1" log -G --template '{rev} "{desc}" files: {files}\n'
> }
$ hg init source
--- a/tests/test-convert-mtn.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-mtn.t Fri Nov 22 19:14:17 2013 +0100
@@ -16,7 +16,6 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'graphlog =' >> $HGRCPATH
Windows version of monotone home
@@ -257,7 +256,7 @@
0 largefile
$ glog()
> {
- > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
+ > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
> }
$ cd repo.mtn-hg
$ hg up -C
--- a/tests/test-convert-splicemap.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-splicemap.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,10 +1,9 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'graphlog =' >> $HGRCPATH
$ glog()
> {
- > hg glog --template '{rev}:{node|short} "{desc|firstline}"\
+ > hg log -G --template '{rev}:{node|short} "{desc|firstline}"\
> files: {files}\n' "$@"
> }
$ hg init repo1
--- a/tests/test-convert-svn-branches.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-branches.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> EOF
$ svnadmin create svn-repo
@@ -58,7 +57,7 @@
0 branch trunk@1 into old3
$ cd A-hg
- $ hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
+ $ hg log -G --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
o branch=newbranch 11 branch trunk@1 into old3 files:
|
| o branch= 10 last change to a files: a
--- a/tests/test-convert-svn-encoding.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-encoding.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> EOF
$ svnadmin create svn-repo
--- a/tests/test-convert-svn-move.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-move.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> EOF
$ svnadmin create svn-repo
@@ -39,7 +38,7 @@
0 rename d4old into d4new
$ cd A-hg
- $ hg glog --template '{rev} {desc|firstline} files: {files}\n'
+ $ hg log -G --template '{rev} {desc|firstline} files: {files}\n'
o 13 rename d4old into d4new files: d4new/g d4old/g
|
o 12 add d4old files: d4old/g
--- a/tests/test-convert-svn-sink.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-sink.t Fri Nov 22 19:14:17 2013 +0100
@@ -17,7 +17,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> EOF
$ hg init a
--- a/tests/test-convert-svn-source.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-source.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> [convert]
> svn.trunk = mytrunk
> EOF
@@ -127,7 +126,7 @@
updating tags
$ cd B-hg
- $ hg glog --template '{rev} {desc|firstline} date: {date|date} files: {files}\n'
+ $ hg log -G --template '{rev} {desc|firstline} date: {date|date} files: {files}\n'
o 7 update tags date: * +0000 files: .hgtags (glob)
|
o 6 work in progress date: * -1000 files: letter2.txt (glob)
@@ -165,7 +164,7 @@
0 work in progress
$ hg -R fmap branch -q
default
- $ hg glog -R fmap --template '{rev} {desc|firstline} files: {files}\n'
+ $ hg log -G -R fmap --template '{rev} {desc|firstline} files: {files}\n'
o 1 work in progress files: letter2.txt
|
o 0 second letter files: letter2.txt
--- a/tests/test-convert-svn-startrev.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-startrev.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> EOF
$ convert()
> {
@@ -15,7 +14,7 @@
> --config convert.svn.branches=" " \
> --config convert.svn.tags= \
> --datesort svn-repo $repopath
- > hg -R $repopath glog \
+ > hg -R $repopath log -G \
> --template '{rev} {desc|firstline} files: {files}\n'
> echo
> }
--- a/tests/test-convert-svn-tags.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-svn-tags.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
- > graphlog =
> EOF
$ svnadmin create svn-repo
@@ -25,7 +24,7 @@
updating tags
$ cd A-hg
- $ hg glog --template '{rev} {desc|firstline} tags: {tags}\n'
+ $ hg log -G --template '{rev} {desc|firstline} tags: {tags}\n'
o 6 update tags tags: tip
|
o 5 changea tags: trunk.goodtag
--- a/tests/test-convert-tagsbranch-topology.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-tagsbranch-topology.t Fri Nov 22 19:14:17 2013 +0100
@@ -6,7 +6,6 @@
$ echo "autocrlf = false" >> $HOME/.gitconfig
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'hgext.graphlog =' >> $HGRCPATH
$ echo '[convert]' >> $HGRCPATH
$ echo 'hg.usebranchnames = True' >> $HGRCPATH
$ echo 'hg.tagsbranch = tags-update' >> $HGRCPATH
@@ -26,7 +25,7 @@
> }
$ glog()
> {
- > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
+ > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
> }
$ convertrepo()
> {
--- a/tests/test-convert-tla.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-tla.t Fri Nov 22 19:14:17 2013 +0100
@@ -3,7 +3,6 @@
$ tla my-id "mercurial <mercurial@selenic.com>"
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
- $ echo 'graphlog =' >> $HGRCPATH
create tla archive
@@ -109,7 +108,7 @@
$ tla register-archive -d tla@mercurial--convert
$ glog()
> {
- > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
+ > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
> }
show graph log
--- a/tests/test-debugbuilddag.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-debugbuilddag.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,5 +1,3 @@
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
plain
@@ -60,7 +58,7 @@
$ hg id
000000000000
glog
- $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
+ $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
o 11: r11 [] @ 11.00
|
o 10: r10 [] @ 10.00
@@ -106,7 +104,7 @@
$ hg id
000000000000
glog
- $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
+ $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
o 11: r11 [] @ 11.00
|
o 10: r10 [] @ 10.00
@@ -132,7 +130,7 @@
o 0: r0 [start] @ 0.00
glog of
- $ hg glog --template '{rev}: {desc} [{branches}]\n' of
+ $ hg log -G --template '{rev}: {desc} [{branches}]\n' of
o 11: r11 []
|
o 10: r10 []
@@ -182,7 +180,7 @@
$ hg id
000000000000
glog
- $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
+ $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
o 11: r11 [] @ 11.00
|
o 10: r10 [] @ 10.00
@@ -208,7 +206,7 @@
o 0: r0 [] @ 0.00
glog mf
- $ hg glog --template '{rev}: {desc} [{branches}]\n' mf
+ $ hg log -G --template '{rev}: {desc} [{branches}]\n' mf
o 11: r11 []
|
o 10: r10 []
--- a/tests/test-getbundle.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-getbundle.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,17 +2,12 @@
= Test the getbundle() protocol function =
-Enable graphlog extension:
-
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
-
Create a test repository:
$ hg init repo
$ cd repo
$ hg debugbuilddag -n -m '+2 :fork +5 :p1 *fork +6 :p2 /p1 :m1 +3' > /dev/null
- $ hg glog --template '{node}\n'
+ $ hg log -G --template '{node}\n'
o 10c14a2cc935e1d8c31f9e98587dcf27fb08a6da
|
o 4801a72e5d88cb515b0c7e40fae34180f3f837f2
--- a/tests/test-glog.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-glog.t Fri Nov 22 19:14:17 2013 +0100
@@ -102,7 +102,6 @@
> EOF
$ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
$ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
$ hg init repo
@@ -110,7 +109,7 @@
Empty repo:
- $ hg glog
+ $ hg log -G
Building DAG:
@@ -152,7 +151,7 @@
$ commit 34 "head" 32
- $ hg glog -q
+ $ hg log -G -q
@ 34:fea3ac5810e0
|
| o 33:68608f5145f9
@@ -224,7 +223,7 @@
o 0:e6eb3150255d
- $ hg glog
+ $ hg log -G
@ changeset: 34:fea3ac5810e0
| tag: tip
| parent: 32:d06dffa21a31
@@ -461,7 +460,7 @@
File glog:
- $ hg glog a
+ $ hg log -G a
@ changeset: 34:fea3ac5810e0
| tag: tip
| parent: 32:d06dffa21a31
@@ -699,7 +698,7 @@
File glog per revset:
- $ hg glog -r 'file("a")'
+ $ hg log -G -r 'file("a")'
@ changeset: 34:fea3ac5810e0
| tag: tip
| parent: 32:d06dffa21a31
@@ -1131,14 +1130,14 @@
Empty revision range - display nothing:
- $ hg glog -r 1..0
+ $ hg log -G -r 1..0
$ cd ..
#if no-outer-repo
From outer space:
- $ hg glog -l1 repo
+ $ hg log -G -l1 repo
@ changeset: 34:fea3ac5810e0
| tag: tip
| parent: 32:d06dffa21a31
@@ -1146,7 +1145,7 @@
| date: Thu Jan 01 00:00:34 1970 +0000
| summary: (34) head
|
- $ hg glog -l1 repo/a
+ $ hg log -G -l1 repo/a
@ changeset: 34:fea3ac5810e0
| tag: tip
| parent: 32:d06dffa21a31
@@ -1154,7 +1153,7 @@
| date: Thu Jan 01 00:00:34 1970 +0000
| summary: (34) head
|
- $ hg glog -l1 repo/missing
+ $ hg log -G -l1 repo/missing
#endif
@@ -1169,7 +1168,7 @@
$ hg commit -mtwo
$ echo more >two
$ hg commit -mmore
- $ hg glog two
+ $ hg log -G two
@ changeset: 2:12c28321755b
| tag: tip
| user: test
@@ -1183,14 +1182,14 @@
|
Issue1896: File log with explicit style
- $ hg glog --style=default one
+ $ hg log -G --style=default one
o changeset: 0:3d578b4a1f53
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: one
Issue2395: glog --style header and footer
- $ hg glog --style=xml one
+ $ hg log -G --style=xml one
<?xml version="1.0"?>
<log>
o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
@@ -1276,7 +1275,7 @@
$ cd repo
$ touch b
$ hg ci -Aqm0
- $ hg glog -l2 a
+ $ hg log -G -l2 a
o changeset: 34:fea3ac5810e0
| parent: 32:d06dffa21a31
| user: test
@@ -1291,7 +1290,7 @@
| |
File + limit + -ra:b, (b - a) < limit:
- $ hg glog -l3000 -r32:tip a
+ $ hg log -G -l3000 -r32:tip a
o changeset: 34:fea3ac5810e0
| parent: 32:d06dffa21a31
| user: test
@@ -1314,7 +1313,7 @@
Point out a common and an uncommon unshown parent
- $ hg glog -r 'rev(8) or rev(9)'
+ $ hg log -G -r 'rev(8) or rev(9)'
o changeset: 9:7010c0af0a35
|\ parent: 7:b632bb1b1224
| | parent: 8:7a0b11f71937
@@ -1332,7 +1331,7 @@
File + limit + -ra:b, b < tip:
- $ hg glog -l1 -r32:34 a
+ $ hg log -G -l1 -r32:34 a
o changeset: 34:fea3ac5810e0
| parent: 32:d06dffa21a31
| user: test
@@ -1342,7 +1341,7 @@
file(File) + limit + -ra:b, b < tip:
- $ hg glog -l1 -r32:34 -r 'file("a")'
+ $ hg log -G -l1 -r32:34 -r 'file("a")'
o changeset: 34:fea3ac5810e0
| parent: 32:d06dffa21a31
| user: test
@@ -1352,7 +1351,7 @@
limit(file(File) and a::b), b < tip:
- $ hg glog -r 'limit(file("a") and 32::34, 1)'
+ $ hg log -G -r 'limit(file("a") and 32::34, 1)'
o changeset: 32:d06dffa21a31
|\ parent: 27:886ed638191b
| | parent: 31:621d83e11f67
@@ -1363,11 +1362,11 @@
File + limit + -ra:b, b < tip:
- $ hg glog -r 'limit(file("a") and 34::32, 1)'
+ $ hg log -G -r 'limit(file("a") and 34::32, 1)'
File + limit + -ra:b, b < tip, (b - a) < limit:
- $ hg glog -l10 -r33:34 a
+ $ hg log -G -l10 -r33:34 a
o changeset: 34:fea3ac5810e0
| parent: 32:d06dffa21a31
| user: test
@@ -1387,7 +1386,7 @@
marked working directory as branch branch
(branches are permanent and global, did you want a bookmark?)
$ commit 36 "buggy merge: identical parents" 35 35
- $ hg glog -l5
+ $ hg log -G -l5
@ changeset: 36:08a19a744424
| branch: branch
| tag: tip
@@ -1561,7 +1560,7 @@
$ hg ci -m "mv a b; add d"
$ hg mv dir/b e
$ hg ci -m "mv dir/b e"
- $ hg glog --template '({rev}) {desc|firstline}\n'
+ $ hg log -G --template '({rev}) {desc|firstline}\n'
@ (4) mv dir/b e
|
o (3) mv a b; add d
@@ -2058,7 +2057,7 @@
$ testlog --hidden
[]
[]
- $ hg glog --template '{rev} {desc}\n'
+ $ hg log -G --template '{rev} {desc}\n'
o 7 Added tag foo-bar for changeset fc281d8ff18d
|
o 6 merge 5 and 4
@@ -2078,7 +2077,7 @@
A template without trailing newline should do something sane
- $ hg glog -r ::2 --template '{rev} {desc}'
+ $ hg log -G -r ::2 --template '{rev} {desc}'
o 2 mv b dir/b
|
o 1 copy a b
@@ -2088,7 +2087,7 @@
Extra newlines must be preserved
- $ hg glog -r ::2 --template '\n{rev} {desc}\n\n'
+ $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
o
| 2 mv b dir/b
|
@@ -2101,7 +2100,7 @@
The almost-empty template should do something sane too ...
- $ hg glog -r ::2 --template '\n'
+ $ hg log -G -r ::2 --template '\n'
o
|
o
@@ -2111,12 +2110,12 @@
issue3772
- $ hg glog -r :null
+ $ hg log -G -r :null
o changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
- $ hg glog -r null:null
+ $ hg log -G -r null:null
o changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-graft.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-graft.t Fri Nov 22 19:14:17 2013 +0100
@@ -25,7 +25,7 @@
$ hg phase --public 3
$ hg phase --force --secret 6
- $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
+ $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
@ test@6.secret: 6
|\
| o test@5.draft: 5
@@ -249,7 +249,7 @@
View graph:
- $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
+ $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
@ test@11.draft: 3
|
o test@10.draft: 4
--- a/tests/test-histedit-bookmark-motion.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-bookmark-motion.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-commute.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-commute.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-drop.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-drop.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-edit.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-edit.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-fold-non-commute.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-fold-non-commute.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-fold.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-fold.t Fri Nov 22 19:14:17 2013 +0100
@@ -14,7 +14,6 @@
> [alias]
> logt = log --template '{rev}:{node|short} {desc|firstline}\n'
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-no-change.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-no-change.t Fri Nov 22 19:14:17 2013 +0100
@@ -5,7 +5,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
@@ -64,7 +63,7 @@
> {
> comment="${1:-log}"
> echo % "${comment}"
- > hg glog --template '{rev} {node} \"{desc|firstline}\"\n'
+ > hg log -G --template '{rev} {node} \"{desc|firstline}\"\n'
> }
--- a/tests/test-histedit-non-commute-abort.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-non-commute-abort.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-non-commute.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-non-commute.t Fri Nov 22 19:14:17 2013 +0100
@@ -2,7 +2,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-histedit-outgoing.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-histedit-outgoing.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> histedit=
> EOF
--- a/tests/test-import-bypass.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-import-bypass.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,9 +1,8 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "purge=" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
$ shortlog() {
- > hg glog --template '{rev}:{node|short} {author} {date|hgdate} - {branch} - {desc|firstline}\n'
+ > hg log -G --template '{rev}:{node|short} {author} {date|hgdate} - {branch} - {desc|firstline}\n'
> }
Test --bypass with other options
--- a/tests/test-lfconvert.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-lfconvert.t Fri Nov 22 19:14:17 2013 +0100
@@ -4,7 +4,6 @@
> [extensions]
> largefiles =
> share =
- > graphlog =
> strip =
> convert =
> [largefiles]
@@ -134,7 +133,7 @@
$ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
$ hg resolve -m stuff/maybelarge.dat
$ hg commit -m"merge"
- $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
@ 5:4884f215abda merge
|\
| o 4:7285f817b77e remove large, normal3
@@ -154,7 +153,7 @@
$ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
initializing destination largefiles-repo
$ cd largefiles-repo
- $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 5:8e05f5f2b77e merge
|\
| o 4:a5a02de7a8e4 remove large, normal3
@@ -248,7 +247,7 @@
# "hg remove" + "hg merge" + "hg commit".
# $ hg -R ../bigfile-repo debugdata -c 5
# $ hg debugdata -c 5
- $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 6:1635824e6f59 add anotherlarge (should be a largefile)
|
o 5:7215f8deeaaf merge
@@ -292,7 +291,7 @@
1 merge
0 add anotherlarge (should be a largefile)
- $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 6:17126745edfd add anotherlarge (should be a largefile)
|
o 5:9cc5aa7204f0 merge
--- a/tests/test-mq-qpush-exact.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-mq-qpush-exact.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
make a test repository that looks like this:
--- a/tests/test-mq-safety.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-mq-safety.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ echo '[extensions]' >> $HGRCPATH
$ echo 'hgext.mq =' >> $HGRCPATH
- $ echo 'hgext.graphlog =' >> $HGRCPATH
$ hg init repo
$ cd repo
--- a/tests/test-obsolete-checkheads.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-obsolete-checkheads.t Fri Nov 22 19:14:17 2013 +0100
@@ -10,9 +10,8 @@
> [ui]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n'
> [extensions]
- > graphlog=
+ > obs=${TESTTMP}/obs.py
> EOF
- $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
@@ -52,7 +51,7 @@
$ mkcommit new
created new head
$ hg debugobsolete --flags 1 `getid old` `getid new`
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
| x c70b08862e08 (draft) add old
@@ -84,7 +83,7 @@
pulling from $TESTTMP/remote (glob)
searching for changes
no changes found
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
| o c70b08862e08 (public) add old
@@ -112,7 +111,7 @@
# $ cp -r ../backup1 ../remote
# $ hg -R ../remote phase --public c70b08862e08
# $ hg phase --draft --force c70b08862e08
-# $ hg glog --hidden
+# $ hg log -G --hidden
# @ 71e3228bffe1 (draft) add new
# |
# | x c70b08862e08 (draft) add old
@@ -141,7 +140,7 @@
$ hg up -q '.^'
$ mkcommit other
created new head
- $ hg glog --hidden
+ $ hg log -G --hidden
@ d7d41ccbd4de (draft) add other
|
| o 71e3228bffe1 (draft) add new
@@ -193,7 +192,7 @@
$ mkcommit desc2
created new head
$ hg debugobsolete `getid old` `getid new`
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 5fe37041cc2b (draft) add desc2
|
| o a3ef1d111c5f (draft) add desc1
@@ -204,7 +203,7 @@
|/
o b4952fcf48cf (public) add base
- $ hg glog --hidden -R ../remote
+ $ hg log -G --hidden -R ../remote
o 71e3228bffe1 (draft) add new
|
| o c70b08862e08 (draft) add old
@@ -248,12 +247,12 @@
$ hg id --debug -r tip
71e3228bffe1886550777233d6c97bb5a6b2a650 tip
$ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
o b4952fcf48cf (public) add base
- $ hg glog --hidden -R ../remote
+ $ hg log -G --hidden -R ../remote
o c70b08862e08 (draft) add old
|
@ b4952fcf48cf (public) add base
--- a/tests/test-obsolete.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-obsolete.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,4 @@
$ cat >> $HGRCPATH << EOF
- > [extensions]
- > graphlog=
> [phases]
> # public changeset are not obsolete
> publish=false
@@ -120,7 +118,7 @@
Check that graphlog detect that a changeset is obsolete:
- $ hg glog
+ $ hg log -G
@ changeset: 5:5601fb93a350
| tag: tip
| parent: 1:7c3bad9141dc
@@ -217,7 +215,7 @@
Check that public changeset are not accounted as obsolete:
$ hg --hidden phase --public 2
- $ hg --config 'extensions.graphlog=' glog
+ $ hg log -G
@ changeset: 5:5601fb93a350
| tag: tip
| parent: 1:7c3bad9141dc
@@ -514,7 +512,7 @@
---------------------------------------
- $ hg glog
+ $ hg log -G
o changeset: 3:6f9641995072
| tag: tip
| parent: 1:7c3bad9141dc
@@ -548,7 +546,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: add original_d
- $ hg glog -r '::unstable()'
+ $ hg log -G -r '::unstable()'
@ changeset: 5:cda648ca50f5
| tag: tip
| user: test
@@ -653,7 +651,7 @@
Do not warn about new head when the new head is a successors of a remote one
- $ hg glog
+ $ hg log -G
@ changeset: 5:cda648ca50f5
| tag: tip
| user: test
--- a/tests/test-patchbomb.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-patchbomb.t Fri Nov 22 19:14:17 2013 +0100
@@ -2127,7 +2127,7 @@
$ hg ci -md -d '4 0'
$ echo d >> d
$ hg ci -mdd -d '5 0'
- $ hg --config extensions.graphlog= glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
@ 10:3b6f1ec9dde9 dd
|
o 9:2f9fa9b998c5 d
--- a/tests/test-phases-exchange.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-phases-exchange.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,9 +1,5 @@
$ "$TESTDIR/hghave" killdaemons || exit 80
- $ cat >> $HGRCPATH <<EOF
- > [extensions]
- > graphlog=
- > EOF
$ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
$ mkcommit() {
@@ -399,7 +395,7 @@
initial setup
- $ hg glog # of alpha
+ $ hg log -G # of alpha
o changeset: 6:145e75495359
| tag: tip
| user: test
--- a/tests/test-phases.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-phases.t Fri Nov 22 19:14:17 2013 +0100
@@ -378,10 +378,6 @@
initial picture
- $ cat >> $HGRCPATH << EOF
- > [extensions]
- > hgext.graphlog=
- > EOF
$ hg log -G --template "{rev} {phase} {desc}\n"
@ 7 secret merge B' and E
|\
--- a/tests/test-push-warn.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-push-warn.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,3 @@
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
-
$ hg init a
$ cd a
$ echo foo > t1
@@ -532,7 +529,7 @@
glog of local:
- $ hg glog --template "{rev}: {branches} {desc}\n"
+ $ hg log -G --template "{rev}: {branches} {desc}\n"
@ 2: A a2
|
| o 1: B b
@@ -541,7 +538,7 @@
glog of remote:
- $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
+ $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
@ 2: B b1
|
o 1: B b
@@ -615,7 +612,7 @@
glog of local:
- $ hg glog --template "{rev}: {branches} {desc}\n"
+ $ hg log -G --template "{rev}: {branches} {desc}\n"
@ 3: A a2
|
o 2: A a1
@@ -626,7 +623,7 @@
glog of remote:
- $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
+ $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
@ 3: B b1
|
| o 2: A a1
@@ -700,7 +697,7 @@
glog of local:
- $ hg glog --template "{rev}: {branches} {desc}\n"
+ $ hg log -G --template "{rev}: {branches} {desc}\n"
@ 5: A b3
|
| o 4: B a3
@@ -715,7 +712,7 @@
glog of remote:
- $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
+ $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
@ 3: B b1
|
o 2: B b0
--- a/tests/test-rebase-abort.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-abort.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-bookmarks.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-bookmarks.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-cache.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-cache.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
> mq=
>
--- a/tests/test-rebase-check-restore.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-check-restore.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-collapse.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-collapse.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
> mq=
>
--- a/tests/test-rebase-conflicts.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-conflicts.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-detach.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-detach.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-interruptions.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-interruptions.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-issue-noparam-single-rev.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-issue-noparam-single-rev.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-mq-skip.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-mq-skip.t Fri Nov 22 19:14:17 2013 +0100
@@ -3,7 +3,6 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
> mq=
>
--- a/tests/test-rebase-mq.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-mq.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
> mq=
>
--- a/tests/test-rebase-named-branches.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-named-branches.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-newancestor.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-newancestor.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [alias]
--- a/tests/test-rebase-parameters.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-parameters.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-rebase-pull.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-pull.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [alias]
--- a/tests/test-rebase-rename.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-rename.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [alias]
--- a/tests/test-rebase-scenario-global.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-rebase-scenario-global.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > graphlog=
> rebase=
>
> [phases]
--- a/tests/test-revset-outgoing.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-revset-outgoing.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,7 +1,4 @@
$ cat >> $HGRCPATH <<EOF
- > [extensions]
- > graphlog=
- >
> [alias]
> tlog = log --template "{rev}:{node|short}: '{desc}' {branches}\n"
> tglog = tlog -G
--- a/tests/test-strip-cross.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-strip-cross.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,7 +1,7 @@
test stripping of filelogs where the linkrev doesn't always increase
$ echo '[extensions]' >> $HGRCPATH
- $ echo 'hgext.strip =' >> $HGRCPATH
+ $ echo 'strip =' >> $HGRCPATH
$ hg init orig
$ cd orig
$ commit()
--- a/tests/test-strip.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-strip.t Fri Nov 22 19:14:17 2013 +0100
@@ -1,6 +1,5 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "strip=" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
$ restore() {
> hg unbundle -q .hg/strip-backup/*
@@ -226,7 +225,7 @@
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg glog
+ $ hg log -G
@ changeset: 4:264128213d29
| tag: tip
| parent: 1:ef3a871183d7
@@ -259,7 +258,7 @@
$ hg strip "roots(2)" 3
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
- $ hg glog
+ $ hg log -G
@ changeset: 2:264128213d29
| tag: tip
| user: test
@@ -277,7 +276,7 @@
summary: a
$ restore
- $ hg glog
+ $ hg log -G
o changeset: 4:443431ffac4f
| tag: tip
| user: test
@@ -311,7 +310,7 @@
$ hg strip 2 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
- $ hg glog
+ $ hg log -G
o changeset: 2:65bd5f99a4a3
| tag: tip
| user: test
--- a/tests/test-treediscovery-legacy.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-treediscovery-legacy.t Fri Nov 22 19:14:17 2013 +0100
@@ -5,8 +5,6 @@
$ cat >> $HGRCPATH <<EOF
> [ui]
> logtemplate="{rev} {node|short}: {desc} {branches}\n"
- > [extensions]
- > graphlog=
> EOF
$ cp $HGRCPATH $HGRCPATH-withcap
@@ -66,7 +64,7 @@
$ hg init main
$ cd main
$ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
- $ hg glog
+ $ hg log -G
o 11 a19bfa7e7328: r11 both
|
o 10 8b6bad1512e1: r10 both
--- a/tests/test-treediscovery.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-treediscovery.t Fri Nov 22 19:14:17 2013 +0100
@@ -7,8 +7,6 @@
$ cat >> $HGRCPATH <<EOF
> [ui]
> logtemplate="{rev} {node|short}: {desc} {branches}\n"
- > [extensions]
- > graphlog=
> EOF
Setup HTTP server control:
@@ -53,7 +51,7 @@
$ hg init main
$ cd main
$ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
- $ hg glog
+ $ hg log -G
o 11 a19bfa7e7328: r11 both
|
o 10 8b6bad1512e1: r10 both
--- a/tests/test-update-branches.t Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-update-branches.t Fri Nov 22 19:14:17 2013 +0100
@@ -34,8 +34,7 @@
Initial repo state:
- $ hg --config 'extensions.graphlog=' \
- > glog --template '{rev}:{node|short} {parents} {branches}\n'
+ $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n'
@ 5:ff252e8273df b1
|
o 4:d047485b3896 0:60829823a42a b1