diff tests/test-obsolete-checkheads.t @ 35393:4441705b7111

tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 10 Dec 2017 22:50:57 -0500
parents 1644623ab096
children eb9835014d20
line wrap: on
line diff
--- a/tests/test-obsolete-checkheads.t	Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsolete-checkheads.t	Sun Dec 10 22:50:57 2017 -0500
@@ -37,7 +37,7 @@
 
   $ mkcommit old
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -61,7 +61,7 @@
 Push should not warn about creating new head
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -77,7 +77,7 @@
   $ cp -R ../backup1 ../remote
   $ hg -R ../remote phase --public c70b08862e08
   $ hg pull -v
-  pulling from $TESTTMP/remote (glob)
+  pulling from $TESTTMP/remote
   searching for changes
   no changes found
   $ hg log -G --hidden
@@ -91,7 +91,7 @@
 Abort: old will still be an head because it's public.
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   abort: push creates new remote head 71e3228bffe1!
   (merge or see 'hg help push' for details about pushing new heads)
@@ -151,7 +151,7 @@
 Push should abort on new head
 
   $ hg push -r 'desc("other")'
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   abort: push creates new remote head d7d41ccbd4de!
   (merge or see 'hg help push' for details about pushing new heads)
@@ -178,7 +178,7 @@
   $ mkcommit new
   created new head
   $ hg push -f
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -214,7 +214,7 @@
 one anyway.
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -260,7 +260,7 @@
 We do not have enought data to take the right decision, we should fail
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   remote has heads on branch 'default' that are not known locally: c70b08862e08
   abort: push creates new remote head 71e3228bffe1!
@@ -270,7 +270,7 @@
 Pulling the missing data makes it work
 
   $ hg pull
-  pulling from $TESTTMP/remote (glob)
+  pulling from $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -278,7 +278,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads)
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -309,7 +309,7 @@
   
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   abort: push creates new remote head 350a93b716be!
   (merge or see 'hg help push' for details about pushing new heads)