# HG changeset patch # User Thomas Arendsen Hein # Date 1140532643 -3600 # Node ID 4671078dbfe7fd3dd9d8b44ce9e646cf409dd33c # Parent fa34a74efc40e460fb690bcbd3e8f9dba724e803 Cleanup: Put initialization of br in front of --branches option handling. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1637,7 +1637,6 @@ def log(ui, repo, *pats, **opts): if opts['only_merges'] and len(parents) != 2: continue - br = None if opts['keyword']: changes = getchange(rev) miss = 0 @@ -1650,6 +1649,7 @@ def log(ui, repo, *pats, **opts): if miss: continue + br = None if opts['branches']: br = repo.branchlookup([repo.changelog.node(rev)])