Commits

Dan Villiom Podlaski Christiansen committed 745e71c

New patches.

Comments (0)

Files changed (6)

27-branch.diff

-# HG changeset patch
-# Date 1278845041 -7200
-# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
-# Parent 951844e383e80aa6f9d940d98d5a589deed8927d
-Add 2.7 branch to branchmap.
-
-diff --git a/branchmap.txt b/branchmap.txt
---- a/branchmap.txt
-+++ b/branchmap.txt
-@@ -1,6 +1,7 @@
- release31-maint = 3.1.x
- py3k = 3.x
- release26-maint = 2.6.x
-+release27-maint = 2.7.x
- py3k-dtoa = 
- py3k-jit = 
- py3k-cdecimal =

branchmap-no-empty.diff

-# HG changeset patch
-# Date 1278845076 -7200
-# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
-# Parent cfdb08c2be64c9facd754902effa36d1ad43ec63
-Comment out empty definitions from the branchmap.
-
-diff --git a/branchmap.txt b/branchmap.txt
---- a/branchmap.txt
-+++ b/branchmap.txt
-@@ -2,147 +2,147 @@ release31-maint = 3.1.x
- py3k = 3.x
- release26-maint = 2.6.x
- release27-maint = 2.7.x
--py3k-dtoa = 
--py3k-jit = 
--py3k-cdecimal =
--sslopts-4870 = 
--siginterrupt-reset-issue8354 =
--asyncore-tests-issue8490 =
--signalfd-issue8407 =
--py3k-issue4970 =
-+#py3k-dtoa =
-+#py3k-jit =
-+#py3k-cdecimal =
-+#sslopts-4870 =
-+#siginterrupt-reset-issue8354 =
-+#asyncore-tests-issue8490 =
-+#signalfd-issue8407 =
-+#py3k-issue4970 =
- release30-maint = 3.0.x
- release25-maint = 2.5.x
- release24-maint = 2.4.x
--tarek_sysconfig = 
--pep-0384 =
--pep-0383 =
--pep370 = 
--tk_and_idle_maintenance =
--multiprocessing-autoconf =
--tlee-ast-optimize =
--empty =
--py3k-urllib =
--tnelson-trunk-bsddb-47-upgrade =
--py3k-importlib =
-+#tarek_sysconfig =
-+#pep-0384 =
-+#pep-0383 =
-+#pep370 =
-+#tk_and_idle_maintenance =
-+#multiprocessing-autoconf =
-+#tlee-ast-optimize =
-+#empty =
-+#py3k-urllib =
-+#tnelson-trunk-bsddb-47-upgrade =
-+#py3k-importlib =
- release23-maint = 2.3.x
--py3k-importhook = 
--ctypes-branch = 
--decimal-branch = 
--bcannon-objcap = 
--amk-mailbox = 
--twouters-dictviews-backport =
--bcannon-sandboxing =
-+#py3k-importhook =
-+#ctypes-branch =
-+#decimal-branch =
-+#bcannon-objcap =
-+#amk-mailbox =
-+#twouters-dictviews-backport =
-+#bcannon-sandboxing =
- release22-maint = 2.2.x
--theller_modulefinder = 
--hoxworth-stdlib_logging-soc = 
--tim-exc_sanity = 
--IDLE-syntax-branch =
--jim-doctest =
--release23-branch = 
--jim-modulator = 
-+#theller_modulefinder =
-+#hoxworth-stdlib_logging-soc =
-+#tim-exc_sanity =
-+#IDLE-syntax-branch =
-+#jim-doctest =
-+#release23-branch =
-+#jim-modulator =
- release21-maint = 2.1.x
--indexing-cleanup-branch = 
--r23c1-branch = 
--r23b2-branch = 
--anthony-parser-branch = 
--r23b1-branch = 
--idlefork-merge-branch = 
--getargs_mask_mods = 
--cache-attr-branch = 
--folding-reimpl-branch = 
--r23a2-branch = 
--bsddb-bsddb3-schizo-branch = 
--r23a1-branch = 
--py-cvs-vendor-branch = 
--DS_RPC_BRANCH = 
--SourceForge = 
--release22-branch = 
--r22rc1-branch = 
--r22b2-branch = 
--r22b1-branch = 
--r22a4-branch = 
--r22a3-branch = 
--r22a2-branch = 
-+#indexing-cleanup-branch =
-+#r23c1-branch =
-+#r23b2-branch =
-+#anthony-parser-branch =
-+#r23b1-branch =
-+#idlefork-merge-branch =
-+#getargs_mask_mods =
-+#cache-attr-branch =
-+#folding-reimpl-branch =
-+#r23a2-branch =
-+#bsddb-bsddb3-schizo-branch =
-+#r23a1-branch =
-+#py-cvs-vendor-branch =
-+#DS_RPC_BRANCH =
-+#SourceForge =
-+#release22-branch =
-+#r22rc1-branch =
-+#r22b2-branch =
-+#r22b1-branch =
-+#r22a4-branch =
-+#r22a3-branch =
-+#r22a2-branch =
- release20-maint = 2.0.x
--r161-branch = 
--cnri-16-start = 
--universal-33 =
--None = 
--avendor = 
--Distutils_0_1_3-branch = 
--release152p1-patches = 
--string_methods = 
--PYIDE = 
--OSAM = 
--PYTHONSCRIPT = 
--BBPY = 
--jar = 
--alpha100 = 
--unlabeled-2.36.4 =
--unlabeled-2.1.4 =
--unlabeled-2.25.4 = 
--branch_libffi-3_0_10-win = 
--py3k-issue1717 = 
--iter-branch = 
--py3k-short-float-repr = 
--gen-branch = 
--descr-branch = 
--ast-branch = 
--ast-objects = 
--ast-arena = 
--p3yk_no_args_on_exc = 
--io-c = 
--benjaminp-testing = 
--fix-test-ftplib = 
--trunk-math = 
--py3k-grandrenaming = 
--okkoto-sizeof = 
--py3k-ctypes-pep3118 =
--trunk-bytearray = 
--libffi3-branch = 
--alex-py3k =
--cpy_merge =
--py3k-pep3137 =
--../ctypes-branch =
--pep302_phase2 =
--py3k-buffer =
--p3yk-noslice =
--py3k-struni =
-+#r161-branch =
-+#cnri-16-start =
-+#universal-33 =
-+#None =
-+#avendor =
-+#Distutils_0_1_3-branch =
-+#release152p1-patches =
-+#string_methods =
-+#PYIDE =
-+#OSAM =
-+#PYTHONSCRIPT =
-+#BBPY =
-+#jar =
-+#alpha100 =
-+#unlabeled-2.36.4 =
-+#unlabeled-2.1.4 =
-+#unlabeled-2.25.4 =
-+#branch_libffi-3_0_10-win =
-+#py3k-issue1717 =
-+#iter-branch =
-+#py3k-short-float-repr =
-+#gen-branch =
-+#descr-branch =
-+#ast-branch =
-+#ast-objects =
-+#ast-arena =
-+#p3yk_no_args_on_exc =
-+#io-c =
-+#benjaminp-testing =
-+#fix-test-ftplib =
-+#trunk-math =
-+#py3k-grandrenaming =
-+#okkoto-sizeof =
-+#py3k-ctypes-pep3118 =
-+#trunk-bytearray =
-+#libffi3-branch =
-+#alex-py3k =
-+#cpy_merge =
-+#py3k-pep3137 =
-+#../ctypes-branch =
-+#pep302_phase2 =
-+#py3k-buffer =
-+#p3yk-noslice =
-+#py3k-struni =
- p3yk = 3.x
--int_unification = 
--unlabeled-2.9.2 = 
--unlabeled-1.5.4 = 
--unlabeled-1.1.2 = 
--unlabeled-1.1.1 = 
--unlabeled-2.9.4 = 
--unlabeled-2.10.2 = 
--unlabeled-2.1.2 = 
--unlabeled-2.108.2 = 
--unlabeled-2.36.2 = 
--unlabeled-2.54.2 = 
--unlabeled-1.3.2 = 
--unlabeled-1.23.4 = 
--unlabeled-2.25.2 = 
--unlabeled-1.2.2 = 
--unlabeled-1.5.2 = 
--unlabeled-1.98.2 = 
--unlabeled-2.16.2 = 
--unlabeled-2.3.2 = 
--unlabeled-1.9.2 = 
--unlabeled-1.8.2 =
--aimacintyre-sf1454481 =
--tim-current_frames = 
--bippolito-newstruct = 
--runar-longslice-branch = 
--steve-notracing = 
--rjones-funccall = 
--sreifschneider-newnewexcept = 
--tim-doctest-branch = 
--blais-bytebuf = 
--../bippolito-newstruct = 
--rjones-prealloc = 
--sreifschneider-64ints = 
--stdlib-cleanup = 
--ssize_t = 
--sqlite-integration = 
--tim-obmalloc =
-+#int_unification =
-+#unlabeled-2.9.2 =
-+#unlabeled-1.5.4 =
-+#unlabeled-1.1.2 =
-+#unlabeled-1.1.1 =
-+#unlabeled-2.9.4 =
-+#unlabeled-2.10.2 =
-+#unlabeled-2.1.2 =
-+#unlabeled-2.108.2 =
-+#unlabeled-2.36.2 =
-+#unlabeled-2.54.2 =
-+#unlabeled-1.3.2 =
-+#unlabeled-1.23.4 =
-+#unlabeled-2.25.2 =
-+#unlabeled-1.2.2 =
-+#unlabeled-1.5.2 =
-+#unlabeled-1.98.2 =
-+#unlabeled-2.16.2 =
-+#unlabeled-2.3.2 =
-+#unlabeled-1.9.2 =
-+#unlabeled-1.8.2 =
-+#aimacintyre-sf1454481 =
-+#tim-current_frames =
-+#bippolito-newstruct =
-+#runar-longslice-branch =
-+#steve-notracing =
-+#rjones-funccall =
-+#sreifschneider-newnewexcept =
-+#tim-doctest-branch =
-+#blais-bytebuf =
-+#../bippolito-newstruct =
-+#rjones-prealloc =
-+#sreifschneider-64ints =
-+#stdlib-cleanup =
-+#ssize_t =
-+#sqlite-integration =
-+#tim-obmalloc =

