Show More
@@ -1071,7 +1071,7 b' def followlines(repo, subset, x):' | |||||
1071 | fromline, toline = util.processlinerange( |
|
1071 | fromline, toline = util.processlinerange( | |
1072 | *getintrange(args['lines'][0], |
|
1072 | *getintrange(args['lines'][0], | |
1073 | # i18n: "followlines" is a keyword |
|
1073 | # i18n: "followlines" is a keyword | |
1074 | _("followlines expects a line range"), |
|
1074 | _("followlines expects a line number or a range"), | |
1075 | _("line range bounds must be integers"))) |
|
1075 | _("line range bounds must be integers"))) | |
1076 |
|
1076 | |||
1077 | fctx = repo[rev].filectx(fname) |
|
1077 | fctx = repo[rev].filectx(fname) |
@@ -246,6 +246,9 b' def getintrange(x, err1, err2, deffirst=' | |||||
246 | If any of the sides omitted, and if no default provided, ParseError will |
|
246 | If any of the sides omitted, and if no default provided, ParseError will | |
247 | be raised. |
|
247 | be raised. | |
248 | """ |
|
248 | """ | |
|
249 | if x and (x[0] == 'string' or x[0] == 'symbol'): | |||
|
250 | n = getinteger(x, err1) | |||
|
251 | return n, n | |||
249 | a, b = getrange(x, err1) |
|
252 | a, b = getrange(x, err1) | |
250 | return getinteger(a, err2, deffirst), getinteger(b, err2, deflast) |
|
253 | return getinteger(a, err2, deffirst), getinteger(b, err2, deflast) | |
251 |
|
254 |
@@ -809,6 +809,15 b' track of possible further descendants in' | |||||
809 | |\ |
|
809 | |\ | |
810 | ~ ~ |
|
810 | ~ ~ | |
811 |
|
811 | |||
|
812 | An integer as a line range, which is parsed as '1:1' | |||
|
813 | ||||
|
814 | $ hg log -r 'followlines(baz, 1)' | |||
|
815 | changeset: 22:2174d0bf352a | |||
|
816 | user: test | |||
|
817 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
818 | summary: added two lines with 0 | |||
|
819 | ||||
|
820 | ||||
812 | check error cases |
|
821 | check error cases | |
813 | $ hg up 24 --quiet |
|
822 | $ hg up 24 --quiet | |
814 | $ hg log -r 'followlines()' |
|
823 | $ hg log -r 'followlines()' | |
@@ -817,8 +826,8 b' check error cases' | |||||
817 | $ hg log -r 'followlines(baz)' |
|
826 | $ hg log -r 'followlines(baz)' | |
818 | hg: parse error: followlines requires a line range |
|
827 | hg: parse error: followlines requires a line range | |
819 | [255] |
|
828 | [255] | |
820 |
$ hg log -r 'followlines(baz, |
|
829 | $ hg log -r 'followlines(baz, x)' | |
821 | hg: parse error: followlines expects a line range |
|
830 | hg: parse error: followlines expects a line number or a range | |
822 | [255] |
|
831 | [255] | |
823 | $ hg log -r 'followlines(baz, 1:2, startrev=desc("b"))' |
|
832 | $ hg log -r 'followlines(baz, 1:2, startrev=desc("b"))' | |
824 | hg: parse error: followlines expects exactly one revision |
|
833 | hg: parse error: followlines expects exactly one revision |
General Comments 0
You need to be logged in to leave comments.
Login now