Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/mercurial/patches/magic.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 196 816e398e992c
child 3596 042f4e7a6dbe
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
     1
 
--- 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 
     2
 
+++ 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 
     3
 
@@ -1,4 +1,4 @@
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     4
 
-#!/usr/bin/env python
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     5
 
+#!/usr/bin/python2.6
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     6
 
 #
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
     7
 
 # 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 
     8
 
 #
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
     9
 
--- mercurial-1.8.2/contrib/convert-repo.orig	Fri Apr  1 10:41:52 2011
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    10
 
+++ mercurial-1.8.2/contrib/convert-repo	Fri Apr  1 11:11:01 2011
151
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    11
 
@@ -1,4 +1,4 @@
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    12
 
-#!/usr/bin/env python
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    13
 
+#!/usr/bin/python2.6
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    14
 
 #
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    15
 
 # Wrapper script around the convert.py hgext extension
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    16
 
 # for foreign SCM conversion to mercurial format.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    17
 
--- 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 
    18
 
+++ 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 
    19
 
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    20
 
-#!/usr/bin/env python
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    21
 
+#!/usr/bin/python2.6
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    22
 
 # Dump revlogs as raw data stream
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    23
 
 # $ 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 
    24
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    25
 
--- 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 
    26
 
+++ 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 
    27
 
@@ -1,4 +1,4 @@
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    28
 
-#!/usr/bin/env python
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    29
 
+#!/usr/bin/python2.6
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    30
 
 #
f9e42a3f7095 7030982 hgk is delivered 444, breaks 'hg view'
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    31
 
 # 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 
    32
 
 #
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    33
 
--- 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 
    34
 
+++ 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 
    35
 
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    36
 
-#!/usr/bin/env python
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    37
 
+#!/usr/bin/python2.6
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    38
 
 #
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    39
 
 # 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 
    40
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    41
 
--- 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 
    42
 
+++ 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 
    43
 
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    44
 
-#!/usr/bin/env python
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    45
 
+#!/usr/bin/python2.6
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    46
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    47
 
 from mercurial import demandimport
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    48
 
 demandimport.enable()
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    49
 
--- 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 
    50
 
+++ 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 
    51
 
@@ -1,4 +1,4 @@
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    52
 
-#!/usr/bin/env python
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    53
 
+#!/usr/bin/python2.6
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    54
 
 # Undump a dump from dumprevlog
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    55
 
 # $ hg init
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 151
diff changeset 
    56
 
 # $ undumprevlog < repo.dump
upstream/oracle/userland-gate