Re: [PATCH 1 of 2] tests: check obsolete changeset with two obsfate entries

2018-02-20 Thread Yuya Nishihara
On Mon, 19 Feb 2018 14:02:39 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov 
> # Date 1519014623 -28800
> #  Mon Feb 19 12:30:23 2018 +0800
> # Node ID 29f9eeec6782d2815cf742d22286b0192fc3c14a
> # Parent  b76b0297c3738e8f114202c50cb6f804425f0853
> tests: check obsolete changeset with two obsfate entries

Queued, thanks.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


[PATCH 1 of 2] tests: check obsolete changeset with two obsfate entries

2018-02-18 Thread Anton Shestakov
# HG changeset patch
# User Anton Shestakov 
# Date 1519014623 -28800
#  Mon Feb 19 12:30:23 2018 +0800
# Node ID 29f9eeec6782d2815cf742d22286b0192fc3c14a
# Parent  b76b0297c3738e8f114202c50cb6f804425f0853
tests: check obsolete changeset with two obsfate entries

It's more interesting to see how a changeset that was both rewritten and split
looks in hgweb.

diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t
+++ b/tests/test-obsolete-divergent.t
@@ -621,6 +621,29 @@ fix the divergence
   a139f71be9da
   $ hg log -r 'contentdivergent()'
 
+#if serve
+
+  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \
+  >   -A access.log -E errors.log
+  $ cat hg.pid >> $DAEMON_PIDS
+
+check an obsolete changeset that was rewritten and also split
+
+  $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | 
egrep 'rewritten|split'
+   rewritten as bed64f5d2f5a  
by  Thu, 01 Jan 1970 00:00:00 
+split as 7ae126973a96 
14608b260df8  by 
 Thu, 01 Jan 1970 00:00:00 
+
+  $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | 
egrep 'rewritten|split'
+   rewritten as bed64f5d2f5a  
by  Thu, 01 Jan 1970 00:00:00 
+split as 7ae126973a96 14608b260df8  by 
 Thu, 01 Jan 1970 00:00:00 
+
+  $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | 
egrep 'rewritten|split'
+  obsoleterewritten as bed64f5d2f5a  by 
 Thu, 01 Jan 1970 00:00:00 
+split as 7ae126973a96 14608b260df8  by 
 Thu, 01 Jan 1970 00:00:00 
+
+  $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | 
egrep 'rewritten|split'
+  obsoleterewritten as bed64f5d2f5a  by 
 Thu, 01 Jan 1970 00:00:00 
+split as 7ae126973a96 14608b260df8  by 
 Thu, 01 Jan 1970 00:00:00 
+
+  $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | 
egrep 'rewritten|split'
+   rewritten as bed64f5d2f5a  by 
 Thu, 01 Jan 1970 00:00:00 
+split as 7ae126973a96 
14608b260df8  by 
 Thu, 01 Jan 1970 00:00:00 
+
+
+  $ killdaemons.py
+
+#endif
+
   $ cd ..
 
 
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -1052,18 +1052,6 @@ check obsolete changeset
 obsolete:
 pruned by  Thu, 01 Jan 1970 00:00:00 +
 
-check an obsolete changeset that has been rewritten
-  $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=paper' | 
grep rewritten
-   rewritten as 3de5eca88c00  
by 

 Thu, 01 Jan 1970 00:00:00 +
-  $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=coal' | grep 
rewritten
-   rewritten as 3de5eca88c00  
by 

 Thu, 01 Jan 1970 00:00:00 +
-  $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=gitweb' | 
grep rewritten
-  obsoleterewritten as 3de5eca88c00  by 

 Thu, 01 Jan 1970 00:00:00 +
-  $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=monoblue' | 
grep rewritten
-  obsoleterewritten as 3de5eca88c00  by 

 Thu, 01 Jan 1970 00:00:00 +
-  $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=spartan' | 
grep rewritten
-   rewritten as 3de5eca88c00  by 

 Thu, 01 Jan 1970 00:00:00 +
-
 check changeset with instabilities
 
   $ get-with-headers.py localhost:$HGPORT 
'log?rev=first(phasedivergent())=paper' | grep ''
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel