components/mercurial/patches/extdiff.patch
author Channappa BV<channappa.vakkalad@oracle.com>
Wed, 20 Jul 2016 03:28:41 -0700
branchs11u3-sru
changeset 6435 c1b087ff0a7e
parent 5721 153e2c170241
permissions -rw-r--r--
23759117 Update timezone data to 2016f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5721
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
Use GNU diff instead of Solaris diff.
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
Solaris diff doesn't understand the -N option, which is part of the default
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
option set.
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
This is a very Solaris-specific patch, and should not be passed upstream.
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
diff --git a/hgext/extdiff.py b/hgext/extdiff.py
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
--- a/hgext/extdiff.py
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
+++ b/hgext/extdiff.py
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
@@ -282,7 +282,7 @@ def extdiff(ui, repo, *pats, **opts):
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
     program = opts.get('program')
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
     option = opts.get('option')
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
     if not program:
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
-        program = 'diff'
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
+        program = 'gdiff'
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
         option = option or ['-Npru']
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
     cmdline = ' '.join(map(util.shellquote, [program] + option))
153e2c170241 23018272 mercurial 3.7.3
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
     return dodiff(ui, repo, cmdline, pats, opts)