Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: check filtered output with folded changesets
authorBoris Feld <boris.feld@octobus.net>
Fri, 25 May 2018 17:17:56 +0200
changeset 3897 83e8803e1cf1
parent 3896 7b782e419df7
child 3902 9c4847b93d3c
obslog: check filtered output with folded changesets
tests/test-evolve-obshistory-fold.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve-obshistory-fold.t	Fri May 25 16:50:04 2018 +0200
+++ b/tests/test-evolve-obshistory-fold.t	Fri May 25 17:17:56 2018 +0200
@@ -13,9 +13,11 @@
 ----------
 
   $ hg init $TESTTMP/local-fold
+  $ hg init $TESTTMP/server
   $ cd $TESTTMP/local-fold
   $ mkcommit ROOT
   $ mkcommit A0
+  $ sync
   $ mkcommit B0
   $ hg log --hidden -G
   @  changeset:   2:0dec01379d3b
@@ -62,8 +64,10 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
- Actual test
- -----------
+
+  $ sync
+Check output of the client
+--------------------------
 
 Check that debugobshistory on the first folded revision show only
 the revision with the target
@@ -240,3 +244,92 @@
   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
+
+Check output of the server
+--------------------------
+
+  $ hg obslog -R $TESTTMP/server --patch tip --all
+  o    eb5a0daa2192 (2) C0
+  |\
+  x |  0dec01379d3b
+   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, context is not local)
+  |
+  x  471f378eab4c (1) A0
+       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+         diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+         --- a/changeset-description
+         +++ b/changeset-description
+         @@ -1,1 +1,1 @@
+         -A0
+         +C0
+  
+         diff -r 471f378eab4c -r eb5a0daa2192 B0
+         --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+         +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
+         @@ -0,0 +1,1 @@
+         +B0
+  
+  
+  $ hg obslog -R $TESTTMP/server -f --all --patch tip
+  o  eb5a0daa2192 (2) C0
+  |
+  x  471f378eab4c (1) A0
+       rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
+         diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+         --- a/changeset-description
+         +++ b/changeset-description
+         @@ -1,1 +1,1 @@
+         -A0
+         +C0
+  
+         diff -r 471f378eab4c -r eb5a0daa2192 B0
+         --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+         +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
+         @@ -0,0 +1,1 @@
+         +B0
+  
+  
+
+  $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
+  o    eb5a0daa2192 (2) C0
+  |\
+  x |  0dec01379d3b
+   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, context is not local)
+  |
+  x  471f378eab4c (1) A0
+       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+         diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+         --- a/changeset-description
+         +++ b/changeset-description
+         @@ -1,1 +1,1 @@
+         -A0
+         +C0
+  
+         diff -r 471f378eab4c -r eb5a0daa2192 B0
+         --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+         +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
+         @@ -0,0 +1,1 @@
+         +B0
+  
+  
+  $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --hidden
+  o  eb5a0daa2192 (2) C0
+  |
+  x  471f378eab4c (1) A0
+       rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
+         diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+         --- a/changeset-description
+         +++ b/changeset-description
+         @@ -1,1 +1,1 @@
+         -A0
+         +C0
+  
+         diff -r 471f378eab4c -r eb5a0daa2192 B0
+         --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+         +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
+         @@ -0,0 +1,1 @@
+         +B0
+  
+
evolve