When reverting a file which was renamed, also revert the old name

mercurial/commands.py

@@ -2338,6 +2338,14 b' def revert(ui, repo, *pats, **opts):'
     changes = repo.status(match=names.has_key, wlock=wlock)[:5]
     modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
 
+    # if f is a rename, also revert the source
+    cwd = repo.getcwd()
+    for f in added:
+        src = repo.dirstate.copied(f)
+        if src and src not in names and repo.dirstate[src][0] == 'r':
+            removed[src] = None
+            names[src] = (repo.pathto(src, cwd), True)
+
     revert = ([], _('reverting %s\n'))
     add = ([], _('adding %s\n'))
     remove = ([], _('removing %s\n'))

tests/test-revert

@@ -94,4 +94,9 b' hg add newdir/newfile'
 hg revert b newdir
 echo foobar > b/b
 hg revert .
-true
+
+echo % reverting a rename target should revert the source
+hg mv a newa
+hg revert newa
+hg st a newa
+

tests/test-revert.out

@@ -63,3 +63,5 b' adding b/b'
 reverting b/b
 forgetting newdir/newfile
 reverting b/b
+% reverting a rename target should revert the source
+? newa