Show More
@@ -292,7 +292,6 b' def copy(ui, repo, pats, opts):' | |||
|
292 | 292 | # hgsep => pathname that uses "/" to separate directories |
|
293 | 293 | # ossep => pathname that uses os.sep to separate directories |
|
294 | 294 | cwd = repo.getcwd() |
|
295 | errors = 0 | |
|
296 | 295 | copied = [] |
|
297 | 296 | targets = {} |
|
298 | 297 | |
@@ -358,8 +357,7 b' def copy(ui, repo, pats, opts):' | |||
|
358 | 357 | else: |
|
359 | 358 | ui.warn(_('%s: cannot copy - %s\n') % |
|
360 | 359 | (relsrc, inst.strerror)) |
|
361 |
|
|
|
362 | return | |
|
360 | return True # report a failure | |
|
363 | 361 | if ui.verbose or not exact: |
|
364 | 362 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
365 | 363 | targets[abstarget] = abssrc |
@@ -473,9 +471,11 b' def copy(ui, repo, pats, opts):' | |||
|
473 | 471 | if not copylist: |
|
474 | 472 | raise util.Abort(_('no files to copy')) |
|
475 | 473 | |
|
474 | errors = 0 | |
|
476 | 475 | for targetpath, srcs in copylist: |
|
477 | 476 | for abssrc, relsrc, exact in srcs: |
|
478 | copyfile(abssrc, relsrc, targetpath(abssrc), exact) | |
|
477 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): | |
|
478 | errors += 1 | |
|
479 | 479 | |
|
480 | 480 | if errors: |
|
481 | 481 | ui.warn(_('(consider using --after)\n')) |
General Comments 0
You need to be logged in to leave comments.
Login now