Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Alexis S. L. Carvalho
- Sun, 04 Mar 2007 12:03:21
Show More
hgext/mq.py
0
+4
-1
@@
-1738,7
+1738,10
b' def guard(ui, repo, *args, **opts):'
1738
1738
if patch is None :
1739
1739
raise util . Abort ( _ ( 'no patch to work with' ))
1740
1740
if args or opts [ 'none' ]:
1741
q.set_guards(q . find_series ( patch ), args)
1741
idx = q . find_series ( patch )
1742
if idx is None :
1743
raise util . Abort ( _ ( 'no patch named %s ' ) % patch )
1744
q . set_guards ( idx , args )
1742
1745
q . save_dirty ()
1743
1746
else :
1744
1747
status ( q . series . index ( q . lookup ( patch )))
mercurial/bdiff.c
0
+2
-2
@@
-255,8
+255,8
b' static struct hunklist diff(struct line '
255
255
if ( pos && l . base && t ) {
256
256
/* generate the matching block list */
257
257
recurse ( a , b , pos , 0 , an , 0 , bn , & l );
258
l . head -> a1 = an ;
259
l . head -> b1 = bn ;
258
l . head -> a1 = l . head -> a2 = an ;
259
l . head -> b1 = l . head -> b2 = bn ;
260
260
l . head ++ ;
261
261
}
262
262
mercurial/hgweb/server.py
0
+5
0
@@
-197,6
+197,11
b' def create_server(ui, repo):'
197
197
pass
198
198
199
199
class MercurialHTTPServer ( object , _mixin , BaseHTTPServer . HTTPServer ):
200
201
# SO_REUSEADDR has broken semantics on windows
202
if os . name == 'nt' :
203
allow_reuse_address = 0
204
200
205
def __init__ ( self , * args , ** kargs ):
201
206
BaseHTTPServer . HTTPServer . __init__ ( self , * args , ** kargs )
202
207
self . accesslog = accesslog
mercurial/httprepo.py
0
+8
-1
@@
-126,6
+126,7
b' class httprepository(remoterepository):'
126
126
def __init__ ( self , ui , path ):
127
127
self . path = path
128
128
self . caps = None
129
self . handler = None
129
130
scheme , netloc , urlpath , query , frag = urlparse . urlsplit ( path )
130
131
if query or frag :
131
132
raise util . Abort ( _ ( 'unsupported URL component: " %s "' ) %
@@
-140,7
+141,8
b' class httprepository(remoterepository):'
140
141
141
142
proxyurl = ui . config ( "http_proxy" , "host" ) or os . getenv ( 'http_proxy' )
142
143
# XXX proxyauthinfo = None
143
handlers = [httphandler ()]
144
self . handler = httphandler ()
145
handlers = [ self . handler ]
144
146
145
147
if proxyurl :
146
148
# proxy can be proper url or host[:port]
@@
-198,6
+200,11
b' class httprepository(remoterepository):'
198
200
# 1.0 here is the _protocol_ version
199
201
opener . addheaders = [( 'User-agent' , 'mercurial/proto-1.0' )]
200
202
urllib2 . install_opener ( opener )
203
204
def __del__ ( self ):
205
if self . handler :
206
self . handler . close_all ()
207
self . handler = None
201
208
202
209
def url ( self ):
203
210
return self . path
mercurial/localrepo.py
0
+2
0
@@
-1880,6
+1880,8
b' class localrepository(repo.repository):'
1880
1880
ofp . write ( chunk )
1881
1881
ofp . close ()
1882
1882
elapsed = time . time () - start
1883
if elapsed <= 0 :
1884
elapsed = 0.001
1883
1885
self . ui . status ( _ ( 'transferred %s in %.1f seconds ( %s /sec) \n ' ) %
1884
1886
( util . bytecount ( total_bytes ), elapsed ,
1885
1887
util . bytecount ( total_bytes / elapsed )))
mercurial/streamclone.py
0
+1
-1
@@
-78,7
+78,7
b' def stream_out(repo, fileobj):'
78
78
entries = []
79
79
total_bytes = 0
80
80
for name , size in walkrepo ( repo . spath ):
81
name = util . pconvert (repo.decodefn( name ))
81
name = repo . decodefn ( util . pconvert ( name ))
82
82
entries . append (( name , size ))
83
83
total_bytes += size
84
84
repolock . release ()
mercurial/util.py
0
+8
0
@@
-790,6
+790,14
b" if os.name == 'nt':"
790
790
if inst . errno != 0 : raise
791
791
self . close ()
792
792
raise IOError ( errno . EPIPE , 'Broken pipe' )
793
794
def flush ( self ):
795
try :
796
return self . fp . flush ()
797
except IOError , inst :
798
if inst . errno != errno . EINVAL : raise
799
self . close ()
800
raise IOError ( errno . EPIPE , 'Broken pipe' )
793
801
794
802
sys . stdout = winstdout ( sys . stdout )
795
803
tests/test-http
0
+2
0
@@
-6,6
+6,8
b' echo foo>foo'
6
6
hg commit -A -d '0 0' -m 1
7
7
hg --config server.uncompressed=True serve -p 20059 -d --pid-file=../hg1.pid
8
8
hg serve -p 20060 -d --pid-file=../hg2.pid
9
# Test server address cannot be reused
10
hg serve -p 20060 2>&1 | sed -e 's/abort: cannot start server:.*/abort: cannot start server:/'
9
11
cd ..
10
12
cat hg1.pid hg2.pid >> $DAEMON_PIDS
11
13
tests/test-http.out
0
+1
0
@@
-1,4
+1,5
b''
1
1
adding foo
2
abort: cannot start server:
2
3
% clone via stream
3
4
streaming all changes
4
5
XXX files to transfer, XXX bytes of data
tests/test-mq-guards
0
+3
0
@@
-27,6
+27,9
b' hg qrefresh'
27
27
hg qpop -a
28
28
29
29
echo % should fail
30
hg qguard does-not-exist.patch +bleh
31
32
echo % should fail
30
33
hg qguard +fail
31
34
32
35
hg qpush
tests/test-mq-guards.out
0
+2
0
@@
-1,6
+1,8
b''
1
1
adding x
2
2
Patch queue now empty
3
3
% should fail
4
abort: no patch named does-not-exist.patch
5
% should fail
4
6
abort: no patches applied
5
7
applying a.patch
6
8
Now at: a.patch
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages