Show More
@@ -288,10 +288,6 b' def revset(pats, opts):' | |||||
288 | revset = ' and '.join(revset) |
|
288 | revset = ' and '.join(revset) | |
289 | else: |
|
289 | else: | |
290 | revset = 'all()' |
|
290 | revset = 'all()' | |
291 | # we want reverted revset to build graph |
|
|||
292 | revset = 'reverse(%s)' % revset |
|
|||
293 | if opts['limit']: |
|
|||
294 | revset = 'limit(%s, %s)' % (revset, opts['limit']) |
|
|||
295 | return revset |
|
291 | return revset | |
296 |
|
292 | |||
297 | def generate(ui, dag, displayer, showparents, edgefn): |
|
293 | def generate(ui, dag, displayer, showparents, edgefn): | |
@@ -318,7 +314,10 b' def graphlog(ui, repo, *pats, **opts):' | |||||
318 |
|
314 | |||
319 | check_unsupported_flags(pats, opts) |
|
315 | check_unsupported_flags(pats, opts) | |
320 |
|
316 | |||
321 | revs = revrange(repo, [revset(pats, opts)]) |
|
317 | revs = sorted(revrange(repo, [revset(pats, opts)]), reverse=1) | |
|
318 | limit = cmdutil.loglimit(opts) | |||
|
319 | if limit is not None: | |||
|
320 | revs = revs[:limit] | |||
322 | revdag = graphmod.dagwalker(repo, revs) |
|
321 | revdag = graphmod.dagwalker(repo, revs) | |
323 |
|
322 | |||
324 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
323 | displayer = show_changeset(ui, repo, opts, buffered=True) |
@@ -1319,13 +1319,12 b' File + limit + -ra:b, b < tip:' | |||||
1319 | file(File) + limit + -ra:b, b < tip: |
|
1319 | file(File) + limit + -ra:b, b < tip: | |
1320 |
|
1320 | |||
1321 | $ hg glog -l1 -r32:34 -r 'file("a")' |
|
1321 | $ hg glog -l1 -r32:34 -r 'file("a")' | |
1322 |
o |
|
1322 | o changeset: 34:fea3ac5810e0 | |
1323 |
| |
|
1323 | | parent: 32:d06dffa21a31 | |
1324 | | | parent: 30:6e11cd4b648f |
|
1324 | | user: test | |
1325 | | | user: test |
|
1325 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1326 | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
1326 | | summary: (34) head | |
1327 | | | summary: (31) expand |
|
1327 | | | |
1328 | | | |
|
|||
1329 |
|
1328 | |||
1330 | limit(file(File) and a::b), b < tip: |
|
1329 | limit(file(File) and a::b), b < tip: | |
1331 |
|
1330 | |||
@@ -1457,8 +1456,16 b' Test log -G options' | |||||
1457 |
|
1456 | |||
1458 | Test multiple revision specifications are correctly handled |
|
1457 | Test multiple revision specifications are correctly handled | |
1459 |
|
1458 | |||
1460 |
$ hg log -G -r 27 -r 25 - |
|
1459 | $ hg log -G -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 --template '{rev}\n' | |
1461 |
o |
|
1460 | o 34 | |
|
1461 | | | |||
|
1462 | o 32 | |||
1462 | |\ |
|
1463 | |\ | |
1463 | +---o 27 |
|
1464 | | o 31 | |
1464 | | | |
|
1465 | | |\ | |
|
1466 | o | | 27 | |||
|
1467 | |/ / | |||
|
1468 | | o 25 | |||
|
1469 | |/ | |||
|
1470 | o 21 | |||
|
1471 | |\ |
General Comments 0
You need to be logged in to leave comments.
Login now