comparison tests/test-convert-svn-move.t @ 23048:ee5f834077be stable

merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents c63a09b6b337
children cd34bf29987e
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be
1 1 #require svn svn-bindings
2 $ "$TESTDIR/hghave" svn svn-bindings || exit 80
3 2
4 $ cat >> $HGRCPATH <<EOF 3 $ cat >> $HGRCPATH <<EOF
5 > [extensions] 4 > [extensions]
6 > convert = 5 > convert =
7 > EOF 6 > EOF
8 7
9 $ svnadmin create svn-repo 8 $ svnadmin create svn-repo
10 $ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump" 9 $ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"
11 $ SVNREPOPATH=`pwd`/svn-repo 10 $ SVNREPOPATH=`pwd`/svn-repo
12 #if windows 11 #if windows
13 $ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` 12 $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
14 #else 13 #else
15 $ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` 14 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
16 #endif 15 #endif
17 16
18 Convert trunk and branches 17 Convert trunk and branches
19 18
20 $ hg convert --datesort "$SVNREPOURL"/subproject A-hg 19 $ hg convert --datesort "$SVNREPOURL"/subproject A-hg
148 Try updating 147 Try updating
149 148
150 $ hg up -qC default 149 $ hg up -qC default
151 $ cd .. 150 $ cd ..
152 151
153 Test convert progress bar' 152 Test convert progress bar
154 153
155 $ cat >> $HGRCPATH <<EOF 154 $ cat >> $HGRCPATH <<EOF
156 > [extensions] 155 > [extensions]
157 > progress = 156 > progress =
158 > [progress] 157 > [progress]
164 > width = 60 163 > width = 60
165 > EOF 164 > EOF
166 165
167 $ hg convert svn-repo hg-progress 166 $ hg convert svn-repo hg-progress
168 \r (no-eol) (esc) 167 \r (no-eol) (esc)
169 scanning [ <=> ] 1\r (no-eol) (esc) 168 scanning [=====> ] 1/7\r (no-eol) (esc)
170 scanning [ <=> ] 2\r (no-eol) (esc) 169 scanning [===========> ] 2/7\r (no-eol) (esc)
171 scanning [ <=> ] 3\r (no-eol) (esc) 170 scanning [=================> ] 3/7\r (no-eol) (esc)
172 scanning [ <=> ] 4\r (no-eol) (esc) 171 scanning [========================> ] 4/7\r (no-eol) (esc)
173 scanning [ <=> ] 5\r (no-eol) (esc) 172 scanning [==============================> ] 5/7\r (no-eol) (esc)
174 scanning [ <=> ] 6\r (no-eol) (esc) 173 scanning [====================================> ] 6/7\r (no-eol) (esc)
175 scanning [ <=> ] 7\r (no-eol) (esc) 174 scanning [===========================================>] 7/7\r (no-eol) (esc)
176 \r (no-eol) (esc) 175 \r (no-eol) (esc)
177 \r (no-eol) (esc) 176 \r (no-eol) (esc)
178 converting [ ] 0/7\r (no-eol) (esc) 177 converting [ ] 0/7\r (no-eol) (esc)
179 getting files [=====> ] 1/6\r (no-eol) (esc) 178 getting files [=====> ] 1/6\r (no-eol) (esc)
180 getting files [============> ] 2/6\r (no-eol) (esc) 179 getting files [============> ] 2/6\r (no-eol) (esc)