Show More
@@ -3420,11 +3420,6 b' def log(ui, repo, *pats, **opts):' | |||
|
3420 | 3420 | |
|
3421 | 3421 | repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') |
|
3422 | 3422 | revs, differ = logcmdutil.getrevs(repo, pats, opts) |
|
3423 | ||
|
3424 | if opts.get('graph'): | |
|
3425 | if linerange: | |
|
3426 | raise error.Abort(_('graph not supported with line range patterns')) | |
|
3427 | ||
|
3428 | 3423 | if linerange: |
|
3429 | 3424 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
|
3430 | 3425 |
@@ -173,8 +173,76 b' Add some changes with two diff hunks' | |||
|
173 | 173 | +4 |
|
174 | 174 | |
|
175 | 175 | $ hg log -f --graph -L foo,5:7 -p |
|
176 | abort: graph not supported with line range patterns | |
|
177 | [255] | |
|
176 | @ changeset: 5:cfdf972b3971 | |
|
177 | | tag: tip | |
|
178 | | user: test | |
|
179 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
180 | | summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | |
|
181 | | | |
|
182 | | diff --git a/foo b/foo | |
|
183 | | --- a/foo | |
|
184 | | +++ b/foo | |
|
185 | | @@ -4,7 +4,7 @@ | |
|
186 | | 0 | |
|
187 | | 1 | |
|
188 | | 2+ | |
|
189 | | -3 | |
|
190 | | +3+ | |
|
191 | | 4 | |
|
192 | | 5 | |
|
193 | | 6 | |
|
194 | | | |
|
195 | o changeset: 4:eaec41c1a0c9 | |
|
196 | : user: test | |
|
197 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
|
198 | : summary: 11 -> 11+; leading space before "1" | |
|
199 | : | |
|
200 | : diff --git a/foo b/foo | |
|
201 | : --- a/foo | |
|
202 | : +++ b/foo | |
|
203 | : @@ -2,7 +2,7 @@ | |
|
204 | : 0 | |
|
205 | : 0 | |
|
206 | : 0 | |
|
207 | : -1 | |
|
208 | : + 1 | |
|
209 | : 2+ | |
|
210 | : 3 | |
|
211 | : 4 | |
|
212 | : | |
|
213 | o changeset: 2:63a884426fd0 | |
|
214 | : user: test | |
|
215 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
|
216 | : summary: 2 -> 2+; added bar | |
|
217 | : | |
|
218 | : diff --git a/foo b/foo | |
|
219 | : --- a/foo | |
|
220 | : +++ b/foo | |
|
221 | : @@ -3,6 +3,6 @@ | |
|
222 | : 0 | |
|
223 | : 0 | |
|
224 | : 1 | |
|
225 | : -2 | |
|
226 | : +2+ | |
|
227 | : 3 | |
|
228 | : 4 | |
|
229 | : | |
|
230 | o changeset: 0:5ae1f82b9a00 | |
|
231 | user: test | |
|
232 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
233 | summary: init | |
|
234 | ||
|
235 | diff --git a/foo b/foo | |
|
236 | new file mode 100644 | |
|
237 | --- /dev/null | |
|
238 | +++ b/foo | |
|
239 | @@ -0,0 +1,5 @@ | |
|
240 | +0 | |
|
241 | +1 | |
|
242 | +2 | |
|
243 | +3 | |
|
244 | +4 | |
|
245 | ||
|
178 | 246 | |
|
179 | 247 | With --template. |
|
180 | 248 |
General Comments 0
You need to be logged in to leave comments.
Login now