Mercurial > hg
comparison tests/test-pull-update.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 | 23ed47a895d5 |
| children | eb9835014d20 |
comparison
equal
deleted
inserted
replaced
| 35392:5feb782c7a95 | 35393:4441705b7111 |
|---|---|
| 98 $ hg bookmark -f active-before-pull | 98 $ hg bookmark -f active-before-pull |
| 99 $ hg bookmarks | 99 $ hg bookmarks |
| 100 * active-before-pull 3:483b76ad4309 | 100 * active-before-pull 3:483b76ad4309 |
| 101 | 101 |
| 102 $ hg pull -u -r active-after-pull | 102 $ hg pull -u -r active-after-pull |
| 103 pulling from $TESTTMP/t (glob) | 103 pulling from $TESTTMP/t |
| 104 searching for changes | 104 searching for changes |
| 105 adding changesets | 105 adding changesets |
| 106 adding manifests | 106 adding manifests |
| 107 adding file changes | 107 adding file changes |
| 108 added 1 changesets with 1 changes to 1 files | 108 added 1 changesets with 1 changes to 1 files |
| 127 $ hg bookmark -f active-before-pull | 127 $ hg bookmark -f active-before-pull |
| 128 $ hg bookmarks | 128 $ hg bookmarks |
| 129 * active-before-pull 3:483b76ad4309 | 129 * active-before-pull 3:483b76ad4309 |
| 130 | 130 |
| 131 $ hg pull -u $TESTTMP/t#active-after-pull | 131 $ hg pull -u $TESTTMP/t#active-after-pull |
| 132 pulling from $TESTTMP/t (glob) | 132 pulling from $TESTTMP/t |
| 133 searching for changes | 133 searching for changes |
| 134 adding changesets | 134 adding changesets |
| 135 adding manifests | 135 adding manifests |
| 136 adding file changes | 136 adding file changes |
| 137 added 1 changesets with 1 changes to 1 files | 137 added 1 changesets with 1 changes to 1 files |
| 166 $ hg bookmark -f active-before-pull | 166 $ hg bookmark -f active-before-pull |
| 167 $ hg bookmarks | 167 $ hg bookmarks |
| 168 * active-before-pull 3:483b76ad4309 | 168 * active-before-pull 3:483b76ad4309 |
| 169 | 169 |
| 170 $ hg pull -u -r b5e4babfaaa7 | 170 $ hg pull -u -r b5e4babfaaa7 |
| 171 pulling from $TESTTMP/t (glob) | 171 pulling from $TESTTMP/t |
| 172 searching for changes | 172 searching for changes |
| 173 adding changesets | 173 adding changesets |
| 174 adding manifests | 174 adding manifests |
| 175 adding file changes | 175 adding file changes |
| 176 added 2 changesets with 1 changes to 1 files | 176 added 2 changesets with 1 changes to 1 files |
| 193 $ hg bookmark -f active-before-pull | 193 $ hg bookmark -f active-before-pull |
| 194 $ hg bookmarks | 194 $ hg bookmarks |
| 195 * active-before-pull 3:483b76ad4309 | 195 * active-before-pull 3:483b76ad4309 |
| 196 | 196 |
| 197 $ hg pull -u -b bar | 197 $ hg pull -u -b bar |
| 198 pulling from $TESTTMP/t (glob) | 198 pulling from $TESTTMP/t |
| 199 searching for changes | 199 searching for changes |
| 200 adding changesets | 200 adding changesets |
| 201 adding manifests | 201 adding manifests |
| 202 adding file changes | 202 adding file changes |
| 203 added 2 changesets with 1 changes to 1 files | 203 added 2 changesets with 1 changes to 1 files |
| 220 $ hg bookmark -f active-before-pull | 220 $ hg bookmark -f active-before-pull |
| 221 $ hg bookmarks | 221 $ hg bookmarks |
| 222 * active-before-pull 3:483b76ad4309 | 222 * active-before-pull 3:483b76ad4309 |
| 223 | 223 |
| 224 $ hg pull -u $TESTTMP/t#bar | 224 $ hg pull -u $TESTTMP/t#bar |
| 225 pulling from $TESTTMP/t (glob) | 225 pulling from $TESTTMP/t |
| 226 searching for changes | 226 searching for changes |
| 227 adding changesets | 227 adding changesets |
| 228 adding manifests | 228 adding manifests |
| 229 adding file changes | 229 adding file changes |
| 230 added 2 changesets with 1 changes to 1 files | 230 added 2 changesets with 1 changes to 1 files |