Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 1764:4671078dbfe7
Cleanup: Put initialization of br in front of --branches option handling.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 21 Feb 2006 15:37:23 +0100 |
parents | fa34a74efc40 |
children | b9fac31f34c9 |
comparison
equal
deleted
inserted
replaced
1763:fa34a74efc40 | 1764:4671078dbfe7 |
---|---|
1635 if opts['no_merges'] and len(parents) == 2: | 1635 if opts['no_merges'] and len(parents) == 2: |
1636 continue | 1636 continue |
1637 if opts['only_merges'] and len(parents) != 2: | 1637 if opts['only_merges'] and len(parents) != 2: |
1638 continue | 1638 continue |
1639 | 1639 |
1640 br = None | |
1641 if opts['keyword']: | 1640 if opts['keyword']: |
1642 changes = getchange(rev) | 1641 changes = getchange(rev) |
1643 miss = 0 | 1642 miss = 0 |
1644 for k in [kw.lower() for kw in opts['keyword']]: | 1643 for k in [kw.lower() for kw in opts['keyword']]: |
1645 if not (k in changes[1].lower() or | 1644 if not (k in changes[1].lower() or |
1648 miss = 1 | 1647 miss = 1 |
1649 break | 1648 break |
1650 if miss: | 1649 if miss: |
1651 continue | 1650 continue |
1652 | 1651 |
1652 br = None | |
1653 if opts['branches']: | 1653 if opts['branches']: |
1654 br = repo.branchlookup([repo.changelog.node(rev)]) | 1654 br = repo.branchlookup([repo.changelog.node(rev)]) |
1655 | 1655 |
1656 show_changeset(du, repo, rev, brinfo=br) | 1656 show_changeset(du, repo, rev, brinfo=br) |
1657 if opts['patch']: | 1657 if opts['patch']: |