components/mercurial/patches/magic.patch
author pkidd <patrick.kidd@oracle.com>
Fri, 14 Oct 2016 09:29:30 -0700
branchs11u3-sru
changeset 7110 eef24b4f8a52
parent 3984 03ec35f09e5b
permissions -rw-r--r--
Added tag 0.175.3.14.0.2.0, S11.3SRU14.2 for changeset 698485941206
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
     1
The status of this patch is unknown.
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
     2
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
     3
--- mercurial-1.8.2/contrib/check-code.py.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
     4
+++ mercurial-1.8.2/contrib/check-code.py	Fri Apr  1 11:10:58 2011
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     5
@@ -1,4 +1,4 @@
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     6
-#!/usr/bin/env python
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
     7
+#!/usr/bin/python2.7
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     8
 #
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
     9
 # check-code - a style and portability checker for Mercurial
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    10
 #
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    11
--- mercurial-1.8.2/contrib/dumprevlog.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    12
+++ mercurial-1.8.2/contrib/dumprevlog	Fri Apr  1 11:11:03 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    13
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    14
-#!/usr/bin/env python
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
    15
+#!/usr/bin/python2.7
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    16
 # Dump revlogs as raw data stream
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    17
 # $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    18
 
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    19
--- mercurial-1.8.2/contrib/hg-ssh.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    20
+++ mercurial-1.8.2/contrib/hg-ssh	Fri Apr  1 11:11:05 2011
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    21
@@ -1,4 +1,4 @@
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    22
-#!/usr/bin/env python
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
    23
+#!/usr/bin/python2.7
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    24
 #
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    25
 # Copyright 2005-2007 by Intevation GmbH <[email protected]>
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    26
 #
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    27
--- mercurial-1.8.2/contrib/hgweb.fcgi.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    28
+++ mercurial-1.8.2/contrib/hgweb.fcgi	Fri Apr  1 11:11:07 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    29
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    30
-#!/usr/bin/env python
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
    31
+#!/usr/bin/python2.7
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    32
 #
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    33
 # An example FastCGI script for use with flup, edit as necessary
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    34
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    35
--- mercurial-1.8.2/contrib/simplemerge.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    36
+++ mercurial-1.8.2/contrib/simplemerge	Fri Apr  1 11:11:08 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    37
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    38
-#!/usr/bin/env python
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
    39
+#!/usr/bin/python2.7
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    40
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    41
 from mercurial import demandimport
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    42
 demandimport.enable()
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    43
--- mercurial-1.8.2/contrib/undumprevlog.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    44
+++ mercurial-1.8.2/contrib/undumprevlog	Fri Apr  1 11:11:10 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    45
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    46
-#!/usr/bin/env python
3984
03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move
John Beck <John.Beck@Oracle.COM>
parents: 3748
diff changeset
    47
+#!/usr/bin/python2.7
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    48
 # Undump a dump from dumprevlog
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    49
 # $ hg init
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset
    50
 # $ undumprevlog < repo.dump