Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 1867:91ebf29c1595

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add -f/--force to remove command. else to remove modified file, must use "hg revert; hg rm" or "rm; hg rm --after".
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 08 Mar 2006 15:14:24 -0800
parents 39c46510ed25
children 42c76ec7a8d4
comparison
equal deleted inserted replaced
1865:1ed809a2104e 1867:91ebf29c1595
1918 """ 1918 """
1919 names = [] 1919 names = []
1920 def okaytoremove(abs, rel, exact): 1920 def okaytoremove(abs, rel, exact):
1921 modified, added, removed, deleted, unknown = repo.changes(files=[abs]) 1921 modified, added, removed, deleted, unknown = repo.changes(files=[abs])
1922 reason = None 1922 reason = None
1923 if modified: 1923 if modified and not opts['force']:
1924 reason = _('is modified') 1924 reason = _('is modified')
1925 elif added: 1925 elif added:
1926 reason = _('has been marked for add') 1926 reason = _('has been marked for add')
1927 elif unknown: 1927 elif unknown:
1928 reason = _('is not managed') 1928 reason = _('is not managed')
2562 _('hg debugrawcommit [OPTION]... [FILE]...')), 2562 _('hg debugrawcommit [OPTION]... [FILE]...')),
2563 "recover": (recover, [], _('hg recover')), 2563 "recover": (recover, [], _('hg recover')),
2564 "^remove|rm": 2564 "^remove|rm":
2565 (remove, 2565 (remove,
2566 [('I', 'include', [], _('include names matching the given patterns')), 2566 [('I', 'include', [], _('include names matching the given patterns')),
2567 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 2567 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2568 ('f', 'force', None, _('remove file even if modified'))],
2568 _('hg remove [OPTION]... FILE...')), 2569 _('hg remove [OPTION]... FILE...')),
2569 "rename|mv": 2570 "rename|mv":
2570 (rename, 2571 (rename,
2571 [('A', 'after', None, _('record a rename that has already occurred')), 2572 [('A', 'after', None, _('record a rename that has already occurred')),
2572 ('f', 'force', None, 2573 ('f', 'force', None,