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.

hgext/bugzilla.py

@@ -367,7 +367,7 b' class bugzilla(object):'
         mapfile = self.ui.config('bugzilla', 'style')
         tmpl = self.ui.config('bugzilla', 'template')
         t = cmdutil.changeset_templater(self.ui, self.repo,
-                                        False, mapfile, False)
+                                        False, None, mapfile, False)
         if not mapfile and not tmpl:
             tmpl = _('changeset {node|short} in repo {root} refers '
                      'to bug {bug}.\ndetails:\n\t{desc|tabindent}')

hgext/churn.py

@@ -15,7 +15,7 b' import time, datetime'
 def maketemplater(ui, repo, tmpl):
     tmpl = templater.parsestring(tmpl, quoted=False)
     try:
-        t = cmdutil.changeset_templater(ui, repo, False, None, False)
+        t = cmdutil.changeset_templater(ui, repo, False, None, None, False)
     except SyntaxError, inst:
         raise util.Abort(inst.args[0])
     t.use_template(tmpl)

hgext/hgcia.py

@@ -188,7 +188,8 b' class hgcia(object):'
         if not template:
             template = self.diffstat and self.dstemplate or self.deftemplate
         template = templater.parsestring(template, quoted=False)
-        t = cmdutil.changeset_templater(self.ui, self.repo, False, style, False)
+        t = cmdutil.changeset_templater(self.ui, self.repo, False, None,
+                                        style, False)
         t.use_template(template)
         self.templater = t
 

hgext/keyword.py

@@ -137,7 +137,7 b' class kwtemplater(object):'
 
         templatefilters.filters['utcdate'] = utcdate
         self.ct = cmdutil.changeset_templater(self.ui, self.repo,
-                                              False, '', False)
+                                              False, None, '', False)
 
     def substitute(self, data, path, ctx, subfunc):
         '''Replaces keywords in data with expanded template.'''

hgext/notify.py

@@ -113,7 +113,7 b' class notifier(object):'
         template = (self.ui.config('notify', hooktype) or
                     self.ui.config('notify', 'template'))
         self.t = cmdutil.changeset_templater(self.ui, self.repo,
-                                             False, mapfile, False)
+                                             False, None, mapfile, False)
         if not mapfile and not template:
             template = deftemplates.get(hooktype) or single_template
         if template:

mercurial/cmdutil.py

@@ -569,11 +569,12 b' def service(opts, parentfn=None, initfn='
 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 b' class changeset_printer(object):'
         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 b' class changeset_printer(object):'
 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 b' def show_changeset(ui, repo, opts, buffe'
                            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"""

mercurial/commands.py

@@ -3001,6 +3001,7 b' templateopts = ['
 
 logopts = [
     ('p', 'patch', None, _('show patch')),
+    ('',  'git', None, _('use git extended diff format')),
     ('l', 'limit', '', _('limit number of changes displayed')),
     ('M', 'no-merges', None, _('do not show merges')),
 ] + templateopts
@@ -3391,6 +3392,7 b' table = {'
     "tip":
         (tip,
          [('p', 'patch', None, _('show patch')),
+          ('',  'git', None, _('use git extended diff format')),
          ] + templateopts,
          _('[-p]')),
     "unbundle":

tests/test-incoming-outgoing

@@ -21,6 +21,8 b' hg -R new incoming test'
 hg -R new incoming -r 4 test
 echo "% limit to 2 changesets"
 hg -R new incoming -l 2 test
+echo "% limit to 2 changesets, test with -p --git"
+hg -R new incoming -l 2 -p --git test
 
 # test with --bundle
 http_proxy= hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'

tests/test-incoming-outgoing.out

@@ -163,6 +163,32 b' user: test'
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
+% limit to 2 changesets, test with -p --git
+comparing with test
+changeset:   0:9cb21d99fe27
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     0
+
+diff --git a/foo b/foo
+new file mode 100644
+--- /dev/null
++++ b/foo
+@@ -0,0 +1,1 @@
++0
+
+changeset:   1:d717f5dfad6a
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     1
+
+diff --git a/foo b/foo
+--- a/foo
++++ b/foo
+@@ -1,1 +1,2 @@
+ 0
++1
+
 comparing with http://localhost/
 changeset:   0:9cb21d99fe27
 user:        test

tests/test-log

@@ -95,6 +95,9 b' hg log --follow-first'
 echo % log -P 2
 hg log -P 2
 
+echo '% log -r tip -p --git'
+hg log -r tip -p --git
+
 echo '% log -r ""'
 hg log -r ''
 

tests/test-log.out

@@ -221,6 +221,20 b' user: test'
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
+% log -r tip -p --git
+changeset:   6:2404bbcab562
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     b1.1
+
+diff --git a/b1 b/b1
+--- a/b1
++++ b/b1
+@@ -1,1 +1,2 @@
+ b1
++postm
+
 % log -r ""
 abort: 00changelog.i@: ambiguous identifier!
 % log -r <some unknown node id>