mercurial/cmdutil.py
changeset 23686 164915e8ef7b
parent 23674 6e36b9fc7869
child 23691 e41bcb019633
--- a/mercurial/cmdutil.py	Fri Nov 28 20:15:46 2014 -0500
+++ b/mercurial/cmdutil.py	Thu Nov 27 10:16:56 2014 -0500
@@ -1991,7 +1991,7 @@
                 cca(f)
             names.append(f)
             if ui.verbose or not exact:
-                ui.status(_('adding %s\n') % match.rel(join(f)))
+                ui.status(_('adding %s\n') % match.rel(f))
 
     for subpath in sorted(wctx.substate):
         sub = wctx.sub(subpath)
@@ -2042,12 +2042,12 @@
                     if repo.wvfs.exists(f):
                         ui.warn(_('not removing %s: '
                                   'file is already untracked\n')
-                                % match.rel(join(f)))
+                                % match.rel(f))
                     bad.append(f)
 
     for f in forget:
         if ui.verbose or not match.exact(f):
-            ui.status(_('removing %s\n') % match.rel(join(f)))
+            ui.status(_('removing %s\n') % match.rel(f))
 
     rejected = wctx.forget(forget, prefix)
     bad.extend(f for f in rejected if f in match.files())
@@ -2095,10 +2095,10 @@
         if repo.wvfs.exists(f):
             if repo.wvfs.isdir(f):
                 ui.warn(_('not removing %s: no tracked files\n')
-                        % m.rel(join(f)))
+                        % m.rel(f))
             else:
                 ui.warn(_('not removing %s: file is untracked\n')
-                        % m.rel(join(f)))
+                        % m.rel(f))
         # missing files will generate a warning elsewhere
         ret = 1
 
@@ -2107,22 +2107,22 @@
     elif after:
         list = deleted
         for f in modified + added + clean:
-            ui.warn(_('not removing %s: file still exists\n') % m.rel(join(f)))
+            ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
             ret = 1
     else:
         list = deleted + clean
         for f in modified:
             ui.warn(_('not removing %s: file is modified (use -f'
-                      ' to force removal)\n') % m.rel(join(f)))
+                      ' to force removal)\n') % m.rel(f))
             ret = 1
         for f in added:
             ui.warn(_('not removing %s: file has been marked for add'
-                      ' (use forget to undo)\n') % m.rel(join(f)))
+                      ' (use forget to undo)\n') % m.rel(f))
             ret = 1
 
     for f in sorted(list):
         if ui.verbose or not m.exact(f):
-            ui.status(_('removing %s\n') % m.rel(join(f)))
+            ui.status(_('removing %s\n') % m.rel(f))
 
     wlock = repo.wlock()
     try: