Mercurial > hg > pyhgsh

changeset 766:b444a7e053f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 22 Jul 2005 19:45:48 -0800
parents 1e31d97c3d70
children 61ed30e82b27
files doc/hg.1.txt mercurial/commands.py
diffstat 2 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/doc/hg.1.txt	Fri Jul 22 20:07:14 2005 -0500
+++ b/doc/hg.1.txt	Fri Jul 22 19:45:48 2005 -0800
@@ -60,7 +60,7 @@
     If no names are given, add all files in the current directory and
     its subdirectories.
 
-addremove::
+addremove [options] [files ...]::
     Add all new files and remove all missing files from the repository.
     
     New files are ignored if they match any of the patterns in .hgignore. As
--- a/mercurial/commands.py	Fri Jul 22 20:07:14 2005 -0500
+++ b/mercurial/commands.py	Fri Jul 22 19:45:48 2005 -0800
@@ -329,23 +329,19 @@
             names.append(abs)
     repo.add(names)
 
-def addremove(ui, repo, *files):
+def addremove(ui, repo, *pats, **opts):
     """add all new files, delete all missing files"""
-    if files:
-        files = relpath(repo, files)
-        d = []
-        u = []
-        for f in files:
-            p = repo.wjoin(f)
-            s = repo.dirstate.state(f)
-            isfile = os.path.isfile(p)
-            if s != 'r' and not isfile:
-                d.append(f)
-            elif s not in 'nmai' and isfile:
-                u.append(f)
-    else:
-        (c, a, d, u) = repo.changes()
+    q = dict(zip(pats, pats))
+    cwd = repo.getcwd()
+    n = (cwd and len(cwd) + 1) or 0
+    c, a, d, u = repo.changes(match = matchpats(cwd, pats, opts))
+    for f in u:
+        if f not in q:
+            ui.status('adding %s\n' % f[n:])
     repo.add(u)
+    for f in d:
+        if f not in q:
+            ui.status('removing %s\n' % f[n:])
     repo.remove(d)
 
 def annotate(ui, repo, *pats, **opts):
@@ -1086,7 +1082,10 @@
              [('I', 'include', [], 'include path in search'),
               ('X', 'exclude', [], 'exclude path from search')],
              "hg add [FILE]..."),
-    "addremove": (addremove, [], "hg addremove [FILE]..."),
+    "addremove": (addremove,
+                  [('I', 'include', [], 'include path in search'),
+                   ('X', 'exclude', [], 'exclude path from search')],
+                  "hg addremove [OPTION]... [FILE]..."),
     "^annotate":
         (annotate,
          [('r', 'rev', '', 'revision'),