# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1330210087 21600
# Node ID 0bb0b9f22cd76281cf8664aae85e2e53c43acd96
# Parent  0a73c4bd9f477c1422bde5978ffa733b4ec50283# Parent  280e834c9d15b0d65a0ee24374671e0cd2147f4e
merge with stable

diff -r 0a73c4bd9f47 -r 0bb0b9f22cd7 mercurial/commands.py
--- a/mercurial/commands.py	Sat Feb 25 22:11:36 2012 +0100
+++ b/mercurial/commands.py	Sat Feb 25 16:48:07 2012 -0600
@@ -3853,9 +3853,11 @@
     limit = cmdutil.loglimit(opts)
     count = 0
 
-    endrev = None
-    if opts.get('copies') and opts.get('rev'):
-        endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
+    getrenamed, endrev = None, None
+    if opts.get('copies'):
+        if opts.get('rev'):
+            endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
+        getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
 
     df = False
     if opts["date"]:
@@ -3899,9 +3901,8 @@
                 return
 
         copies = None
-        if opts.get('copies') and rev:
+        if getrenamed is not None and rev:
             copies = []
-            getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
             for fn in ctx.files():
                 rename = getrenamed(fn, rev)
                 if rename: