Show More
@@ -710,17 +710,11 def add(ui, repo, *pats, **opts): | |||||
710 | def addremove(ui, repo, *pats, **opts): |
|
710 | def addremove(ui, repo, *pats, **opts): | |
711 | """add all new files, delete all missing files (DEPRECATED) |
|
711 | """add all new files, delete all missing files (DEPRECATED) | |
712 |
|
712 | |||
713 | (DEPRECATED) |
|
|||
714 | Add all new files and remove all missing files from the repository. |
|
713 | Add all new files and remove all missing files from the repository. | |
715 |
|
714 | |||
716 | New files are ignored if they match any of the patterns in .hgignore. As |
|
715 | New files are ignored if they match any of the patterns in .hgignore. As | |
717 | with add, these changes take effect at the next commit. |
|
716 | with add, these changes take effect at the next commit. | |
718 |
|
||||
719 | This command is now deprecated and will be removed in a future |
|
|||
720 | release. Please use add and remove --after instead. |
|
|||
721 | """ |
|
717 | """ | |
722 | ui.warn(_('(the addremove command is deprecated; use add and remove ' |
|
|||
723 | '--after instead)\n')) |
|
|||
724 | return addremove_lock(ui, repo, pats, opts) |
|
718 | return addremove_lock(ui, repo, pats, opts) | |
725 |
|
719 | |||
726 | def addremove_lock(ui, repo, pats, opts, wlock=None): |
|
720 | def addremove_lock(ui, repo, pats, opts, wlock=None): | |
@@ -2815,7 +2809,7 table = { | |||||
2815 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
2809 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2816 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], |
|
2810 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | |
2817 | _('hg add [OPTION]... [FILE]...')), |
|
2811 | _('hg add [OPTION]... [FILE]...')), | |
2818 |
" |
|
2812 | "addremove": | |
2819 | (addremove, |
|
2813 | (addremove, | |
2820 | [('I', 'include', [], _('include names matching the given patterns')), |
|
2814 | [('I', 'include', [], _('include names matching the given patterns')), | |
2821 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
2815 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
@@ -1,9 +1,7 | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
2 | adding dir/bar |
|
1 | adding dir/bar | |
3 | adding foo |
|
2 | adding foo | |
4 | dir/bar |
|
3 | dir/bar | |
5 | foo |
|
4 | foo | |
6 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
7 | adding dir/bar_2 |
|
5 | adding dir/bar_2 | |
8 | adding foo_2 |
|
6 | adding foo_2 | |
9 | dir/bar_2 |
|
7 | dir/bar_2 |
@@ -1,8 +1,5 | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
2 | adding foo |
|
1 | adding foo | |
3 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
4 | adding bar |
|
2 | adding bar | |
5 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
6 | adding baz/bletch |
|
3 | adding baz/bletch | |
7 | test-archive-TIP/.hg_archival.txt |
|
4 | test-archive-TIP/.hg_archival.txt | |
8 | test-archive-TIP/bar |
|
5 | test-archive-TIP/bar |
@@ -115,6 +115,7 Mercurial Distributed SCM | |||||
115 | list of commands (use "hg help -v" to show aliases and global options): |
|
115 | list of commands (use "hg help -v" to show aliases and global options): | |
116 |
|
116 | |||
117 | add add the specified files on the next commit |
|
117 | add add the specified files on the next commit | |
|
118 | addremove add all new files, delete all missing files (DEPRECATED) | |||
118 | annotate show changeset information per file line |
|
119 | annotate show changeset information per file line | |
119 | archive create unversioned archive of a repository revision |
|
120 | archive create unversioned archive of a repository revision | |
120 | backout reverse effect of earlier changeset |
|
121 | backout reverse effect of earlier changeset | |
@@ -161,6 +162,7 Mercurial Distributed SCM | |||||
161 | list of commands (use "hg help -v" to show aliases and global options): |
|
162 | list of commands (use "hg help -v" to show aliases and global options): | |
162 |
|
163 | |||
163 | add add the specified files on the next commit |
|
164 | add add the specified files on the next commit | |
|
165 | addremove add all new files, delete all missing files (DEPRECATED) | |||
164 | annotate show changeset information per file line |
|
166 | annotate show changeset information per file line | |
165 | archive create unversioned archive of a repository revision |
|
167 | archive create unversioned archive of a repository revision | |
166 | backout reverse effect of earlier changeset |
|
168 | backout reverse effect of earlier changeset |
@@ -39,6 +39,7 Mercurial Distributed SCM | |||||
39 | list of commands (use "hg help -v" to show aliases and global options): |
|
39 | list of commands (use "hg help -v" to show aliases and global options): | |
40 |
|
40 | |||
41 | add add the specified files on the next commit |
|
41 | add add the specified files on the next commit | |
|
42 | addremove add all new files, delete all missing files (DEPRECATED) | |||
42 | annotate show changeset information per file line |
|
43 | annotate show changeset information per file line | |
43 | archive create unversioned archive of a repository revision |
|
44 | archive create unversioned archive of a repository revision | |
44 | backout reverse effect of earlier changeset |
|
45 | backout reverse effect of earlier changeset | |
@@ -81,6 +82,7 list of commands (use "hg help -v" to sh | |||||
81 | verify verify the integrity of the repository |
|
82 | verify verify the integrity of the repository | |
82 | version output version and copyright information |
|
83 | version output version and copyright information | |
83 | add add the specified files on the next commit |
|
84 | add add the specified files on the next commit | |
|
85 | addremove add all new files, delete all missing files (DEPRECATED) | |||
84 | annotate show changeset information per file line |
|
86 | annotate show changeset information per file line | |
85 | archive create unversioned archive of a repository revision |
|
87 | archive create unversioned archive of a repository revision | |
86 | backout reverse effect of earlier changeset |
|
88 | backout reverse effect of earlier changeset |
@@ -1,4 +1,3 | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
2 | adding foo |
|
1 | adding foo | |
3 | checking changesets |
|
2 | checking changesets | |
4 | checking manifests |
|
3 | checking manifests |
@@ -1,4 +1,3 | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
2 | adding foo |
|
1 | adding foo | |
3 | checking changesets |
|
2 | checking changesets | |
4 | checking manifests |
|
3 | checking manifests |
@@ -1,6 +1,4 | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
2 | adding foo |
|
1 | adding foo | |
3 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
4 | adding bomb |
|
2 | adding bomb | |
5 | adding a.c |
|
3 | adding a.c | |
6 | adding dir/a.o |
|
4 | adding dir/a.o |
@@ -1,4 +1,3 | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
2 | adding a |
|
1 | adding a | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -8,7 +7,6 diff -r 33aaa84a386b a | |||||
8 | @@ -1,1 +1,1 @@ a |
|
7 | @@ -1,1 +1,1 @@ a | |
9 | -a |
|
8 | -a | |
10 | +abc |
|
9 | +abc | |
11 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
12 | adding b |
|
10 | adding b | |
13 | M a |
|
11 | M a | |
14 | changeset: 0:33aaa84a386b |
|
12 | changeset: 0:33aaa84a386b | |
@@ -90,7 +88,6 diff -r 802f095af299 a | |||||
90 | -a2 |
|
88 | -a2 | |
91 | +abc |
|
89 | +abc | |
92 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
90 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
93 | (the addremove command is deprecated; use add and remove --after instead) |
|
|||
94 | adding b |
|
91 | adding b | |
95 | M a |
|
92 | M a | |
96 | changeset: 1:802f095af299 |
|
93 | changeset: 1:802f095af299 |
General Comments 0
You need to be logged in to leave comments.
Login now