diff tests/test-rebase-detach.t @ 35385:469b06b4c3ca

tests: add commit hashes to log commands in rebase tests Commit hashes are a useful way to ensure the content of commits made in the tests are not changing, even if we don't query every aspect of every commit. (And some properties, like extras, are rarely printed at all.) Many of the rebase log -G calls didn't show hashes; by adding hashes to places that weren't showing them we can help protect those tests from unwanted changes. Differential Revision: https://phab.mercurial-scm.org/D1650
author Phil Cohen <phillco@fb.com>
date Sun, 10 Dec 2017 21:57:37 -0800
parents d4df141f90d1
children 4441705b7111
line wrap: on
line diff
--- a/tests/test-rebase-detach.t	Sun Dec 10 22:39:46 2017 -0800
+++ b/tests/test-rebase-detach.t	Sun Dec 10 21:57:37 2017 -0800
@@ -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
@@ -65,15 +65,15 @@
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob)
 
   $ hg tglog
-  o  4: 'E'
+  o  4: ee79e0744528 'E'
   |
-  o  3: 'D'
+  o  3: 10530e1d72d9 'D'
   |
-  | o  2: 'C'
+  | o  2: dc0947a82db8 'C'
   | |
-  o |  1: 'B'
+  o |  1: 112478962961 'B'
   |/
-  o  0: 'A'
+  o  0: 426bada5c675 'A'
   
   $ hg manifest --rev tip
   A
@@ -102,13 +102,13 @@
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob)
 
   $ hg tglog
-  o  3: 'D'
+  o  3: 7375f3dbfb0f 'D'
   |
-  o  2: 'C'
+  o  2: bbfdd6cb49aa 'C'
   |
-  o  1: 'B'
+  o  1: 112478962961 'B'
   |
-  o  0: 'A'
+  o  0: 426bada5c675 'A'
   
   $ hg manifest --rev tip
   A
@@ -179,30 +179,30 @@
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob)
 
   $ hg tglog
-  o  4: 'E'
+  o  4: e3d0c70d606d 'E'
   |
-  o  3: 'D'
+  o  3: e9153d36a1af 'D'
   |
-  o  2: 'C'
+  o  2: a7ac28b870a8 'C'
   |
-  o  1: 'B'
+  o  1: fc2b737bb2e5 'B'
   
-  o  0: 'A'
+  o  0: 426bada5c675 'A'
   
   $ hg rebase -d 1 -s 3
   rebasing 3:e9153d36a1af "D"
   rebasing 4:e3d0c70d606d "E" (tip)
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob)
   $ hg tglog
-  o  4: 'E'
+  o  4: 2c24e540eccd 'E'
   |
-  o  3: 'D'
+  o  3: 73f786ed52ff 'D'
   |
-  | o  2: 'C'
+  | o  2: a7ac28b870a8 'C'
   |/
-  o  1: 'B'
+  o  1: fc2b737bb2e5 'B'
   
-  o  0: 'A'
+  o  0: 426bada5c675 'A'
   
   $ cd ..
 
@@ -231,21 +231,21 @@
   $ echo "J" >> F
   $ hg ci -m "J"
   $ hg tglog
-  @  7: 'J'
+  @  7: c6aaf0d259c0 'J'
   |
-  o    6: 'Merge'
+  o    6: 0cfbc7e8faaf 'Merge'
   |\
-  | o  5: 'I'
+  | o  5: b92d164ad3cb 'I'
   | |
-  o |  4: 'H'
+  o |  4: 4ea5b230dea3 'H'
   | |
-  | o  3: 'G'
+  | o  3: c6001eacfde5 'G'
   |/|
-  o |  2: 'F'
+  o |  2: 8908a377a434 'F'
   | |
-  | o  1: 'E'
+  | o  1: 7fb047a69f22 'E'
   |/
-  o  0: 'A'
+  o  0: 426bada5c675 'A'
   
   $ hg rebase -s I -d H --collapse --config ui.merge=internal:other
   rebasing 5:b92d164ad3cb "I" (I)
@@ -254,19 +254,19 @@
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob)
 
   $ hg tglog
-  @  5: 'Collapsed revision
+  @  5: 65079693dac4 'Collapsed revision
   |  * I
   |  * Merge
   |  * J'
-  o  4: 'H'
+  o  4: 4ea5b230dea3 'H'
   |
-  | o  3: 'G'
+  | o  3: c6001eacfde5 'G'
   |/|
-  o |  2: 'F'
+  o |  2: 8908a377a434 'F'
   | |
-  | o  1: 'E'
+  | o  1: 7fb047a69f22 'E'
   |/
-  o  0: 'A'
+  o  0: 426bada5c675 'A'
   
 
   $ hg log --rev tip