haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update mercurial to 2.2 and prune the old versions.

Browse Source
This commit is contained in:
Chris Roberts
2012-05-03 03:44:07 +00:00
parent 9bc1758dc5
commit 53e0280107
19 changed files with 18 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff
View File

@@ -1,24 +0,0 @@
diff -urN mercurial-1.0.2/mercurial/bdiff.c mercurial-1.0.2-haiku/mercurial/bdiff.c
--- mercurial-1.0.2/mercurial/bdiff.c 2008-08-13 22:11:47.000000000 +0000
+++ mercurial-1.0.2-haiku/mercurial/bdiff.c 2008-09-09 15:43:50.000000000 +0000
@@ -34,7 +34,7 @@
}
#else
#include <sys/types.h>
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
#include <ByteOrder.h>
#else
#include <arpa/inet.h>
diff -urN mercurial-1.0.2/mercurial/mpatch.c mercurial-1.0.2-haiku/mercurial/mpatch.c
--- mercurial-1.0.2/mercurial/mpatch.c 2008-08-13 22:11:47.000000000 +0000
+++ mercurial-1.0.2-haiku/mercurial/mpatch.c 2008-09-09 15:44:29.000000000 +0000
@@ -52,7 +52,7 @@
#else
/* not windows */
# include <sys/types.h>
-# ifdef __BEOS__
+# if defined __BEOS__ && !defined __HAIKU__
# include <ByteOrder.h>
# else
# include <arpa/inet.h>

12
dev-vcs/mercurial/patches/mercurial-1.5.1.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.5.1/mercurial/ui.py.orig mercurial-1.5.1/mercurial/ui.py
--- mercurial-1.5.1/mercurial/ui.py.orig 2010-04-30 23:51:42.741605376 -0600
+++ mercurial-1.5.1/mercurial/ui.py 2010-04-30 23:52:08.309854208 -0600
@@ -384,7 +384,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-1.5.2.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.5.2/mercurial/ui.py.orig mercurial-1.5.2/mercurial/ui.py
--- mercurial-1.5.2/mercurial/ui.py.orig 2010-05-01 15:02:48.041156608 -0600
+++ mercurial-1.5.2/mercurial/ui.py 2010-05-01 17:04:56.068943872 -0600
@@ -384,7 +384,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-1.5.3.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.5.3/mercurial/ui.py.orig mercurial-1.5.3/mercurial/ui.py
--- mercurial-1.5.3/mercurial/ui.py.orig 2010-05-13 10:30:46.037224448 -0600
+++ mercurial-1.5.3/mercurial/ui.py 2010-05-13 17:58:50.218890240 -0600
@@ -384,7 +384,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-1.6.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.6/mercurial/ui.py.orig mercurial-1.6/mercurial/ui.py
--- mercurial-1.6/mercurial/ui.py.orig 2010-07-01 11:06:27.030670848 -0600
+++ mercurial-1.6/mercurial/ui.py 2010-07-01 11:41:21.504365056 -0600
@@ -557,7 +557,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-1.7.3.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.7.3/mercurial/ui.py.orig mercurial-1.7.3/mercurial/ui.py
--- mercurial-1.7.3/mercurial/ui.py.orig 2010-07-01 11:06:27.030670848 -0600
+++ mercurial-1.7.3/mercurial/ui.py 2010-07-01 11:41:21.504365056 -0600
@@ -557,7 +557,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-1.8.3.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.8.3/mercurial/ui.py.orig mercurial-1.8.3/mercurial/ui.py
--- mercurial-1.8.3/mercurial/ui.py.orig 2011-05-01 04:57:56.062128128 -0600
+++ mercurial-1.8.3/mercurial/ui.py 2011-05-04 13:08:44.669515776 -0600
@@ -580,7 +580,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-1.9.patch
View File

@@ -1,12 +0,0 @@
diff -up mercurial-1.9/mercurial/ui.py.orig mercurial-1.9/mercurial/ui.py
--- mercurial-1.9/mercurial/ui.py.orig 2011-07-01 12:54:23.057933824 -0600
+++ mercurial-1.9/mercurial/ui.py 2011-07-02 12:23:10.208666624 -0600
@@ -656,7 +656,7 @@ class ui(object):
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "nano"))
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message

12
dev-vcs/mercurial/patches/mercurial-2.2.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -up mercurial-2.2/mercurial/ui.py.orig mercurial-2.2/mercurial/ui.py
--- mercurial-2.2/mercurial/ui.py.orig 2012-05-02 21:41:24.391643136 -0600
+++ mercurial-2.2/mercurial/ui.py 2012-05-02 21:42:15.730595328 -0600
@@ -693,7 +693,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
- editor = 'vi'
+ editor = 'nano'
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or