comparison tests/test-fetch.t @ 12643:d08bb64888bc

tests: reintroduce ":$HGPORT" in test output This reduces the number of patterns that must be adjusted when writing tests.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 08 Oct 2010 22:36:11 -0500
parents 975ec4ce961c
children b885f28fa4fa
comparison
equal deleted inserted replaced
12642:bb35840e965c 12643:d08bb64888bc
70 $ cat a/hg.pid >> "$DAEMON_PIDS" 70 $ cat a/hg.pid >> "$DAEMON_PIDS"
71 71
72 fetch over http, no auth 72 fetch over http, no auth
73 73
74 $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ 74 $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/
75 pulling from http://localhost:*/ (glob) 75 pulling from http://localhost:$HGPORT/
76 searching for changes 76 searching for changes
77 adding changesets 77 adding changesets
78 adding manifests 78 adding manifests
79 adding file changes 79 adding file changes
80 added 1 changesets with 1 changes to 1 files (+1 heads) 80 added 1 changesets with 1 changes to 1 files (+1 heads)
82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
83 merging with 1:5e056962225c 83 merging with 1:5e056962225c
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
85 new changeset 3:* merges remote changes with local (glob) 85 new changeset 3:* merges remote changes with local (glob)
86 $ hg --cwd d tip --template '{desc}\n' 86 $ hg --cwd d tip --template '{desc}\n'
87 Automated merge with http://localhost:*/ (glob) 87 Automated merge with http://localhost:$HGPORT/
88 88
89 fetch over http with auth (should be hidden in desc) 89 fetch over http with auth (should be hidden in desc)
90 90
91 $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ 91 $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
92 pulling from http://user:***@localhost:*/ (glob) 92 pulling from http://user:***@localhost:$HGPORT/
93 searching for changes 93 searching for changes
94 adding changesets 94 adding changesets
95 adding manifests 95 adding manifests
96 adding file changes 96 adding file changes
97 added 1 changesets with 1 changes to 1 files (+1 heads) 97 added 1 changesets with 1 changes to 1 files (+1 heads)
99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
100 merging with 1:5e056962225c 100 merging with 1:5e056962225c
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
102 new changeset 3:* merges remote changes with local (glob) 102 new changeset 3:* merges remote changes with local (glob)
103 $ hg --cwd e tip --template '{desc}\n' 103 $ hg --cwd e tip --template '{desc}\n'
104 Automated merge with http://localhost:*/ (glob) 104 Automated merge with http://localhost:$HGPORT/
105 $ hg clone a f 105 $ hg clone a f
106 updating to branch default 106 updating to branch default
107 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 107 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
108 $ hg clone a g 108 $ hg clone a g
109 updating to branch default 109 updating to branch default