Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 7762:fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
No short -g form, since it would conflict with -g from the graphlog extension.
| author | Jim Correia <jim.correia@pobox.com> |
|---|---|
| date | Sat, 14 Feb 2009 22:40:39 +0100 |
| parents | bd5c37d792e6 |
| children | e899ead7b8ae |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Feb 14 01:07:44 2009 +0100 +++ b/mercurial/cmdutil.py Sat Feb 14 22:40:39 2009 +0100 @@ -569,11 +569,12 @@ class changeset_printer(object): '''show changeset information when templating not requested.''' - def __init__(self, ui, repo, patch, buffered): + def __init__(self, ui, repo, patch, diffopts, buffered): self.ui = ui self.repo = repo self.buffered = buffered self.patch = patch + self.diffopts = diffopts self.header = {} self.hunk = {} self.lastheader = None @@ -670,7 +671,7 @@ if self.patch: prev = self.repo.changelog.parents(node)[0] chunks = patch.diff(self.repo, prev, node, match=self.patch, - opts=patch.diffopts(self.ui)) + opts=patch.diffopts(self.ui, self.diffopts)) for chunk in chunks: self.ui.write(chunk) self.ui.write("\n") @@ -694,8 +695,8 @@ class changeset_templater(changeset_printer): '''format changeset information.''' - def __init__(self, ui, repo, patch, mapfile, buffered): - changeset_printer.__init__(self, ui, repo, patch, buffered) + def __init__(self, ui, repo, patch, diffopts, mapfile, buffered): + changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) filters = templatefilters.filters.copy() filters['formatnode'] = (ui.debugflag and (lambda x: x) or (lambda x: x[:12])) @@ -912,12 +913,12 @@ or templater.templatepath(mapfile)) if mapname: mapfile = mapname try: - t = changeset_templater(ui, repo, patch, mapfile, buffered) + t = changeset_templater(ui, repo, patch, opts, mapfile, buffered) except SyntaxError, inst: raise util.Abort(inst.args[0]) if tmpl: t.use_template(tmpl) return t - return changeset_printer(ui, repo, patch, buffered) + return changeset_printer(ui, repo, patch, opts, buffered) def finddate(ui, repo, date): """Find the tipmost changeset that matches the given date spec"""