Show More
@@ -196,7 +196,7 b' def apply(ui, repo, *args, **kwargs):' | |||||
196 | ui.status((bytes(cmd)), "\n") |
|
196 | ui.status((bytes(cmd)), "\n") | |
197 |
|
197 | |||
198 | def bisect(ui, repo, *args, **kwargs): |
|
198 | def bisect(ui, repo, *args, **kwargs): | |
199 |
ui.status(_(" |
|
199 | ui.status(_("see 'hg help bisect' for how to use bisect.\n\n")) | |
200 |
|
200 | |||
201 | def blame(ui, repo, *args, **kwargs): |
|
201 | def blame(ui, repo, *args, **kwargs): | |
202 | cmdoptions = [ |
|
202 | cmdoptions = [ | |
@@ -456,7 +456,7 b' def commit(ui, repo, *args, **kwargs):' | |||||
456 | ui.status((bytes(cmd)), "\n") |
|
456 | ui.status((bytes(cmd)), "\n") | |
457 |
|
457 | |||
458 | def deprecated(ui, repo, *args, **kwargs): |
|
458 | def deprecated(ui, repo, *args, **kwargs): | |
459 |
ui.warn(_(' |
|
459 | ui.warn(_('this command has been deprecated in the git project, ' + | |
460 | 'thus isn\'t supported by this tool.\n\n')) |
|
460 | 'thus isn\'t supported by this tool.\n\n')) | |
461 |
|
461 | |||
462 | def diff(ui, repo, *args, **kwargs): |
|
462 | def diff(ui, repo, *args, **kwargs): | |
@@ -656,8 +656,8 b' def mergebase(ui, repo, *args, **kwargs)' | |||||
656 | cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'" |
|
656 | cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'" | |
657 | % (args[0], args[1])) |
|
657 | % (args[0], args[1])) | |
658 |
|
658 | |||
659 |
ui.status(_(' |
|
659 | ui.status(_('note: ancestors() is part of the revset language.\n'), | |
660 |
_(" |
|
660 | _("(learn more about revsets with 'hg help revsets')\n\n")) | |
661 | ui.status((bytes(cmd)), "\n") |
|
661 | ui.status((bytes(cmd)), "\n") | |
662 |
|
662 | |||
663 | def mergetool(ui, repo, *args, **kwargs): |
|
663 | def mergetool(ui, repo, *args, **kwargs): | |
@@ -776,7 +776,7 b' def rebase(ui, repo, *args, **kwargs):' | |||||
776 | "\n\n")) |
|
776 | "\n\n")) | |
777 | cmd['-d'] = convert(opts.get('onto')) |
|
777 | cmd['-d'] = convert(opts.get('onto')) | |
778 | if len(args) < 2: |
|
778 | if len(args) < 2: | |
779 |
raise error.Abort(_(" |
|
779 | raise error.Abort(_("expected format: git rebase --onto X Y Z")) | |
780 | cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0])) |
|
780 | cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0])) | |
781 | else: |
|
781 | else: | |
782 | if len(args) == 1: |
|
782 | if len(args) == 1: | |
@@ -815,10 +815,10 b' def reset(ui, repo, *args, **kwargs):' | |||||
815 | hard = opts.get('hard') |
|
815 | hard = opts.get('hard') | |
816 |
|
816 | |||
817 | if opts.get('mixed'): |
|
817 | if opts.get('mixed'): | |
818 |
ui.status(_(' |
|
818 | ui.status(_('note: --mixed has no meaning since Mercurial has no ' | |
819 | 'staging area\n\n')) |
|
819 | 'staging area\n\n')) | |
820 | if opts.get('soft'): |
|
820 | if opts.get('soft'): | |
821 |
ui.status(_(' |
|
821 | ui.status(_('note: --soft has no meaning since Mercurial has no ' | |
822 | 'staging area\n\n')) |
|
822 | 'staging area\n\n')) | |
823 |
|
823 | |||
824 | cmd = Command('update') |
|
824 | cmd = Command('update') |
@@ -165,11 +165,11 b' githelp for reset, checking ~ in git bec' | |||||
165 | hg update .~3 |
|
165 | hg update .~3 | |
166 |
|
166 | |||
167 | $ hg githelp -- reset --mixed HEAD |
|
167 | $ hg githelp -- reset --mixed HEAD | |
168 |
|
|
168 | note: --mixed has no meaning since Mercurial has no staging area | |
169 |
|
169 | |||
170 | hg update . |
|
170 | hg update . | |
171 | $ hg githelp -- reset --soft HEAD |
|
171 | $ hg githelp -- reset --soft HEAD | |
172 |
|
|
172 | note: --soft has no meaning since Mercurial has no staging area | |
173 |
|
173 | |||
174 | hg update . |
|
174 | hg update . | |
175 | $ hg githelp -- reset --hard HEAD |
|
175 | $ hg githelp -- reset --hard HEAD | |
@@ -221,7 +221,7 b' githelp for stash drop with name' | |||||
221 |
|
221 | |||
222 | githelp for whatchanged should show deprecated message |
|
222 | githelp for whatchanged should show deprecated message | |
223 | $ hg githelp -- whatchanged -p |
|
223 | $ hg githelp -- whatchanged -p | |
224 |
|
|
224 | this command has been deprecated in the git project, thus isn't supported by this tool. | |
225 |
|
225 | |||
226 |
|
226 | |||
227 | githelp for git branch -m renaming |
|
227 | githelp for git branch -m renaming | |
@@ -259,8 +259,8 b' githelp for apply with directory strip c' | |||||
259 | git merge-base |
|
259 | git merge-base | |
260 | $ hg githelp -- git merge-base --is-ancestor |
|
260 | $ hg githelp -- git merge-base --is-ancestor | |
261 | ignoring unknown option --is-ancestor |
|
261 | ignoring unknown option --is-ancestor | |
262 |
|
|
262 | note: ancestors() is part of the revset language. | |
263 |
|
|
263 | (learn more about revsets with 'hg help revsets') | |
264 |
|
264 | |||
265 | hg log -T '{node}\n' -r 'ancestor(A,B)' |
|
265 | hg log -T '{node}\n' -r 'ancestor(A,B)' | |
266 |
|
266 |
General Comments 0
You need to be logged in to leave comments.
Login now