--- a/mercurial/commands.py	Tue Jan 03 17:13:03 2012 -0600
+++ b/mercurial/commands.py	Wed Jan 04 15:48:02 2012 -0600
@@ -5206,14 +5206,13 @@
     changestates = zip(states, 'MAR!?IC', stat)
 
     if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
-        ctxn = repo[nullid]
         ctx1 = repo[node1]
         ctx2 = repo[node2]
         added = stat[1]
         if node2 is None:
             added = stat[0] + stat[1] # merged?
 
-        for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
+        for k, v in copies.pathcopies(ctx1, ctx2).iteritems():
             if k in added:
                 copy[k] = v
             elif v in added: