Show More
@@ -15,7 +15,7 b' command = cmdutil.command(cmdtable)' | |||||
15 | testedwith = 'internal' |
|
15 | testedwith = 'internal' | |
16 |
|
16 | |||
17 | @command('share', |
|
17 | @command('share', | |
18 |
[('U', 'noupdate', None, _('do not create a working |
|
18 | [('U', 'noupdate', None, _('do not create a working directory')), | |
19 | ('B', 'bookmarks', None, _('also share bookmarks'))], |
|
19 | ('B', 'bookmarks', None, _('also share bookmarks'))], | |
20 | _('[-U] [-B] SOURCE [DEST]'), |
|
20 | _('[-U] [-B] SOURCE [DEST]'), | |
21 | norepo=True) |
|
21 | norepo=True) |
@@ -81,7 +81,8 b' def strip(ui, repo, revs, update=True, b' | |||||
81 | ('', 'no-backup', None, _('no backups')), |
|
81 | ('', 'no-backup', None, _('no backups')), | |
82 | ('', 'nobackup', None, _('no backups (DEPRECATED)')), |
|
82 | ('', 'nobackup', None, _('no backups (DEPRECATED)')), | |
83 | ('n', '', None, _('ignored (DEPRECATED)')), |
|
83 | ('n', '', None, _('ignored (DEPRECATED)')), | |
84 |
('k', 'keep', None, _("do not modify working |
|
84 | ('k', 'keep', None, _("do not modify working directory during " | |
|
85 | "strip")), | |||
85 | ('B', 'bookmark', '', _("remove revs only reachable from given" |
|
86 | ('B', 'bookmark', '', _("remove revs only reachable from given" | |
86 | " bookmark"))], |
|
87 | " bookmark"))], | |
87 | _('hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...')) |
|
88 | _('hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...')) |
@@ -588,7 +588,7 b' def copy(ui, repo, pats, opts, rename=Fa' | |||||
588 | srcexists = True |
|
588 | srcexists = True | |
589 | except IOError, inst: |
|
589 | except IOError, inst: | |
590 | if inst.errno == errno.ENOENT: |
|
590 | if inst.errno == errno.ENOENT: | |
591 |
ui.warn(_('%s: deleted in working |
|
591 | ui.warn(_('%s: deleted in working directory\n') % relsrc) | |
592 | srcexists = False |
|
592 | srcexists = False | |
593 | else: |
|
593 | else: | |
594 | ui.warn(_('%s: cannot copy - %s\n') % |
|
594 | ui.warn(_('%s: cannot copy - %s\n') % |
@@ -1263,8 +1263,8 b' def cat(ui, repo, file1, *pats, **opts):' | |||||
1263 | return cmdutil.cat(ui, repo, ctx, m, '', **opts) |
|
1263 | return cmdutil.cat(ui, repo, ctx, m, '', **opts) | |
1264 |
|
1264 | |||
1265 | @command('^clone', |
|
1265 | @command('^clone', | |
1266 | [('U', 'noupdate', None, |
|
1266 | [('U', 'noupdate', None, _('the clone will include an empty working ' | |
1267 | _('the clone will include an empty working copy (only a repository)')), |
|
1267 | 'directory (only a repository)')), | |
1268 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), |
|
1268 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), | |
1269 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1269 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1270 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1270 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
@@ -2906,8 +2906,9 b' def debugsetparents(ui, repo, rev1, rev2' | |||||
2906 | """manually set the parents of the current working directory |
|
2906 | """manually set the parents of the current working directory | |
2907 |
|
2907 | |||
2908 | This is useful for writing repository conversion tools, but should |
|
2908 | This is useful for writing repository conversion tools, but should | |
2909 |
be used with care. For example, neither the working |
|
2909 | be used with care. For example, neither the working directory nor the | |
2910 |
is updated, so file status may be incorrect after running this |
|
2910 | dirstate is updated, so file status may be incorrect after running this | |
|
2911 | command. | |||
2911 |
|
2912 | |||
2912 | Returns 0 on success. |
|
2913 | Returns 0 on success. | |
2913 | """ |
|
2914 | """ | |
@@ -3234,7 +3235,7 b' def files(ui, repo, *pats, **opts):' | |||||
3234 | removed files). |
|
3235 | removed files). | |
3235 |
|
3236 | |||
3236 | If no patterns are given to match, this command prints the names |
|
3237 | If no patterns are given to match, this command prints the names | |
3237 |
of all files under Mercurial control in the working |
|
3238 | of all files under Mercurial control in the working directory. | |
3238 |
|
3239 | |||
3239 | .. container:: verbose |
|
3240 | .. container:: verbose | |
3240 |
|
3241 | |||
@@ -3920,7 +3921,7 b' def help_(ui, name=None, **opts):' | |||||
3920 | optionalrepo=True) |
|
3921 | optionalrepo=True) | |
3921 | def identify(ui, repo, source=None, rev=None, |
|
3922 | def identify(ui, repo, source=None, rev=None, | |
3922 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
3923 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
3923 |
"""identify the working |
|
3924 | """identify the working directory or specified revision | |
3924 |
|
3925 | |||
3925 | Print a summary identifying the repository state at REV using one or |
|
3926 | Print a summary identifying the repository state at REV using one or | |
3926 | two parent hash identifiers, followed by a "+" if the working |
|
3927 | two parent hash identifiers, followed by a "+" if the working |
@@ -138,7 +138,7 b' should print a warning that this is not ' | |||||
138 | moving a missing file |
|
138 | moving a missing file | |
139 | $ rm foo |
|
139 | $ rm foo | |
140 | $ hg mv foo foo3 |
|
140 | $ hg mv foo foo3 | |
141 |
foo: deleted in working |
|
141 | foo: deleted in working directory | |
142 | foo3 does not exist! |
|
142 | foo3 does not exist! | |
143 | $ hg up -qC . |
|
143 | $ hg up -qC . | |
144 |
|
144 |
@@ -309,7 +309,7 b' Testing -h/--help:' | |||||
309 | grep search for a pattern in specified files and revisions |
|
309 | grep search for a pattern in specified files and revisions | |
310 | heads show branch heads |
|
310 | heads show branch heads | |
311 | help show help for a given topic or a help overview |
|
311 | help show help for a given topic or a help overview | |
312 |
identify identify the working |
|
312 | identify identify the working directory or specified revision | |
313 | import import an ordered set of patches |
|
313 | import import an ordered set of patches | |
314 | incoming show new changesets found in source |
|
314 | incoming show new changesets found in source | |
315 | init create a new repository in the given directory |
|
315 | init create a new repository in the given directory | |
@@ -390,7 +390,7 b' Testing -h/--help:' | |||||
390 | grep search for a pattern in specified files and revisions |
|
390 | grep search for a pattern in specified files and revisions | |
391 | heads show branch heads |
|
391 | heads show branch heads | |
392 | help show help for a given topic or a help overview |
|
392 | help show help for a given topic or a help overview | |
393 |
identify identify the working |
|
393 | identify identify the working directory or specified revision | |
394 | import import an ordered set of patches |
|
394 | import import an ordered set of patches | |
395 | incoming show new changesets found in source |
|
395 | incoming show new changesets found in source | |
396 | init create a new repository in the given directory |
|
396 | init create a new repository in the given directory |
@@ -72,7 +72,7 b' Short help:' | |||||
72 | grep search for a pattern in specified files and revisions |
|
72 | grep search for a pattern in specified files and revisions | |
73 | heads show branch heads |
|
73 | heads show branch heads | |
74 | help show help for a given topic or a help overview |
|
74 | help show help for a given topic or a help overview | |
75 |
identify identify the working |
|
75 | identify identify the working directory or specified revision | |
76 | import import an ordered set of patches |
|
76 | import import an ordered set of patches | |
77 | incoming show new changesets found in source |
|
77 | incoming show new changesets found in source | |
78 | init create a new repository in the given directory |
|
78 | init create a new repository in the given directory | |
@@ -147,7 +147,7 b' Short help:' | |||||
147 | grep search for a pattern in specified files and revisions |
|
147 | grep search for a pattern in specified files and revisions | |
148 | heads show branch heads |
|
148 | heads show branch heads | |
149 | help show help for a given topic or a help overview |
|
149 | help show help for a given topic or a help overview | |
150 |
identify identify the working |
|
150 | identify identify the working directory or specified revision | |
151 | import import an ordered set of patches |
|
151 | import import an ordered set of patches | |
152 | incoming show new changesets found in source |
|
152 | incoming show new changesets found in source | |
153 | init create a new repository in the given directory |
|
153 | init create a new repository in the given directory | |
@@ -690,7 +690,7 b' Test that default list of commands omits' | |||||
690 | grep search for a pattern in specified files and revisions |
|
690 | grep search for a pattern in specified files and revisions | |
691 | heads show branch heads |
|
691 | heads show branch heads | |
692 | help show help for a given topic or a help overview |
|
692 | help show help for a given topic or a help overview | |
693 |
identify identify the working |
|
693 | identify identify the working directory or specified revision | |
694 | import import an ordered set of patches |
|
694 | import import an ordered set of patches | |
695 | incoming show new changesets found in source |
|
695 | incoming show new changesets found in source | |
696 | init create a new repository in the given directory |
|
696 | init create a new repository in the given directory | |
@@ -1656,7 +1656,7 b' Dish up an empty repo; serve it cold.' | |||||
1656 | identify |
|
1656 | identify | |
1657 | </a> |
|
1657 | </a> | |
1658 | </td><td> |
|
1658 | </td><td> | |
1659 |
identify the working |
|
1659 | identify the working directory or specified revision | |
1660 | </td></tr> |
|
1660 | </td></tr> | |
1661 | <tr><td> |
|
1661 | <tr><td> | |
1662 | <a href="/help/import"> |
|
1662 | <a href="/help/import"> |
@@ -636,7 +636,7 b' Make sure no one adds back a -b option:' | |||||
636 | -f --force force removal of changesets, discard uncommitted changes |
|
636 | -f --force force removal of changesets, discard uncommitted changes | |
637 | (no backup) |
|
637 | (no backup) | |
638 | --no-backup no backups |
|
638 | --no-backup no backups | |
639 |
-k --keep do not modify working |
|
639 | -k --keep do not modify working directory during strip | |
640 | -B --bookmark VALUE remove revs only reachable from given bookmark |
|
640 | -B --bookmark VALUE remove revs only reachable from given bookmark | |
641 | --mq operate on patch repository |
|
641 | --mq operate on patch repository | |
642 |
|
642 |
General Comments 0
You need to be logged in to leave comments.
Login now