Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use absolute paths in addremove.
authorAlexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Jun 2007 23:49:12 -0300
changeset 4522 591322269fed
parent 4521 d634b61e9cec
child 4523 b9d311928caf
Use absolute paths in addremove. This is more consistent with other places in the code, which only use the "relpath" returned by cmdutil.walk for display purposes.
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Thu Jun 07 23:16:10 2007 +0200
+++ b/mercurial/cmdutil.py	Fri Jun 08 23:49:12 2007 -0300
@@ -186,13 +186,15 @@
     add, remove = [], []
     mapping = {}
     for src, abs, rel, exact in walk(repo, pats, opts):
+        target = repo.wjoin(abs)
         if src == 'f' and repo.dirstate.state(abs) == '?':
             add.append(abs)
             mapping[abs] = rel, exact
             if repo.ui.verbose or not exact:
                 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
-        islink = os.path.islink(rel)
-        if repo.dirstate.state(abs) != 'r' and not islink and not os.path.exists(rel):
+        islink = os.path.islink(target)
+        if (repo.dirstate.state(abs) != 'r' and not islink
+            and not os.path.exists(target)):
             remove.append(abs)
             mapping[abs] = rel, exact
             if repo.ui.verbose or not exact:
Mercurial