Show More
@@ -2680,7 +2680,7 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
2680 | except error.WdirUnsupported: |
|
2680 | except error.WdirUnsupported: | |
2681 | return ctx[fn].isbinary() |
|
2681 | return ctx[fn].isbinary() | |
2682 |
|
2682 | |||
2683 |
fieldnamemap = {'filename': 'path', 'linenumber': 'line |
|
2683 | fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'} | |
2684 | if diff: |
|
2684 | if diff: | |
2685 | iter = difflinestates(pstates, states) |
|
2685 | iter = difflinestates(pstates, states) | |
2686 | else: |
|
2686 | else: |
@@ -64,7 +64,7 b' simple JSON (no "change" field)' | |||||
64 | [ |
|
64 | [ | |
65 | { |
|
65 | { | |
66 | "date": [4, 0], |
|
66 | "date": [4, 0], | |
67 |
"line |
|
67 | "lineno": 1, | |
68 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
|
68 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", | |
69 | "path": "port", |
|
69 | "path": "port", | |
70 | "rev": 4, |
|
70 | "rev": 4, | |
@@ -73,7 +73,7 b' simple JSON (no "change" field)' | |||||
73 | }, |
|
73 | }, | |
74 | { |
|
74 | { | |
75 | "date": [4, 0], |
|
75 | "date": [4, 0], | |
76 |
"line |
|
76 | "lineno": 2, | |
77 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
|
77 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", | |
78 | "path": "port", |
|
78 | "path": "port", | |
79 | "rev": 4, |
|
79 | "rev": 4, | |
@@ -82,7 +82,7 b' simple JSON (no "change" field)' | |||||
82 | }, |
|
82 | }, | |
83 | { |
|
83 | { | |
84 | "date": [4, 0], |
|
84 | "date": [4, 0], | |
85 |
"line |
|
85 | "lineno": 3, | |
86 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
|
86 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", | |
87 | "path": "port", |
|
87 | "path": "port", | |
88 | "rev": 4, |
|
88 | "rev": 4, | |
@@ -97,7 +97,7 b' simple JSON without matching lines' | |||||
97 | [ |
|
97 | [ | |
98 | { |
|
98 | { | |
99 | "date": [4, 0], |
|
99 | "date": [4, 0], | |
100 |
"line |
|
100 | "lineno": 1, | |
101 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
|
101 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", | |
102 | "path": "port", |
|
102 | "path": "port", | |
103 | "rev": 4, |
|
103 | "rev": 4, | |
@@ -125,7 +125,7 b' all JSON' | |||||
125 | { |
|
125 | { | |
126 | "change": "-", |
|
126 | "change": "-", | |
127 | "date": [4, 0], |
|
127 | "date": [4, 0], | |
128 |
"line |
|
128 | "lineno": 4, | |
129 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
|
129 | "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", | |
130 | "path": "port", |
|
130 | "path": "port", | |
131 | "rev": 4, |
|
131 | "rev": 4, | |
@@ -135,7 +135,7 b' all JSON' | |||||
135 | { |
|
135 | { | |
136 | "change": "+", |
|
136 | "change": "+", | |
137 | "date": [3, 0], |
|
137 | "date": [3, 0], | |
138 |
"line |
|
138 | "lineno": 4, | |
139 | "node": "95040cfd017d658c536071c6290230a613c4c2a6", |
|
139 | "node": "95040cfd017d658c536071c6290230a613c4c2a6", | |
140 | "path": "port", |
|
140 | "path": "port", | |
141 | "rev": 3, |
|
141 | "rev": 3, | |
@@ -145,7 +145,7 b' all JSON' | |||||
145 | { |
|
145 | { | |
146 | "change": "-", |
|
146 | "change": "-", | |
147 | "date": [2, 0], |
|
147 | "date": [2, 0], | |
148 |
"line |
|
148 | "lineno": 1, | |
149 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
|
149 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", | |
150 | "path": "port", |
|
150 | "path": "port", | |
151 | "rev": 2, |
|
151 | "rev": 2, | |
@@ -155,7 +155,7 b' all JSON' | |||||
155 | { |
|
155 | { | |
156 | "change": "-", |
|
156 | "change": "-", | |
157 | "date": [2, 0], |
|
157 | "date": [2, 0], | |
158 |
"line |
|
158 | "lineno": 2, | |
159 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
|
159 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", | |
160 | "path": "port", |
|
160 | "path": "port", | |
161 | "rev": 2, |
|
161 | "rev": 2, | |
@@ -165,7 +165,7 b' all JSON' | |||||
165 | { |
|
165 | { | |
166 | "change": "+", |
|
166 | "change": "+", | |
167 | "date": [2, 0], |
|
167 | "date": [2, 0], | |
168 |
"line |
|
168 | "lineno": 1, | |
169 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
|
169 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", | |
170 | "path": "port", |
|
170 | "path": "port", | |
171 | "rev": 2, |
|
171 | "rev": 2, | |
@@ -175,7 +175,7 b' all JSON' | |||||
175 | { |
|
175 | { | |
176 | "change": "+", |
|
176 | "change": "+", | |
177 | "date": [2, 0], |
|
177 | "date": [2, 0], | |
178 |
"line |
|
178 | "lineno": 2, | |
179 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
|
179 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", | |
180 | "path": "port", |
|
180 | "path": "port", | |
181 | "rev": 2, |
|
181 | "rev": 2, | |
@@ -185,7 +185,7 b' all JSON' | |||||
185 | { |
|
185 | { | |
186 | "change": "+", |
|
186 | "change": "+", | |
187 | "date": [2, 0], |
|
187 | "date": [2, 0], | |
188 |
"line |
|
188 | "lineno": 3, | |
189 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
|
189 | "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", | |
190 | "path": "port", |
|
190 | "path": "port", | |
191 | "rev": 2, |
|
191 | "rev": 2, | |
@@ -195,7 +195,7 b' all JSON' | |||||
195 | { |
|
195 | { | |
196 | "change": "+", |
|
196 | "change": "+", | |
197 | "date": [1, 0], |
|
197 | "date": [1, 0], | |
198 |
"line |
|
198 | "lineno": 2, | |
199 | "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587", |
|
199 | "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587", | |
200 | "path": "port", |
|
200 | "path": "port", | |
201 | "rev": 1, |
|
201 | "rev": 1, | |
@@ -205,7 +205,7 b' all JSON' | |||||
205 | { |
|
205 | { | |
206 | "change": "+", |
|
206 | "change": "+", | |
207 | "date": [0, 0], |
|
207 | "date": [0, 0], | |
208 |
"line |
|
208 | "lineno": 1, | |
209 | "node": "f31323c9217050ba245ee8b537c713ec2e8ab226", |
|
209 | "node": "f31323c9217050ba245ee8b537c713ec2e8ab226", | |
210 | "path": "port", |
|
210 | "path": "port", | |
211 | "rev": 0, |
|
211 | "rev": 0, | |
@@ -481,7 +481,7 b' but it should be available in template d' | |||||
481 | [ |
|
481 | [ | |
482 | { |
|
482 | { | |
483 | "date": [0, 0], |
|
483 | "date": [0, 0], | |
484 |
"line |
|
484 | "lineno": 1, | |
485 | "node": "ffffffffffffffffffffffffffffffffffffffff", |
|
485 | "node": "ffffffffffffffffffffffffffffffffffffffff", | |
486 | "path": "file2", |
|
486 | "path": "file2", | |
487 | "rev": 2147483647, |
|
487 | "rev": 2147483647, |
General Comments 0
You need to be logged in to leave comments.
Login now