comparison hgext/mq.py @ 3086:17747e80ea6c

mq: Add --git option to qrefresh
author Brendan Cully <brendan@kublai.com>
date Tue, 12 Sep 2006 11:11:19 -0700
parents 240ec0e61290
children fd1479e30aaf
comparison
equal deleted inserted replaced
3085:240ec0e61290 3086:17747e80ea6c
993 993
994 m = list(util.unique(mm)) 994 m = list(util.unique(mm))
995 r = list(util.unique(dd)) 995 r = list(util.unique(dd))
996 a = list(util.unique(aa)) 996 a = list(util.unique(aa))
997 filelist = filter(matchfn, util.unique(m + r + a)) 997 filelist = filter(matchfn, util.unique(m + r + a))
998 if opts.get('git'):
999 self.diffopts().git = True
998 patch.diff(repo, patchparent, files=filelist, match=matchfn, 1000 patch.diff(repo, patchparent, files=filelist, match=matchfn,
999 fp=patchf, changes=(m, a, r, [], u), 1001 fp=patchf, changes=(m, a, r, [], u),
1000 opts=self.diffopts()) 1002 opts=self.diffopts())
1001 patchf.close() 1003 patchf.close()
1002 1004
1964 "^qrefresh": 1966 "^qrefresh":
1965 (refresh, 1967 (refresh,
1966 [('e', 'edit', None, _('edit commit message')), 1968 [('e', 'edit', None, _('edit commit message')),
1967 ('m', 'message', '', _('change commit message with <text>')), 1969 ('m', 'message', '', _('change commit message with <text>')),
1968 ('l', 'logfile', '', _('change commit message with <file> content')), 1970 ('l', 'logfile', '', _('change commit message with <file> content')),
1971 ('g', 'git', None, _('use git extended diff format')),
1969 ('s', 'short', None, 'short refresh'), 1972 ('s', 'short', None, 'short refresh'),
1970 ('I', 'include', [], _('include names matching the given patterns')), 1973 ('I', 'include', [], _('include names matching the given patterns')),
1971 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 1974 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1972 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'), 1975 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'),
1973 'qrename|qmv': 1976 'qrename|qmv':