Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 10212:3ab391dd5ec5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Martin Geisler <mg@lazybytes.net>
date Tue, 05 Jan 2010 22:41:39 +0100
parents f5e55f1ca927 43f8abcec42d
children e3e41e5e7ff4
comparison
equal deleted inserted replaced
10208:37c4ce51a12d 10212:3ab391dd5ec5
3573 _('[-r REV] [FILE]')), 3573 _('[-r REV] [FILE]')),
3574 "paths": (paths, [], _('[NAME]')), 3574 "paths": (paths, [], _('[NAME]')),
3575 "^pull": 3575 "^pull":
3576 (pull, 3576 (pull,
3577 [('u', 'update', None, 3577 [('u', 'update', None,
3578 _('update to new tip if changesets were pulled')), 3578 _('update to new branch head if changesets were pulled')),
3579 ('f', 'force', None, 3579 ('f', 'force', None,
3580 _('run even when remote repository is unrelated')), 3580 _('run even when remote repository is unrelated')),
3581 ('r', 'rev', [], 3581 ('r', 'rev', [],
3582 _('a specific remote revision up to which you would like to pull')), 3582 _('a specific remote revision up to which you would like to pull')),
3583 ] + remoteopts, 3583 ] + remoteopts,
3686 ] + templateopts, 3686 ] + templateopts,
3687 _('[-p] [-g]')), 3687 _('[-p] [-g]')),
3688 "unbundle": 3688 "unbundle":
3689 (unbundle, 3689 (unbundle,
3690 [('u', 'update', None, 3690 [('u', 'update', None,
3691 _('update to new tip if changesets were unbundled'))], 3691 _('update to new branch head if changesets were unbundled'))],
3692 _('[-u] FILE...')), 3692 _('[-u] FILE...')),
3693 "^update|up|checkout|co": 3693 "^update|up|checkout|co":
3694 (update, 3694 (update,
3695 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), 3695 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
3696 ('c', 'check', None, _('check for uncommitted changes')), 3696 ('c', 'check', None, _('check for uncommitted changes')),