933 top = self.check_toppatch(repo) |
933 top = self.check_toppatch(repo) |
934 if not top: |
934 if not top: |
935 self.ui.write("No patches applied\n") |
935 self.ui.write("No patches applied\n") |
936 return |
936 return |
937 qp = self.qparents(repo, top) |
937 qp = self.qparents(repo, top) |
|
938 if opts.get('git'): |
|
939 self.diffopts().git = True |
938 self.printdiff(repo, qp, files=pats, opts=opts) |
940 self.printdiff(repo, qp, files=pats, opts=opts) |
939 |
941 |
940 def refresh(self, repo, pats=None, **opts): |
942 def refresh(self, repo, pats=None, **opts): |
941 if len(self.applied) == 0: |
943 if len(self.applied) == 0: |
942 self.ui.write("No patches applied\n") |
944 self.ui.write("No patches applied\n") |
2069 "qcommit|qci": |
2071 "qcommit|qci": |
2070 (commit, |
2072 (commit, |
2071 commands.table["^commit|ci"][1], |
2073 commands.table["^commit|ci"][1], |
2072 'hg qcommit [OPTION]... [FILE]...'), |
2074 'hg qcommit [OPTION]... [FILE]...'), |
2073 "^qdiff": (diff, |
2075 "^qdiff": (diff, |
2074 [('I', 'include', [], _('include names matching the given patterns')), |
2076 [('g', 'git', None, _('use git extended diff format')), |
|
2077 ('I', 'include', [], _('include names matching the given patterns')), |
2075 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2078 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2076 'hg qdiff [-I] [-X] [FILE]...'), |
2079 'hg qdiff [-I] [-X] [FILE]...'), |
2077 "qdelete|qremove|qrm": |
2080 "qdelete|qremove|qrm": |
2078 (delete, |
2081 (delete, |
2079 [('k', 'keep', None, _('keep patch file')), |
2082 [('k', 'keep', None, _('keep patch file')), |