# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-10-25 22:45:35
# Node ID 467d923e4e3da3fe1594999815578b78f5829400
# Parent  b0dc459cd06ca8d35419db762d77dcc24106d8b2

Fix excessive complaining from hg log -b

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1857,6 +1857,10 @@ def log(ui, repo, *pats, **opts):
 
     changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
 
+    if opts['branches']:
+        ui.warn(_("the --branches option is deprecated, "
+                  "please use 'hg branches' instead\n"))
+
     if opts['limit']:
         try:
             limit = int(opts['limit'])
@@ -1933,8 +1937,6 @@ def log(ui, repo, *pats, **opts):
 
             br = None
             if opts['branches']:
-                ui.warn(_("the --branches option is deprecated, "
-                          "please use 'hg branches' instead\n"))
                 br = repo.branchlookup([repo.changelog.node(rev)])
 
             copies = []