copy & rename don't overwrite unless --force is specified

mercurial/commands.py

@@ -803,10 +803,13 b' def docopy(ui, repo, pats, opts):'
     def copy(abssrc, relsrc, target, exact):
         abstarget = util.canonpath(repo.root, cwd, target)
         reltarget = util.pathto(cwd, abstarget)
-        if not opts['force'] and repo.dirstate.state(abstarget) not in 'a?':
-            ui.warn(_('%s: not overwriting - file already managed\n') %
-                    reltarget)
-            return
+        if os.path.exists(reltarget):
+            if opts['force']:
+                os.unlink(reltarget)
+            else:
+                ui.warn(_('%s: not overwriting - file exists\n') %
+                        reltarget)
+                return
         if ui.verbose or not exact:
             ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
         if not opts['after']:

tests/test-rename

@@ -58,3 +58,21 b' mkdir d2/d21'
 hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21
 hg status
 hg update -C
+
+echo "# attempt to overwrite an existing file"
+echo "ca" > d1/ca
+hg rename d1/ba d1/ca
+hg status
+hg update -C
+
+echo "# forced overwrite of an existing file"
+echo "ca" > d1/ca
+hg rename --force d1/ba d1/ca
+hg status
+hg update -C
+
+echo "# replace a symlink with a file"
+ln -s ba d1/ca
+hg rename --force d1/ba d1/ca
+hg status
+hg update -C

tests/test-rename.out

@@ -49,7 +49,7 b' R d1/d11/a1'
 R d2/b
 # move everything under directory d1 to existing directory d2, do not
 # overwrite existing files (d2/b)
-d2/b: not overwriting - file already managed
+d2/b: not overwriting - file exists
 copying d1/d11/a1 to d2/d11/a1
 removing d1/d11/a1
 A d2/a
@@ -91,3 +91,13 b' A d2/d21/a'
 A d2/d21/a1
 R d1/a
 R d1/d11/a1
+# attempt to overwrite an existing file
+d1/ca: not overwriting - file exists
+abort: no files to copy
+? d1/ca
+# forced overwrite of an existing file
+A d1/ca
+R d1/ba
+# replace a symlink with a file
+A d1/ca
+R d1/ba