branchmap-renaming.diff

+# HG changeset patch
+# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
+# Date 1279101377 -7200
+# Node ID 0761affd12a0c5edc774e50d4b2e80e4bb3ac082
+# Parent 0539b1ff3fb1f4574a1769e26c781c08c755d0b8
+Not all branches belong on `default'.
+
+The py3k-* branches are put on the 3.x branch. Some release branches
+are renamed to match the maintenance branches.
+
+A few empty lines have also been inserted to make the groupings
+clearer.
+
+diff --git a/branchmap.txt b/branchmap.txt
+--- a/branchmap.txt
++++ b/branchmap.txt
+@@ -1,5 +1,3 @@
+-py3k = 3.x
+-p3yk = 3.x
+ release31-maint = 3.1.x
+ release30-maint = 3.0.x
+ release27-maint = 2.7.x
+@@ -10,14 +8,47 @@ release23-maint = 2.3.x
+ release22-maint = 2.2.x
+ release21-maint = 2.1.x
+ release20-maint = 2.0.x
+-py3k-dtoa = default
+-py3k-jit = default
+-py3k-cdecimal = default
++
++release152p1-patches = 1.5.x
++cnri-16-start = 1.6.x
++r161-branch = 1.6.x
++release22-branch = 2.2.x
++r22a2-branch = 2.2.x
++r22a3-branch = 2.2.x
++r22a4-branch = 2.2.x
++r22b1-branch = 2.2.x
++r22b2-branch = 2.2.x
++r22rc1-branch = 2.2.x
++release23-branch = 2.3.x
++r23a1-branch = 2.3.x
++r23a2-branch = 2.3.x
++r23b1-branch = 2.3.x
++r23b2-branch = 2.3.x
++r23c1-branch = 2.3.x
++
++p3yk = 3.x
++py3k = 3.x
++p3yk-noslice = 3.x
++p3yk_no_args_on_exc = 3.x
++py3k-buffer = 3.x
++py3k-cdecimal = 3.x
++py3k-ctypes-pep3118 = 3.x
++py3k-dtoa = 3.x
++py3k-grandrenaming = 3.x
++py3k-importhook = 3.x
++py3k-importlib = 3.x
++py3k-issue1717 = 3.x
++py3k-issue4970 = 3.x
++py3k-jit = 3.x
++py3k-pep3137 = 3.x
++py3k-short-float-repr = 3.x
++py3k-struni = 3.x
++py3k-urllib = 3.x
++
+ sslopts-4870 = default
+ siginterrupt-reset-issue8354 = default
+ asyncore-tests-issue8490 = default
+ signalfd-issue8407 = default
+-py3k-issue4970 = default
+ tarek_sysconfig = default
+ pep-0384 = default
+ pep-0383 = default
+@@ -26,10 +57,7 @@ tk_and_idle_maintenance = default
+ multiprocessing-autoconf = default
+ tlee-ast-optimize = default
+ empty = default
+-py3k-urllib = default
+ tnelson-trunk-bsddb-47-upgrade = default
+-py3k-importlib = default
+-py3k-importhook = default
+ ctypes-branch = default
+ decimal-branch = default
+ bcannon-objcap = default
+@@ -41,37 +69,21 @@ hoxworth-stdlib_logging-soc = default
+ tim-exc_sanity = default
+ IDLE-syntax-branch = default
+ jim-doctest = default
+-release23-branch = default
+ jim-modulator = default
+ indexing-cleanup-branch = default
+-r23c1-branch = default
+-r23b2-branch = default
+ anthony-parser-branch = default
+-r23b1-branch = default
+ idlefork-merge-branch = default
+ getargs_mask_mods = default
+ cache-attr-branch = default
+ folding-reimpl-branch = default
+-r23a2-branch = default
+ bsddb-bsddb3-schizo-branch = default
+-r23a1-branch = default
+ py-cvs-vendor-branch = default
+ DS_RPC_BRANCH = default
+ SourceForge = default
+-release22-branch = default
+-r22rc1-branch = default
+-r22b2-branch = default
+-r22b1-branch = default
+-r22a4-branch = default
+-r22a3-branch = default
+-r22a2-branch = default
+-r161-branch = default
+-cnri-16-start = default
+ universal-33 = default
+ None = default
+ avendor = default
+ Distutils_0_1_3-branch = default
+-release152p1-patches = default
+ string_methods = default
+ PYIDE = default
+ OSAM = default
+@@ -83,32 +95,23 @@ unlabeled-2.36.4 = default
+ unlabeled-2.1.4 = default
+ unlabeled-2.25.4 = default
+ branch_libffi-3_0_10-win = default
+-py3k-issue1717 = default
+ iter-branch = default
+-py3k-short-float-repr = default
+ gen-branch = default
+ descr-branch = default
+ ast-branch = default
+ ast-objects = default
+ ast-arena = default
+-p3yk_no_args_on_exc = default
+ io-c = default
+ benjaminp-testing = default
+ fix-test-ftplib = default
+ trunk-math = default
+-py3k-grandrenaming = default
+ okkoto-sizeof = default
+-py3k-ctypes-pep3118 = default
+ trunk-bytearray = default
+ libffi3-branch = default
+ alex-py3k = default
+ cpy_merge = default
+-py3k-pep3137 = default
+ ../ctypes-branch = default
+ pep302_phase2 = default
+-py3k-buffer = default
+-p3yk-noslice = default
+-py3k-struni = default
+ int_unification = default
+ unlabeled-2.9.2 = default
+ unlabeled-1.5.4 = default

handle-cvs2svn.diff

+# HG changeset patch
+# Parent ad59f13297028bda47b63423e564fc1ad067b72f
+# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
+Actually map the author of cvs2svn-generated commits.
+
+
+diff --git a/author-map b/author-map
+--- a/author-map
++++ b/author-map
+@@ -208,3 +208,4 @@ vsajip = Vinay Sajip <vinay_sajip@yahoo.
+ walter.doerwald = Walter Dörwald <walter@livinglogic.de>
+ warsaw = Barry Warsaw <barry@python.org>
+ ziga.seilnacht = Žiga Seilnacht <ziga.seilnacht@gmail.com>
++None = cvs2svn <tools@python.org>
+# HG changeset patch
+# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
+# Date 1279101202 -7200
+# Node ID a2ac578215b46e7b7950b2db07516a95b50d3f83
+# Parent 13c91ceb8146774b4ab6fd9bcf03ae1f1f5a1a3f
+Identify a few `unknown' authors.
+
+Taken from the URL below. The remaining, unidentified names have been
+changed to retain the uid* string, so we don't throw away information.
+
+http://mail.python.org/pipermail/python-committers/2009-July/000553.html
+
+diff --git a/author-map b/author-map
+--- a/author-map
++++ b/author-map
+@@ -195,13 +195,13 @@ travis.oliphant = Travis E. Oliphant <ol
+ trent.mick = Trent Mick <trentm@activestate.com>
+ trent.nelson = Trent Nelson <trent.nelson@snakebite.org>
+ twouters = Thomas Wouters <thomas@python.org>
+-uid22967 = unknown <tools@python.org>
+-uid26747 = unknown <tools@python.org>
+-uid28957 = unknown <tools@python.org>
+-uid33605 = unknown <tools@python.org>
+-uid34174 = unknown <tools@python.org>
+-uid35364 = unknown <tools@python.org>
+-uid56795 = unknown <tools@python.org>
++uid22967 = Tim Peters <tim.peters@gmail.com>
++uid26747 = uid26747 <tools@python.org>
++uid28957 = Sjoerd Mullender <sjoerd@acm.org>
++uid33605 = uid33605 <tools@python.org>
++uid34174 = uid34174 <tools@python.org>
++uid35364 = uid35364 <tools@python.org>
++uid56795 = Kurt B. Kaiser <kbk@shore.net>
+ victor.stinner = Victor Stinner <victor.stinner@haypocalc.com>
+ vinay.sajip = Vinay Sajip <vinay_sajip@yahoo.co.uk>
+ vsajip = Vinay Sajip <vinay_sajip@yahoo.co.uk>
-27-branch.diff
-branchmap-no-empty.diff
+branchmap-renaming.diff
+less-uids.diff
+handle-cvs2svn.diff
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.