1525 dcache[:] = [man, repo.manifest.readdelta(man)] |
1525 dcache[:] = [man, repo.manifest.readdelta(man)] |
1526 if fn in dcache[1]: |
1526 if fn in dcache[1]: |
1527 return ncache[fn].get(dcache[1][fn]) |
1527 return ncache[fn].get(dcache[1][fn]) |
1528 return None |
1528 return None |
1529 |
1529 |
|
1530 df = False |
|
1531 if opts["date"]: |
|
1532 df = util.matchdate(opts["date"]) |
|
1533 |
|
1534 |
1530 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
1535 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
1531 for st, rev, fns in changeiter: |
1536 for st, rev, fns in changeiter: |
1532 if st == 'add': |
1537 if st == 'add': |
1533 changenode = repo.changelog.node(rev) |
1538 changenode = repo.changelog.node(rev) |
1534 parents = [p for p in repo.changelog.parentrevs(rev) |
1539 parents = [p for p in repo.changelog.parentrevs(rev) |
1535 if p != nullrev] |
1540 if p != nullrev] |
1536 if opts['no_merges'] and len(parents) == 2: |
1541 if opts['no_merges'] and len(parents) == 2: |
1537 continue |
1542 continue |
1538 if opts['only_merges'] and len(parents) != 2: |
1543 if opts['only_merges'] and len(parents) != 2: |
1539 continue |
1544 continue |
|
1545 |
|
1546 if df: |
|
1547 changes = get(rev) |
|
1548 if not df(changes[2][0]): |
|
1549 continue |
1540 |
1550 |
1541 if opts['keyword']: |
1551 if opts['keyword']: |
1542 changes = get(rev) |
1552 changes = get(rev) |
1543 miss = 0 |
1553 miss = 0 |
1544 for k in [kw.lower() for kw in opts['keyword']]: |
1554 for k in [kw.lower() for kw in opts['keyword']]: |
2584 [('b', 'branches', None, _('show branches (DEPRECATED)')), |
2594 [('b', 'branches', None, _('show branches (DEPRECATED)')), |
2585 ('f', 'follow', None, |
2595 ('f', 'follow', None, |
2586 _('follow changeset history, or file history across copies and renames')), |
2596 _('follow changeset history, or file history across copies and renames')), |
2587 ('', 'follow-first', None, |
2597 ('', 'follow-first', None, |
2588 _('only follow the first parent of merge changesets')), |
2598 _('only follow the first parent of merge changesets')), |
|
2599 ('d', 'date', '', _('show revs matching date spec')), |
2589 ('C', 'copies', None, _('show copied files')), |
2600 ('C', 'copies', None, _('show copied files')), |
2590 ('k', 'keyword', [], _('search for a keyword')), |
2601 ('k', 'keyword', [], _('search for a keyword')), |
2591 ('l', 'limit', '', _('limit number of changes displayed')), |
2602 ('l', 'limit', '', _('limit number of changes displayed')), |
2592 ('r', 'rev', [], _('show the specified revision or range')), |
2603 ('r', 'rev', [], _('show the specified revision or range')), |
2593 ('', 'removed', None, _('include revs where files were removed')), |
2604 ('', 'removed', None, _('include revs where files were removed')), |