--- a/mercurial/commands.py	Wed Oct 25 17:40:03 2006 -0500
+++ b/mercurial/commands.py	Wed Oct 25 17:45:35 2006 -0500
@@ -1857,6 +1857,10 @@
 
     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 @@
 
             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 = []