Show More
@@ -13,7 +13,7 b' from mercurial.i18n import _' | |||
|
13 | 13 | |
|
14 | 14 | |
|
15 | 15 | def children(ui, repo, file_=None, **opts): |
|
16 | """show the children of the given or working dir revision | |
|
16 | """show the children of the given or working directory revision | |
|
17 | 17 | |
|
18 | 18 | Print the children of the working directory's revisions. If a |
|
19 | 19 | revision is given via --rev, the children of that revision will be |
@@ -68,7 +68,7 b' def convert(ui, src, dest=None, revmapfi' | |||
|
68 | 68 | |
|
69 | 69 | The 'include' directive causes a file, or all files under a |
|
70 | 70 | directory, to be included in the destination repository, and the |
|
71 | exclusion of all other files and dirs not explicitely included. | |
|
71 | exclusion of all other files and directories not explicitely included. | |
|
72 | 72 | The 'exclude' directive causes files or directories to be omitted. |
|
73 | 73 | The 'rename' directive renames a file or directory. To rename from |
|
74 | 74 | a subdirectory into the root of the repository, use '.' as the |
@@ -154,7 +154,9 b' class monotone_source(converter_source, ' | |||
|
154 | 154 | if self.mtnisdir(toname, rev): |
|
155 | 155 | renamed = self.mtnrenamefiles(self.files, fromname, toname) |
|
156 | 156 | for tofile, fromfile in renamed.items(): |
|
157 |
self.ui.debug (_("copying file in renamed dir |
|
|
157 | self.ui.debug (_("copying file in renamed directory " | |
|
158 | "from '%s' to '%s'") | |
|
159 | % (fromfile, tofile), '\n') | |
|
158 | 160 | files[tofile] = rev |
|
159 | 161 | for fromfile in renamed.values(): |
|
160 | 162 | files[fromfile] = rev |
@@ -7,7 +7,7 b'' | |||
|
7 | 7 | |
|
8 | 8 | ''' |
|
9 | 9 | The `extdiff' Mercurial extension allows you to use external programs |
|
10 | to compare revisions, or revision with working dir. The external diff | |
|
10 | to compare revisions, or revision with working directory. The external diff | |
|
11 | 11 | programs are called with a configurable set of options and two |
|
12 | 12 | non-option arguments: paths to directories containing snapshots of |
|
13 | 13 | files to compare. |
@@ -85,7 +85,7 b' def snapshot_wdir(ui, repo, files, tmpro' | |||
|
85 | 85 | dirname = "root" |
|
86 | 86 | base = os.path.join(tmproot, dirname) |
|
87 | 87 | os.mkdir(base) |
|
88 | ui.note(_('making snapshot of %d files from working dir\n') % | |
|
88 | ui.note(_('making snapshot of %d files from working directory\n') % | |
|
89 | 89 | (len(files))) |
|
90 | 90 | |
|
91 | 91 | fns_and_mtime = [] |
@@ -2218,7 +2218,7 b' def save(ui, repo, **opts):' | |||
|
2218 | 2218 | def strip(ui, repo, rev, **opts): |
|
2219 | 2219 | """strip a revision and all its descendants from the repository |
|
2220 | 2220 | |
|
2221 | If one of the working dir's parent revisions is stripped, the | |
|
2221 | If one of the working directory's parent revisions is stripped, the | |
|
2222 | 2222 | working directory will be updated to the parent of the stripped |
|
2223 | 2223 | revision. |
|
2224 | 2224 | """ |
@@ -2514,7 +2514,7 b' cmdtable = {' | |||
|
2514 | 2514 | 'qheader': (header, [], _('hg qheader [PATCH]')), |
|
2515 | 2515 | "^qimport": |
|
2516 | 2516 | (qimport, |
|
2517 | [('e', 'existing', None, _('import file in patch dir')), | |
|
2517 | [('e', 'existing', None, _('import file in patch directory')), | |
|
2518 | 2518 | ('n', 'name', '', _('patch file name')), |
|
2519 | 2519 | ('f', 'force', None, _('overwrite existing files')), |
|
2520 | 2520 | ('r', 'rev', [], _('place existing revisions under mq control')), |
@@ -2567,7 +2567,7 b' cmdtable = {' | |||
|
2567 | 2567 | "qrestore": |
|
2568 | 2568 | (restore, |
|
2569 | 2569 | [('d', 'delete', None, _('delete save entry')), |
|
2570 | ('u', 'update', None, _('update queue working dir'))], | |
|
2570 | ('u', 'update', None, _('update queue working directory'))], | |
|
2571 | 2571 | _('hg qrestore [-d] [-u] REV')), |
|
2572 | 2572 | "qsave": |
|
2573 | 2573 | (save, |
@@ -2088,7 +2088,7 b' def outgoing(ui, repo, dest=None, **opts' | |||
|
2088 | 2088 | displayer.show(repo[n]) |
|
2089 | 2089 | |
|
2090 | 2090 | def parents(ui, repo, file_=None, **opts): |
|
2091 | """show the parents of the working dir or revision | |
|
2091 | """show the parents of the working directory or revision | |
|
2092 | 2092 | |
|
2093 | 2093 | Print the working directory's parent revisions. If a revision is |
|
2094 | 2094 | given via --rev, the parent of that revision will be printed. If a |
@@ -2399,10 +2399,10 b' def resolve(ui, repo, *pats, **opts):' | |||
|
2399 | 2399 | util.rename(a + ".resolve", a + ".orig") |
|
2400 | 2400 | |
|
2401 | 2401 | def revert(ui, repo, *pats, **opts): |
|
2402 | """restore individual files or dirs to an earlier state | |
|
2402 | """restore individual files or directories to an earlier state | |
|
2403 | 2403 | |
|
2404 | 2404 | (use update -r to check out earlier revisions, revert does not |
|
2405 | change the working dir parents) | |
|
2405 | change the working directory parents) | |
|
2406 | 2406 | |
|
2407 | 2407 | With no revision specified, revert the named files or directories |
|
2408 | 2408 | to the contents they had in the parent of the working directory. |
@@ -2644,7 +2644,7 b' def rollback(ui, repo):' | |||
|
2644 | 2644 | repo.rollback() |
|
2645 | 2645 | |
|
2646 | 2646 | def root(ui, repo): |
|
2647 | """print the root (top) of the current working dir | |
|
2647 | """print the root (top) of the current working directory | |
|
2648 | 2648 | |
|
2649 | 2649 | Print the root directory of the current repository. |
|
2650 | 2650 | """ |
@@ -2924,13 +2924,13 b' def update(ui, repo, node=None, rev=None' | |||
|
2924 | 2924 | Use null as the revision to remove the working copy (like 'hg |
|
2925 | 2925 | clone -U'). |
|
2926 | 2926 | |
|
2927 | When the working dir contains no uncommitted changes, it will be | |
|
2927 | When the working directory contains no uncommitted changes, it will be | |
|
2928 | 2928 | replaced by the state of the requested revision from the repo. |
|
2929 | 2929 | When the requested revision is on a different branch, the working |
|
2930 | dir will additionally be switched to that branch. | |
|
2930 | directory will additionally be switched to that branch. | |
|
2931 | 2931 | |
|
2932 | 2932 | When there are uncommitted changes, use option -C to discard them, |
|
2933 | forcibly replacing the state of the working dir with the requested | |
|
2933 | forcibly replacing the state of the working directory with the requested | |
|
2934 | 2934 | revision. |
|
2935 | 2935 | |
|
2936 | 2936 | When there are uncommitted changes and option -C is not used, and |
@@ -3385,7 +3385,7 b' table = {' | |||
|
3385 | 3385 | ('a', 'address', '', _('address to listen on (default: all interfaces)')), |
|
3386 | 3386 | ('', 'prefix', '', _('prefix path to serve from (default: server root)')), |
|
3387 | 3387 | ('n', 'name', '', |
|
3388 | _('name to show in web pages (default: working dir)')), | |
|
3388 | _('name to show in web pages (default: working directory)')), | |
|
3389 | 3389 | ('', 'webdir-conf', '', _('name of the webdir config file' |
|
3390 | 3390 | ' (serve more than one repo)')), |
|
3391 | 3391 | ('', 'pid-file', '', _('name of file to write process ID to')), |
@@ -53,7 +53,7 b' convert a foreign SCM repository to a Me' | |||
|
53 | 53 | |
|
54 | 54 | The 'include' directive causes a file, or all files under a |
|
55 | 55 | directory, to be included in the destination repository, and the |
|
56 | exclusion of all other files and dirs not explicitely included. | |
|
56 | exclusion of all other files and directories not explicitely included. | |
|
57 | 57 | The 'exclude' directive causes files or directories to be omitted. |
|
58 | 58 | The 'rename' directive renames a file or directory. To rename from |
|
59 | 59 | a subdirectory into the root of the repository, use '.' as the |
@@ -176,7 +176,7 b' list of commands:' | |||
|
176 | 176 | manifest output the current or given revision of the project manifest |
|
177 | 177 | merge merge working directory with another revision |
|
178 | 178 | outgoing show changesets not found in destination |
|
179 | parents show the parents of the working dir or revision | |
|
179 | parents show the parents of the working directory or revision | |
|
180 | 180 | paths show aliases for remote repositories |
|
181 | 181 | pull pull changes from the specified source |
|
182 | 182 | push push changes to the specified destination |
@@ -184,9 +184,9 b' list of commands:' | |||
|
184 | 184 | remove remove the specified files on the next commit |
|
185 | 185 | rename rename files; equivalent of copy + remove |
|
186 | 186 | resolve retry file merges from a merge or update |
|
187 | revert restore individual files or dirs to an earlier state | |
|
187 | revert restore individual files or directories to an earlier state | |
|
188 | 188 | rollback roll back the last transaction |
|
189 | root print the root (top) of the current working dir | |
|
189 | root print the root (top) of the current working directory | |
|
190 | 190 | serve export the repository via HTTP |
|
191 | 191 | showconfig show combined config settings from all hgrc files |
|
192 | 192 | status show changed files in the working directory |
@@ -241,7 +241,7 b' list of commands:' | |||
|
241 | 241 | manifest output the current or given revision of the project manifest |
|
242 | 242 | merge merge working directory with another revision |
|
243 | 243 | outgoing show changesets not found in destination |
|
244 | parents show the parents of the working dir or revision | |
|
244 | parents show the parents of the working directory or revision | |
|
245 | 245 | paths show aliases for remote repositories |
|
246 | 246 | pull pull changes from the specified source |
|
247 | 247 | push push changes to the specified destination |
@@ -249,9 +249,9 b' list of commands:' | |||
|
249 | 249 | remove remove the specified files on the next commit |
|
250 | 250 | rename rename files; equivalent of copy + remove |
|
251 | 251 | resolve retry file merges from a merge or update |
|
252 | revert restore individual files or dirs to an earlier state | |
|
252 | revert restore individual files or directories to an earlier state | |
|
253 | 253 | rollback roll back the last transaction |
|
254 | root print the root (top) of the current working dir | |
|
254 | root print the root (top) of the current working directory | |
|
255 | 255 | serve export the repository via HTTP |
|
256 | 256 | showconfig show combined config settings from all hgrc files |
|
257 | 257 | status show changed files in the working directory |
@@ -11,7 +11,7 b' basic commands:' | |||
|
11 | 11 | init create a new repository in the given directory |
|
12 | 12 | log show revision history of entire repository or files |
|
13 | 13 | merge merge working directory with another revision |
|
14 | parents show the parents of the working dir or revision | |
|
14 | parents show the parents of the working directory or revision | |
|
15 | 15 | pull pull changes from the specified source |
|
16 | 16 | push push changes to the specified destination |
|
17 | 17 | remove remove the specified files on the next commit |
@@ -29,7 +29,7 b' use "hg help" for the full list of comma' | |||
|
29 | 29 | init create a new repository in the given directory |
|
30 | 30 | log show revision history of entire repository or files |
|
31 | 31 | merge merge working directory with another revision |
|
32 | parents show the parents of the working dir or revision | |
|
32 | parents show the parents of the working directory or revision | |
|
33 | 33 | pull pull changes from the specified source |
|
34 | 34 | push push changes to the specified destination |
|
35 | 35 | remove remove the specified files on the next commit |
@@ -67,7 +67,7 b' list of commands:' | |||
|
67 | 67 | manifest output the current or given revision of the project manifest |
|
68 | 68 | merge merge working directory with another revision |
|
69 | 69 | outgoing show changesets not found in destination |
|
70 | parents show the parents of the working dir or revision | |
|
70 | parents show the parents of the working directory or revision | |
|
71 | 71 | paths show aliases for remote repositories |
|
72 | 72 | pull pull changes from the specified source |
|
73 | 73 | push push changes to the specified destination |
@@ -75,9 +75,9 b' list of commands:' | |||
|
75 | 75 | remove remove the specified files on the next commit |
|
76 | 76 | rename rename files; equivalent of copy + remove |
|
77 | 77 | resolve retry file merges from a merge or update |
|
78 | revert restore individual files or dirs to an earlier state | |
|
78 | revert restore individual files or directories to an earlier state | |
|
79 | 79 | rollback roll back the last transaction |
|
80 | root print the root (top) of the current working dir | |
|
80 | root print the root (top) of the current working directory | |
|
81 | 81 | serve export the repository via HTTP |
|
82 | 82 | showconfig show combined config settings from all hgrc files |
|
83 | 83 | status show changed files in the working directory |
@@ -128,7 +128,7 b' use "hg -v help" to show aliases and glo' | |||
|
128 | 128 | manifest output the current or given revision of the project manifest |
|
129 | 129 | merge merge working directory with another revision |
|
130 | 130 | outgoing show changesets not found in destination |
|
131 | parents show the parents of the working dir or revision | |
|
131 | parents show the parents of the working directory or revision | |
|
132 | 132 | paths show aliases for remote repositories |
|
133 | 133 | pull pull changes from the specified source |
|
134 | 134 | push push changes to the specified destination |
@@ -136,9 +136,9 b' use "hg -v help" to show aliases and glo' | |||
|
136 | 136 | remove remove the specified files on the next commit |
|
137 | 137 | rename rename files; equivalent of copy + remove |
|
138 | 138 | resolve retry file merges from a merge or update |
|
139 | revert restore individual files or dirs to an earlier state | |
|
139 | revert restore individual files or directories to an earlier state | |
|
140 | 140 | rollback roll back the last transaction |
|
141 | root print the root (top) of the current working dir | |
|
141 | root print the root (top) of the current working directory | |
|
142 | 142 | serve export the repository via HTTP |
|
143 | 143 | showconfig show combined config settings from all hgrc files |
|
144 | 144 | status show changed files in the working directory |
@@ -308,7 +308,7 b' basic commands:' | |||
|
308 | 308 | init create a new repository in the given directory |
|
309 | 309 | log show revision history of entire repository or files |
|
310 | 310 | merge merge working directory with another revision |
|
311 | parents show the parents of the working dir or revision | |
|
311 | parents show the parents of the working directory or revision | |
|
312 | 312 | pull pull changes from the specified source |
|
313 | 313 | push push changes to the specified destination |
|
314 | 314 | remove remove the specified files on the next commit |
@@ -331,7 +331,7 b' basic commands:' | |||
|
331 | 331 | init create a new repository in the given directory |
|
332 | 332 | log show revision history of entire repository or files |
|
333 | 333 | merge merge working directory with another revision |
|
334 | parents show the parents of the working dir or revision | |
|
334 | parents show the parents of the working directory or revision | |
|
335 | 335 | pull pull changes from the specified source |
|
336 | 336 | push push changes to the specified destination |
|
337 | 337 | remove remove the specified files on the next commit |
@@ -13,7 +13,7 b' basic commands:' | |||
|
13 | 13 | init create a new repository in the given directory |
|
14 | 14 | log show revision history of entire repository or files |
|
15 | 15 | merge merge working directory with another revision |
|
16 | parents show the parents of the working dir or revision | |
|
16 | parents show the parents of the working directory or revision | |
|
17 | 17 | pull pull changes from the specified source |
|
18 | 18 | push push changes to the specified destination |
|
19 | 19 | remove remove the specified files on the next commit |
@@ -14,7 +14,7 b' basic commands:' | |||
|
14 | 14 | init create a new repository in the given directory |
|
15 | 15 | log show revision history of entire repository or files |
|
16 | 16 | merge merge working directory with another revision |
|
17 | parents show the parents of the working dir or revision | |
|
17 | parents show the parents of the working directory or revision | |
|
18 | 18 | pull pull changes from the specified source |
|
19 | 19 | push push changes to the specified destination |
|
20 | 20 | remove remove the specified files on the next commit |
General Comments 0
You need to be logged in to leave comments.
Login now