comparison hgext/mq.py @ 6668:034f444902d9

mq: qdiff: support all diffopts
author Jason Orendorff <jorendorff@mozilla.com>
date Thu, 12 Jun 2008 07:38:15 -0500
parents 2c9565971abc
children f6c00b17387c
comparison
equal deleted inserted replaced
6667:01e95d4bc66c 6668:034f444902d9
965 top = self.check_toppatch(repo) 965 top = self.check_toppatch(repo)
966 if not top: 966 if not top:
967 self.ui.write("No patches applied\n") 967 self.ui.write("No patches applied\n")
968 return 968 return
969 qp = self.qparents(repo, top) 969 qp = self.qparents(repo, top)
970 if opts.get('git'): 970 self._diffopts = patch.diffopts(self.ui, opts)
971 self.diffopts().git = True
972 if opts.get('unified') is not None:
973 self.diffopts().context = opts['unified']
974 self.printdiff(repo, qp, files=pats, opts=opts) 971 self.printdiff(repo, qp, files=pats, opts=opts)
975 972
976 def refresh(self, repo, pats=None, **opts): 973 def refresh(self, repo, pats=None, **opts):
977 if len(self.applied) == 0: 974 if len(self.applied) == 0:
978 self.ui.write("No patches applied\n") 975 self.ui.write("No patches applied\n")
2353 (commit, 2350 (commit,
2354 commands.table["^commit|ci"][1], 2351 commands.table["^commit|ci"][1],
2355 _('hg qcommit [OPTION]... [FILE]...')), 2352 _('hg qcommit [OPTION]... [FILE]...')),
2356 "^qdiff": 2353 "^qdiff":
2357 (diff, 2354 (diff,
2358 [('g', 'git', None, _('use git extended diff format')), 2355 commands.diffopts + commands.diffopts2 + commands.walkopts,
2359 ('U', 'unified', 3, _('number of lines of context to show')), 2356 _('hg qdiff [OPTION]... [FILE]...')),
2360 ] + commands.walkopts,
2361 _('hg qdiff [-I] [-X] [-U NUM] [-g] [FILE]...')),
2362 "qdelete|qremove|qrm": 2357 "qdelete|qremove|qrm":
2363 (delete, 2358 (delete,
2364 [('k', 'keep', None, _('keep patch file')), 2359 [('k', 'keep', None, _('keep patch file')),
2365 ('r', 'rev', [], _('stop managing a revision'))], 2360 ('r', 'rev', [], _('stop managing a revision'))],
2366 _('hg qdelete [-k] [-r REV]... [PATCH]...')), 2361 _('hg qdelete [-k] [-r REV]... [PATCH]...')),