Show More
@@ -3405,7 +3405,11 b' def log(ui, repo, *pats, **opts):' | |||||
3405 | _('FILE arguments are not compatible with --line-range option') |
|
3405 | _('FILE arguments are not compatible with --line-range option') | |
3406 | ) |
|
3406 | ) | |
3407 |
|
3407 | |||
3408 | if opts.get('follow') and opts.get('rev'): |
|
3408 | if opts.get('follow_first') and opts.get('rev'): | |
|
3409 | opts['rev'] = [revsetlang.formatspec('reverse(_firstancestors(%lr))', | |||
|
3410 | opts.get('rev'))] | |||
|
3411 | del opts['follow_first'] | |||
|
3412 | elif opts.get('follow') and opts.get('rev'): | |||
3409 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] |
|
3413 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] | |
3410 | del opts['follow'] |
|
3414 | del opts['follow'] | |
3411 |
|
3415 |
@@ -2304,22 +2304,9 b' changessincelatesttag with no prior tag' | |||||
2304 | Test --follow-first and forward --rev |
|
2304 | Test --follow-first and forward --rev | |
2305 |
|
2305 | |||
2306 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 |
|
2306 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 | |
2307 | ['6', '8', '5', '7', '4'] |
|
2307 | ['reverse(_firstancestors((((6) or (8)) or ((5) or ((7) or (4))))))'] | |
2308 | (func |
|
2308 | [] | |
2309 | (symbol '_firstdescendants') |
|
2309 | <generatorsetdesc-> | |
2310 | (func |
|
|||
2311 | (symbol 'rev') |
|
|||
2312 | (symbol '6'))) |
|
|||
2313 | <filteredset |
|
|||
2314 | <baseset- [4, 5, 6, 7, 8]>, |
|
|||
2315 | <generatorsetasc+>> |
|
|||
2316 | --- log.nodes * (glob) |
|
|||
2317 | +++ glog.nodes * (glob) |
|
|||
2318 | @@ -1,3 +1,3 @@ |
|
|||
2319 | -nodetag 6 |
|
|||
2320 | nodetag 8 |
|
|||
2321 | nodetag 7 |
|
|||
2322 | +nodetag 6 |
|
|||
2323 |
|
2310 | |||
2324 | Test --follow and backward --rev |
|
2311 | Test --follow and backward --rev | |
2325 |
|
2312 | |||
@@ -2331,15 +2318,9 b' Test --follow and backward --rev' | |||||
2331 | Test --follow-first and backward --rev |
|
2318 | Test --follow-first and backward --rev | |
2332 |
|
2319 | |||
2333 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 |
|
2320 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 | |
2334 | ['6', '5', '7', '8', '4'] |
|
2321 | ['reverse(_firstancestors((((6) or (5)) or ((7) or ((8) or (4))))))'] | |
2335 | (func |
|
2322 | [] | |
2336 | (symbol '_firstancestors') |
|
2323 | <generatorsetdesc-> | |
2337 | (func |
|
|||
2338 | (symbol 'rev') |
|
|||
2339 | (symbol '6'))) |
|
|||
2340 | <filteredset |
|
|||
2341 | <baseset- [4, 5, 6, 7, 8]>, |
|
|||
2342 | <generatorsetdesc+>> |
|
|||
2343 |
|
2324 | |||
2344 | Test --follow with --rev of graphlog extension |
|
2325 | Test --follow with --rev of graphlog extension | |
2345 |
|
2326 |
General Comments 0
You need to be logged in to leave comments.
Login now