D1651: tests: change log templates to include hashes

phillco (Phil Cohen) phabricator at mercurial-scm.org
Mon Dec 11 00:58:54 EST 2017


phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1651

AFFECTED FILES
  tests/test-mq-header-date.t
  tests/test-mq-header-from.t
  tests/test-mq-pull-from-bundle.t
  tests/test-rebase-base-flag.t
  tests/test-rebase-bookmarks.t
  tests/test-rebase-collapse.t
  tests/test-rebase-dest.t
  tests/test-rebase-detach.t
  tests/test-rebase-interruptions.t
  tests/test-rebase-issue-noparam-single-rev.t
  tests/test-rebase-mq-skip.t
  tests/test-rebase-mq.t
  tests/test-rebase-named-branches.t
  tests/test-rebase-newancestor.t
  tests/test-rebase-parameters.t
  tests/test-rebase-partial.t
  tests/test-rebase-pull.t
  tests/test-rebase-rename.t
  tests/test-rebase-scenario-global.t

CHANGE DETAILS

diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -7,7 +7,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-rename.t b/tests/test-rebase-rename.t
--- a/tests/test-rebase-rename.t
+++ b/tests/test-rebase-rename.t
@@ -3,7 +3,7 @@
   > rebase=
   > 
   > [alias]
-  > tlog  = log  --template "{rev}: '{desc}' {branches}\n"
+  > tlog  = log --template "{rev}: {node|short} '{desc}' {branches}\n"
   > tglog = tlog --graph
   > EOF
 
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -4,7 +4,7 @@
   > histedit=
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t
--- a/tests/test-rebase-partial.t
+++ b/tests/test-rebase-partial.t
@@ -11,7 +11,7 @@
   > evolution.allowunstable=True
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: {desc}"
+  > tglog = log -G --template "{rev}: {node|short} {desc}"
   > EOF
 
   $ rebasewithdag() {
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -6,7 +6,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -5,7 +5,7 @@
   > rebase=
   > drawdag=$TESTDIR/drawdag.py
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
   > EOF
 
   $ hg init repo
diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t
--- a/tests/test-rebase-named-branches.t
+++ b/tests/test-rebase-named-branches.t
@@ -6,7 +6,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
   > EOF
 
   $ hg init a
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -7,7 +7,7 @@
   > plain=true
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -12,7 +12,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-issue-noparam-single-rev.t b/tests/test-rebase-issue-noparam-single-rev.t
--- a/tests/test-rebase-issue-noparam-single-rev.t
+++ b/tests/test-rebase-issue-noparam-single-rev.t
@@ -6,7 +6,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -6,8 +6,8 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
-  > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
+  > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
   > EOF
 
 
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -3,7 +3,7 @@
   > rebase=
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}'\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}'\n"
   > 
   > [extensions]
   > drawdag=$TESTDIR/drawdag.py
diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -111,7 +111,7 @@
   > [phases]
   > publish=False
   > [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]
   > maprevset=$TESTTMP/maprevset.py
   > [experimental]
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -7,8 +7,8 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
-  > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
+  > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
   > EOF
 
 Create repo a:
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -7,7 +7,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
   > EOF
 
 Create a repo with several bookmarks
diff --git a/tests/test-rebase-base-flag.t b/tests/test-rebase-base-flag.t
--- a/tests/test-rebase-base-flag.t
+++ b/tests/test-rebase-base-flag.t
@@ -10,7 +10,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: {desc}"
+  > tglog = log -G --template "{rev}: {node|short} {desc}"
   > EOF
 
   $ rebasewithdag() {
diff --git a/tests/test-mq-pull-from-bundle.t b/tests/test-mq-pull-from-bundle.t
--- a/tests/test-mq-pull-from-bundle.t
+++ b/tests/test-mq-pull-from-bundle.t
@@ -2,7 +2,7 @@
   > [extensions]
   > mq=
   > [alias]
-  > tlog = log --template "{rev}: {desc}\\n"
+  > tlog = log --template "{rev}: {node|short} {desc}\\n"
   > theads = heads --template "{rev}: {desc}\\n"
   > tincoming = incoming --template "{rev}: {desc}\\n"
   > EOF
diff --git a/tests/test-mq-header-from.t b/tests/test-mq-header-from.t
--- a/tests/test-mq-header-from.t
+++ b/tests/test-mq-header-from.t
@@ -6,7 +6,7 @@
   $ catlog() {
   >     cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
   >                                    -e "s/^\(# Parent \).*/\1/"
-  >     hg log --template "{rev}: {desc} - {author}\n"
+  >     hg log --template "{rev}: {node|short} {desc} - {author}\n"
   > }
   $ runtest() {
   >     echo ==== init
@@ -122,7 +122,7 @@
   >     echo ==== "qpop -a / qpush -a"
   >     hg qpop -a
   >     hg qpush -a
-  >     hg log --template "{rev}: {desc} - {author}\n"
+  >     hg log --template "{rev}: {node|short} {desc} - {author}\n"
   > }
 
 ======= plain headers
diff --git a/tests/test-mq-header-date.t b/tests/test-mq-header-date.t
--- a/tests/test-mq-header-date.t
+++ b/tests/test-mq-header-date.t
@@ -11,11 +11,11 @@
   > }
   $ catlog() {
   >     catpatch $1
-  >     hg log --template "{rev}: {desc} - {author}\n"
+  >     hg log --template "{rev}: {node|short} {desc} - {author}\n"
   > }
   $ catlogd() {
   >     catpatch $1
-  >     hg log --template "{rev}: {desc} - {author} - {date}\n"
+  >     hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
   > }
   $ drop() {
   >     hg qpop
@@ -189,7 +189,7 @@
   >     echo ==== "qpop -a / qpush -a"
   >     hg qpop -a
   >     hg qpush -a
-  >     hg log --template "{rev}: {desc} - {author} - {date}\n"
+  >     hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
   > }
 
 ======= plain headers



To: phillco, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list