addremove: do not deprecate.
command is too useful to drop.
is also best place to try autodetect of rename/copy by content similarity.
--- a/mercurial/commands.py Wed Jul 19 07:56:40 2006 -0700
+++ b/mercurial/commands.py Sun Jul 23 09:04:14 2006 -0700
@@ -710,17 +710,11 @@
def addremove(ui, repo, *pats, **opts):
"""add all new files, delete all missing files (DEPRECATED)
- (DEPRECATED)
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
with add, these changes take effect at the next commit.
-
- This command is now deprecated and will be removed in a future
- release. Please use add and remove --after instead.
"""
- ui.warn(_('(the addremove command is deprecated; use add and remove '
- '--after instead)\n'))
return addremove_lock(ui, repo, pats, opts)
def addremove_lock(ui, repo, pats, opts, wlock=None):
@@ -2815,7 +2809,7 @@
('X', 'exclude', [], _('exclude names matching the given patterns')),
('n', 'dry-run', None, _('do not perform actions, just print output'))],
_('hg add [OPTION]... [FILE]...')),
- "debugaddremove|addremove":
+ "addremove":
(addremove,
[('I', 'include', [], _('include names matching the given patterns')),
('X', 'exclude', [], _('exclude names matching the given patterns')),
--- a/tests/test-addremove.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-addremove.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,9 +1,7 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding dir/bar
adding foo
dir/bar
foo
-(the addremove command is deprecated; use add and remove --after instead)
adding dir/bar_2
adding foo_2
dir/bar_2
--- a/tests/test-archive.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-archive.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,8 +1,5 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding foo
-(the addremove command is deprecated; use add and remove --after instead)
adding bar
-(the addremove command is deprecated; use add and remove --after instead)
adding baz/bletch
test-archive-TIP/.hg_archival.txt
test-archive-TIP/bar
--- a/tests/test-globalopts.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-globalopts.out Sun Jul 23 09:04:14 2006 -0700
@@ -114,92 +114,94 @@
list of commands (use "hg help -v" to show aliases and global options):
- add add the specified files on the next commit
- annotate show changeset information per file line
- archive create unversioned archive of a repository revision
- backout reverse effect of earlier changeset
- bundle create a changegroup file
- cat output the latest or given revisions of files
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- copy mark files as copied for the next commit
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- grep search for a pattern in specified files and revisions
- heads show current repository heads
- help show help for a command, extension, or list of commands
- identify print information about the working copy
- import import an ordered set of patches
- incoming show new changesets found in source
- init create a new repository in the given directory
- locate locate files matching specific patterns
- log show revision history of entire repository or files
- manifest output the latest or given revision of the project manifest
- merge Merge working directory with another revision
- outgoing show changesets not found in destination
- parents show the parents of the working dir or revision
- paths show definition of symbolic path names
- pull pull changes from the specified source
- push push changes to the specified destination
- recover roll back an interrupted transaction
- remove remove the specified files on the next commit
- rename rename files; equivalent of copy + remove
- revert revert files or dirs to their states as of some revision
- rollback roll back the last transaction in this repository
- root print the root (top) of the current working dir
- serve export the repository via HTTP
- status show changed files in the working directory
- tag add a tag for the current tip or a given revision
- tags list repository tags
- tip show the tip revision
- unbundle apply a changegroup file
- update update or merge working directory
- verify verify the integrity of the repository
- version output version and copyright information
+ add add the specified files on the next commit
+ addremove add all new files, delete all missing files (DEPRECATED)
+ annotate show changeset information per file line
+ archive create unversioned archive of a repository revision
+ backout reverse effect of earlier changeset
+ bundle create a changegroup file
+ cat output the latest or given revisions of files
+ clone make a copy of an existing repository
+ commit commit the specified files or all outstanding changes
+ copy mark files as copied for the next commit
+ diff diff repository (or selected files)
+ export dump the header and diffs for one or more changesets
+ grep search for a pattern in specified files and revisions
+ heads show current repository heads
+ help show help for a command, extension, or list of commands
+ identify print information about the working copy
+ import import an ordered set of patches
+ incoming show new changesets found in source
+ init create a new repository in the given directory
+ locate locate files matching specific patterns
+ log show revision history of entire repository or files
+ manifest output the latest or given revision of the project manifest
+ merge Merge working directory with another revision
+ outgoing show changesets not found in destination
+ parents show the parents of the working dir or revision
+ paths show definition of symbolic path names
+ pull pull changes from the specified source
+ push push changes to the specified destination
+ recover roll back an interrupted transaction
+ remove remove the specified files on the next commit
+ rename rename files; equivalent of copy + remove
+ revert revert files or dirs to their states as of some revision
+ rollback roll back the last transaction in this repository
+ root print the root (top) of the current working dir
+ serve export the repository via HTTP
+ status show changed files in the working directory
+ tag add a tag for the current tip or a given revision
+ tags list repository tags
+ tip show the tip revision
+ unbundle apply a changegroup file
+ update update or merge working directory
+ verify verify the integrity of the repository
+ version output version and copyright information
Mercurial Distributed SCM
list of commands (use "hg help -v" to show aliases and global options):
- add add the specified files on the next commit
- annotate show changeset information per file line
- archive create unversioned archive of a repository revision
- backout reverse effect of earlier changeset
- bundle create a changegroup file
- cat output the latest or given revisions of files
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- copy mark files as copied for the next commit
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- grep search for a pattern in specified files and revisions
- heads show current repository heads
- help show help for a command, extension, or list of commands
- identify print information about the working copy
- import import an ordered set of patches
- incoming show new changesets found in source
- init create a new repository in the given directory
- locate locate files matching specific patterns
- log show revision history of entire repository or files
- manifest output the latest or given revision of the project manifest
- merge Merge working directory with another revision
- outgoing show changesets not found in destination
- parents show the parents of the working dir or revision
- paths show definition of symbolic path names
- pull pull changes from the specified source
- push push changes to the specified destination
- recover roll back an interrupted transaction
- remove remove the specified files on the next commit
- rename rename files; equivalent of copy + remove
- revert revert files or dirs to their states as of some revision
- rollback roll back the last transaction in this repository
- root print the root (top) of the current working dir
- serve export the repository via HTTP
- status show changed files in the working directory
- tag add a tag for the current tip or a given revision
- tags list repository tags
- tip show the tip revision
- unbundle apply a changegroup file
- update update or merge working directory
- verify verify the integrity of the repository
- version output version and copyright information
+ add add the specified files on the next commit
+ addremove add all new files, delete all missing files (DEPRECATED)
+ annotate show changeset information per file line
+ archive create unversioned archive of a repository revision
+ backout reverse effect of earlier changeset
+ bundle create a changegroup file
+ cat output the latest or given revisions of files
+ clone make a copy of an existing repository
+ commit commit the specified files or all outstanding changes
+ copy mark files as copied for the next commit
+ diff diff repository (or selected files)
+ export dump the header and diffs for one or more changesets
+ grep search for a pattern in specified files and revisions
+ heads show current repository heads
+ help show help for a command, extension, or list of commands
+ identify print information about the working copy
+ import import an ordered set of patches
+ incoming show new changesets found in source
+ init create a new repository in the given directory
+ locate locate files matching specific patterns
+ log show revision history of entire repository or files
+ manifest output the latest or given revision of the project manifest
+ merge Merge working directory with another revision
+ outgoing show changesets not found in destination
+ parents show the parents of the working dir or revision
+ paths show definition of symbolic path names
+ pull pull changes from the specified source
+ push push changes to the specified destination
+ recover roll back an interrupted transaction
+ remove remove the specified files on the next commit
+ rename rename files; equivalent of copy + remove
+ revert revert files or dirs to their states as of some revision
+ rollback roll back the last transaction in this repository
+ root print the root (top) of the current working dir
+ serve export the repository via HTTP
+ status show changed files in the working directory
+ tag add a tag for the current tip or a given revision
+ tags list repository tags
+ tip show the tip revision
+ unbundle apply a changegroup file
+ update update or merge working directory
+ verify verify the integrity of the repository
+ version output version and copyright information
%% not tested: --debugger
--- a/tests/test-help.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-help.out Sun Jul 23 09:04:14 2006 -0700
@@ -38,90 +38,92 @@
list of commands (use "hg help -v" to show aliases and global options):
- add add the specified files on the next commit
- annotate show changeset information per file line
- archive create unversioned archive of a repository revision
- backout reverse effect of earlier changeset
- bundle create a changegroup file
- cat output the latest or given revisions of files
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- copy mark files as copied for the next commit
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- grep search for a pattern in specified files and revisions
- heads show current repository heads
- help show help for a command, extension, or list of commands
- identify print information about the working copy
- import import an ordered set of patches
- incoming show new changesets found in source
- init create a new repository in the given directory
- locate locate files matching specific patterns
- log show revision history of entire repository or files
- manifest output the latest or given revision of the project manifest
- merge Merge working directory with another revision
- outgoing show changesets not found in destination
- parents show the parents of the working dir or revision
- paths show definition of symbolic path names
- pull pull changes from the specified source
- push push changes to the specified destination
- recover roll back an interrupted transaction
- remove remove the specified files on the next commit
- rename rename files; equivalent of copy + remove
- revert revert files or dirs to their states as of some revision
- rollback roll back the last transaction in this repository
- root print the root (top) of the current working dir
- serve export the repository via HTTP
- status show changed files in the working directory
- tag add a tag for the current tip or a given revision
- tags list repository tags
- tip show the tip revision
- unbundle apply a changegroup file
- update update or merge working directory
- verify verify the integrity of the repository
- version output version and copyright information
- add add the specified files on the next commit
- annotate show changeset information per file line
- archive create unversioned archive of a repository revision
- backout reverse effect of earlier changeset
- bundle create a changegroup file
- cat output the latest or given revisions of files
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- copy mark files as copied for the next commit
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- grep search for a pattern in specified files and revisions
- heads show current repository heads
- help show help for a command, extension, or list of commands
- identify print information about the working copy
- import import an ordered set of patches
- incoming show new changesets found in source
- init create a new repository in the given directory
- locate locate files matching specific patterns
- log show revision history of entire repository or files
- manifest output the latest or given revision of the project manifest
- merge Merge working directory with another revision
- outgoing show changesets not found in destination
- parents show the parents of the working dir or revision
- paths show definition of symbolic path names
- pull pull changes from the specified source
- push push changes to the specified destination
- recover roll back an interrupted transaction
- remove remove the specified files on the next commit
- rename rename files; equivalent of copy + remove
- revert revert files or dirs to their states as of some revision
- rollback roll back the last transaction in this repository
- root print the root (top) of the current working dir
- serve export the repository via HTTP
- status show changed files in the working directory
- tag add a tag for the current tip or a given revision
- tags list repository tags
- tip show the tip revision
- unbundle apply a changegroup file
- update update or merge working directory
- verify verify the integrity of the repository
- version output version and copyright information
+ add add the specified files on the next commit
+ addremove add all new files, delete all missing files (DEPRECATED)
+ annotate show changeset information per file line
+ archive create unversioned archive of a repository revision
+ backout reverse effect of earlier changeset
+ bundle create a changegroup file
+ cat output the latest or given revisions of files
+ clone make a copy of an existing repository
+ commit commit the specified files or all outstanding changes
+ copy mark files as copied for the next commit
+ diff diff repository (or selected files)
+ export dump the header and diffs for one or more changesets
+ grep search for a pattern in specified files and revisions
+ heads show current repository heads
+ help show help for a command, extension, or list of commands
+ identify print information about the working copy
+ import import an ordered set of patches
+ incoming show new changesets found in source
+ init create a new repository in the given directory
+ locate locate files matching specific patterns
+ log show revision history of entire repository or files
+ manifest output the latest or given revision of the project manifest
+ merge Merge working directory with another revision
+ outgoing show changesets not found in destination
+ parents show the parents of the working dir or revision
+ paths show definition of symbolic path names
+ pull pull changes from the specified source
+ push push changes to the specified destination
+ recover roll back an interrupted transaction
+ remove remove the specified files on the next commit
+ rename rename files; equivalent of copy + remove
+ revert revert files or dirs to their states as of some revision
+ rollback roll back the last transaction in this repository
+ root print the root (top) of the current working dir
+ serve export the repository via HTTP
+ status show changed files in the working directory
+ tag add a tag for the current tip or a given revision
+ tags list repository tags
+ tip show the tip revision
+ unbundle apply a changegroup file
+ update update or merge working directory
+ verify verify the integrity of the repository
+ version output version and copyright information
+ add add the specified files on the next commit
+ addremove add all new files, delete all missing files (DEPRECATED)
+ annotate show changeset information per file line
+ archive create unversioned archive of a repository revision
+ backout reverse effect of earlier changeset
+ bundle create a changegroup file
+ cat output the latest or given revisions of files
+ clone make a copy of an existing repository
+ commit commit the specified files or all outstanding changes
+ copy mark files as copied for the next commit
+ diff diff repository (or selected files)
+ export dump the header and diffs for one or more changesets
+ grep search for a pattern in specified files and revisions
+ heads show current repository heads
+ help show help for a command, extension, or list of commands
+ identify print information about the working copy
+ import import an ordered set of patches
+ incoming show new changesets found in source
+ init create a new repository in the given directory
+ locate locate files matching specific patterns
+ log show revision history of entire repository or files
+ manifest output the latest or given revision of the project manifest
+ merge Merge working directory with another revision
+ outgoing show changesets not found in destination
+ parents show the parents of the working dir or revision
+ paths show definition of symbolic path names
+ pull pull changes from the specified source
+ push push changes to the specified destination
+ recover roll back an interrupted transaction
+ remove remove the specified files on the next commit
+ rename rename files; equivalent of copy + remove
+ revert revert files or dirs to their states as of some revision
+ rollback roll back the last transaction in this repository
+ root print the root (top) of the current working dir
+ serve export the repository via HTTP
+ status show changed files in the working directory
+ tag add a tag for the current tip or a given revision
+ tags list repository tags
+ tip show the tip revision
+ unbundle apply a changegroup file
+ update update or merge working directory
+ verify verify the integrity of the repository
+ version output version and copyright information
hg add [OPTION]... [FILE]...
add the specified files on the next commit
--- a/tests/test-pull.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-pull.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,4 +1,3 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding foo
checking changesets
checking manifests
--- a/tests/test-simple-update.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-simple-update.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,4 +1,3 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding foo
checking changesets
checking manifests
--- a/tests/test-symlinks.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-symlinks.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,6 +1,4 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding foo
-(the addremove command is deprecated; use add and remove --after instead)
adding bomb
adding a.c
adding dir/a.o
--- a/tests/test-up-local-change.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-up-local-change.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,4 +1,3 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -8,7 +7,6 @@
@@ -1,1 +1,1 @@ a
-a
+abc
-(the addremove command is deprecated; use add and remove --after instead)
adding b
M a
changeset: 0:33aaa84a386b
@@ -90,7 +88,6 @@
-a2
+abc
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(the addremove command is deprecated; use add and remove --after instead)
adding b
M a
changeset: 1:802f095af299
--- a/tests/test-walk.out Wed Jul 19 07:56:40 2006 -0700
+++ b/tests/test-walk.out Sun Jul 23 09:04:14 2006 -0700
@@ -1,4 +1,3 @@
-(the addremove command is deprecated; use add and remove --after instead)
adding beans/black
adding beans/borlotti
adding beans/kidney