--- a/mercurial/commands.py Wed Jul 11 18:15:21 2007 -0300
+++ b/mercurial/commands.py Wed Jul 11 19:56:16 2007 -0300
@@ -533,9 +533,10 @@
targets[abstarget] = abssrc
if abstarget != origsrc:
if repo.dirstate.state(origsrc) == 'a':
- ui.warn(_("%s was marked for addition. "
- "%s will not be committed as a copy.\n")
- % (repo.pathto(origsrc, cwd), reltarget))
+ if not ui.quiet:
+ ui.warn(_("%s has not been committed yet, so no copy "
+ "data will be stored for %s.\n")
+ % (repo.pathto(origsrc, cwd), reltarget))
if abstarget not in repo.dirstate and not opts.get('dry_run'):
repo.add([abstarget], wlock)
elif not opts.get('dry_run'):
--- a/tests/test-copy2.out Wed Jul 11 18:15:21 2007 -0300
+++ b/tests/test-copy2.out Wed Jul 11 19:56:16 2007 -0300
@@ -3,13 +3,13 @@
abort: no files to copy
? foo
# dry-run; print a warning that this is not a real copy; foo is added
-foo was marked for addition. bar will not be committed as a copy.
+foo has not been committed yet, so no copy data will be stored for bar.
A foo
# should print a warning that this is not a real copy; bar is added
-foo was marked for addition. bar will not be committed as a copy.
+foo has not been committed yet, so no copy data will be stored for bar.
A bar
# should print a warning that this is not a real copy; foo is added
-bar was marked for addition. foo will not be committed as a copy.
+bar has not been committed yet, so no copy data will be stored for foo.
A foo
# dry-run; should show that foo is clean
C foo