##// END OF EJS Templates
py3: use b'' for changegroup version literals...
Gregory Szorc -
r36131:83246d69 default
parent child Browse files
Show More
@@ -1,142 +1,142 b''
1 # coding=UTF-8
1 # coding=UTF-8
2
2
3 from __future__ import absolute_import
3 from __future__ import absolute_import
4
4
5 import base64
5 import base64
6 import zlib
6 import zlib
7
7
8 from mercurial import (
8 from mercurial import (
9 changegroup,
9 changegroup,
10 exchange,
10 exchange,
11 extensions,
11 extensions,
12 filelog,
12 filelog,
13 revlog,
13 revlog,
14 util,
14 util,
15 )
15 )
16
16
17 # Test only: These flags are defined here only in the context of testing the
17 # Test only: These flags are defined here only in the context of testing the
18 # behavior of the flag processor. The canonical way to add flags is to get in
18 # behavior of the flag processor. The canonical way to add flags is to get in
19 # touch with the community and make them known in revlog.
19 # touch with the community and make them known in revlog.
20 REVIDX_NOOP = (1 << 3)
20 REVIDX_NOOP = (1 << 3)
21 REVIDX_BASE64 = (1 << 2)
21 REVIDX_BASE64 = (1 << 2)
22 REVIDX_GZIP = (1 << 1)
22 REVIDX_GZIP = (1 << 1)
23 REVIDX_FAIL = 1
23 REVIDX_FAIL = 1
24
24
25 def validatehash(self, text):
25 def validatehash(self, text):
26 return True
26 return True
27
27
28 def bypass(self, text):
28 def bypass(self, text):
29 return False
29 return False
30
30
31 def noopdonothing(self, text):
31 def noopdonothing(self, text):
32 return (text, True)
32 return (text, True)
33
33
34 def b64encode(self, text):
34 def b64encode(self, text):
35 return (base64.b64encode(text), False)
35 return (base64.b64encode(text), False)
36
36
37 def b64decode(self, text):
37 def b64decode(self, text):
38 return (base64.b64decode(text), True)
38 return (base64.b64decode(text), True)
39
39
40 def gzipcompress(self, text):
40 def gzipcompress(self, text):
41 return (zlib.compress(text), False)
41 return (zlib.compress(text), False)
42
42
43 def gzipdecompress(self, text):
43 def gzipdecompress(self, text):
44 return (zlib.decompress(text), True)
44 return (zlib.decompress(text), True)
45
45
46 def supportedoutgoingversions(orig, repo):
46 def supportedoutgoingversions(orig, repo):
47 versions = orig(repo)
47 versions = orig(repo)
48 versions.discard('01')
48 versions.discard(b'01')
49 versions.discard('02')
49 versions.discard(b'02')
50 versions.add('03')
50 versions.add(b'03')
51 return versions
51 return versions
52
52
53 def allsupportedversions(orig, ui):
53 def allsupportedversions(orig, ui):
54 versions = orig(ui)
54 versions = orig(ui)
55 versions.add('03')
55 versions.add(b'03')
56 return versions
56 return versions
57
57
58 def noopaddrevision(orig, self, text, transaction, link, p1, p2,
58 def noopaddrevision(orig, self, text, transaction, link, p1, p2,
59 cachedelta=None, node=None,
59 cachedelta=None, node=None,
60 flags=revlog.REVIDX_DEFAULT_FLAGS):
60 flags=revlog.REVIDX_DEFAULT_FLAGS):
61 if b'[NOOP]' in text:
61 if b'[NOOP]' in text:
62 flags |= REVIDX_NOOP
62 flags |= REVIDX_NOOP
63 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
63 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
64 node=node, flags=flags)
64 node=node, flags=flags)
65
65
66 def b64addrevision(orig, self, text, transaction, link, p1, p2,
66 def b64addrevision(orig, self, text, transaction, link, p1, p2,
67 cachedelta=None, node=None,
67 cachedelta=None, node=None,
68 flags=revlog.REVIDX_DEFAULT_FLAGS):
68 flags=revlog.REVIDX_DEFAULT_FLAGS):
69 if b'[BASE64]' in text:
69 if b'[BASE64]' in text:
70 flags |= REVIDX_BASE64
70 flags |= REVIDX_BASE64
71 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
71 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
72 node=node, flags=flags)
72 node=node, flags=flags)
73
73
74 def gzipaddrevision(orig, self, text, transaction, link, p1, p2,
74 def gzipaddrevision(orig, self, text, transaction, link, p1, p2,
75 cachedelta=None, node=None,
75 cachedelta=None, node=None,
76 flags=revlog.REVIDX_DEFAULT_FLAGS):
76 flags=revlog.REVIDX_DEFAULT_FLAGS):
77 if b'[GZIP]' in text:
77 if b'[GZIP]' in text:
78 flags |= REVIDX_GZIP
78 flags |= REVIDX_GZIP
79 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
79 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
80 node=node, flags=flags)
80 node=node, flags=flags)
81
81
82 def failaddrevision(orig, self, text, transaction, link, p1, p2,
82 def failaddrevision(orig, self, text, transaction, link, p1, p2,
83 cachedelta=None, node=None,
83 cachedelta=None, node=None,
84 flags=revlog.REVIDX_DEFAULT_FLAGS):
84 flags=revlog.REVIDX_DEFAULT_FLAGS):
85 # This addrevision wrapper is meant to add a flag we will not have
85 # This addrevision wrapper is meant to add a flag we will not have
86 # transforms registered for, ensuring we handle this error case.
86 # transforms registered for, ensuring we handle this error case.
87 if b'[FAIL]' in text:
87 if b'[FAIL]' in text:
88 flags |= REVIDX_FAIL
88 flags |= REVIDX_FAIL
89 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
89 return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
90 node=node, flags=flags)
90 node=node, flags=flags)
91
91
92 def extsetup(ui):
92 def extsetup(ui):
93 # Enable changegroup3 for flags to be sent over the wire
93 # Enable changegroup3 for flags to be sent over the wire
94 wrapfunction = extensions.wrapfunction
94 wrapfunction = extensions.wrapfunction
95 wrapfunction(changegroup,
95 wrapfunction(changegroup,
96 'supportedoutgoingversions',
96 'supportedoutgoingversions',
97 supportedoutgoingversions)
97 supportedoutgoingversions)
98 wrapfunction(changegroup,
98 wrapfunction(changegroup,
99 'allsupportedversions',
99 'allsupportedversions',
100 allsupportedversions)
100 allsupportedversions)
101
101
102 # Teach revlog about our test flags
102 # Teach revlog about our test flags
103 flags = [REVIDX_NOOP, REVIDX_BASE64, REVIDX_GZIP, REVIDX_FAIL]
103 flags = [REVIDX_NOOP, REVIDX_BASE64, REVIDX_GZIP, REVIDX_FAIL]
104 revlog.REVIDX_KNOWN_FLAGS |= util.bitsfrom(flags)
104 revlog.REVIDX_KNOWN_FLAGS |= util.bitsfrom(flags)
105 revlog.REVIDX_FLAGS_ORDER.extend(flags)
105 revlog.REVIDX_FLAGS_ORDER.extend(flags)
106
106
107 # Teach exchange to use changegroup 3
107 # Teach exchange to use changegroup 3
108 for k in exchange._bundlespeccgversions.keys():
108 for k in exchange._bundlespeccgversions.keys():
109 exchange._bundlespeccgversions[k] = '03'
109 exchange._bundlespeccgversions[k] = b'03'
110
110
111 # Add wrappers for addrevision, responsible to set flags depending on the
111 # Add wrappers for addrevision, responsible to set flags depending on the
112 # revision data contents.
112 # revision data contents.
113 wrapfunction(filelog.filelog, 'addrevision', noopaddrevision)
113 wrapfunction(filelog.filelog, 'addrevision', noopaddrevision)
114 wrapfunction(filelog.filelog, 'addrevision', b64addrevision)
114 wrapfunction(filelog.filelog, 'addrevision', b64addrevision)
115 wrapfunction(filelog.filelog, 'addrevision', gzipaddrevision)
115 wrapfunction(filelog.filelog, 'addrevision', gzipaddrevision)
116 wrapfunction(filelog.filelog, 'addrevision', failaddrevision)
116 wrapfunction(filelog.filelog, 'addrevision', failaddrevision)
117
117
118 # Register flag processors for each extension
118 # Register flag processors for each extension
119 revlog.addflagprocessor(
119 revlog.addflagprocessor(
120 REVIDX_NOOP,
120 REVIDX_NOOP,
121 (
121 (
122 noopdonothing,
122 noopdonothing,
123 noopdonothing,
123 noopdonothing,
124 validatehash,
124 validatehash,
125 )
125 )
126 )
126 )
127 revlog.addflagprocessor(
127 revlog.addflagprocessor(
128 REVIDX_BASE64,
128 REVIDX_BASE64,
129 (
129 (
130 b64decode,
130 b64decode,
131 b64encode,
131 b64encode,
132 bypass,
132 bypass,
133 ),
133 ),
134 )
134 )
135 revlog.addflagprocessor(
135 revlog.addflagprocessor(
136 REVIDX_GZIP,
136 REVIDX_GZIP,
137 (
137 (
138 gzipdecompress,
138 gzipdecompress,
139 gzipcompress,
139 gzipcompress,
140 bypass
140 bypass
141 )
141 )
142 )
142 )
General Comments 0
You need to be logged in to leave comments. Login now