Mercurial > hg
comparison hgext/mq.py @ 6562:090f2145df7d
merge from crew-stable
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 18 Apr 2008 18:07:34 +0200 |
parents | 550c53d66949 c242fc76958e |
children | 5acbdd3941c4 |
comparison
equal
deleted
inserted
replaced
6559:8b67211d9140 | 6562:090f2145df7d |
---|---|
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'): | 938 if opts.get('git'): |
939 self.diffopts().git = True | 939 self.diffopts().git = True |
940 if opts.get('unified') is not None: | |
941 self.diffopts().context = opts['unified'] | |
940 self.printdiff(repo, qp, files=pats, opts=opts) | 942 self.printdiff(repo, qp, files=pats, opts=opts) |
941 | 943 |
942 def refresh(self, repo, pats=None, **opts): | 944 def refresh(self, repo, pats=None, **opts): |
943 if len(self.applied) == 0: | 945 if len(self.applied) == 0: |
944 self.ui.write("No patches applied\n") | 946 self.ui.write("No patches applied\n") |