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