Patchwork [7,of,8] eol: tweak test-eol-clone.t with better descriptions and logging

login
register
mail settings
Submitter Mads Kiilerich
Date Oct. 14, 2019, 12:13 a.m.
Message ID <68dde01bb05c782d484d.1571012021@xps>
Download mbox | patch
Permalink /patch/42308/
State Accepted
Headers show

Comments

Mads Kiilerich - Oct. 14, 2019, 12:13 a.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1571010144 -7200
#      Mon Oct 14 01:42:24 2019 +0200
# Node ID 68dde01bb05c782d484d96e424512b89e0673bec
# Parent  950c89a71e9837dc81da80ed34eee9b602a808d9
eol: tweak test-eol-clone.t with better descriptions and logging

Expose impact of changes coming next ...

Patch

diff --git a/tests/test-eol-clone.t b/tests/test-eol-clone.t
--- a/tests/test-eol-clone.t
+++ b/tests/test-eol-clone.t
@@ -21,7 +21,9 @@  setup repository
   adding .hgeol
   adding a.txt
 
-Clone
+Test commit of removed .hgeol - currently it seems to live on as zombie
+(causing "filtering a.txt through tolf") after being removed ... but actually
+it is just confusing use of tip revision.
 
   $ cd ..
   $ hg clone repo repo-2
@@ -37,14 +39,46 @@  Clone
   second
   third
   $ hg remove .hgeol
+  $ touch a.txt *  # ensure consistent st dirtyness checks, ignoring dirstate timing
+  $ hg st -v --debug
+  filtering a.txt through tolf
+  R .hgeol
   $ hg commit -m 'remove eol'
+  $ hg exp
+  # HG changeset patch
+  # User test
+  # Date 0 0
+  #      Thu Jan 01 00:00:00 1970 +0000
+  # Node ID c60b96c20c7de8c821127b548c34e5b170bcf9fe
+  # Parent  90f94e2cf4e24628afddd641688dfe4cd476d6e4
+  remove eol
+  
+  diff -r 90f94e2cf4e2 -r c60b96c20c7d .hgeol
+  --- a/.hgeol	Thu Jan 01 00:00:00 1970 +0000
+  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  @@ -1,2 +0,0 @@
+  -[patterns]
+  -**.txt = native
   $ hg push --quiet
   $ cd ..
 
-Test clone of repo with .hgeol in working dir, but no .hgeol in tip
+Test clone of repo with .hgeol in working dir, but no .hgeol in default
+checkout revision tip. The repo is correctly updated to be consistent and have
+the exact content checked out without filtering, ignoring the current .hgeol in
+the source repo:
 
-  $ hg clone repo repo-3
+  $ cat repo/.hgeol
+  [patterns]
+  **.txt = native
+  $ hg clone repo repo-3 -v --debug
+  linked 7 files
   updating to branch default
+  resolving manifests
+   branchmerge: False, force: False, partial: False
+   ancestor: 000000000000, local: 000000000000+, remote: c60b96c20c7d
+  calling hook preupdate.eol: hgext.eol.preupdate
+   a.txt: remote created -> g
+  getting a.txt
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo-3