[96485] trunk/dports/devel/mercurial

[deric at macports.org]

Revision: 96485
          https://trac.macports.org/changeset/96485
Author:   deric at macports.org
Date:     2012-08-11 08:53:41 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
mercurial: patch port for thrown exception on remote clones with --update, (#35497, issue 3578 upstream).

Modified Paths:
--------------
    trunk/dports/devel/mercurial/Portfile

Added Paths:
-----------
    trunk/dports/devel/mercurial/files/patch-hg.py.diff
    trunk/dports/devel/mercurial/files/patch-test-http.t.diff

Modified: trunk/dports/devel/mercurial/Portfile
===================================================================
--- trunk/dports/devel/mercurial/Portfile	2012-08-11 11:34:46 UTC (rev 96484)
+++ trunk/dports/devel/mercurial/Portfile	2012-08-11 15:53:41 UTC (rev 96485)
@@ -6,6 +6,7 @@
 
 name                mercurial
 version             2.3
+revision            1
 categories          devel python
 license             GPL-2+
 maintainers         deric
@@ -31,7 +32,9 @@
                     sha256  456cb8a9fb15606a04d81589a3459d258149170008ca64c62e5a6cbaf5f0fe5f
 depends_run         port:curl-ca-bundle
 
-patchfiles          patch-setup.py.diff
+patchfiles          patch-setup.py.diff \
+                    patch-hg.py.diff \
+                    patch-test-http.t.diff
 
 python.default_version 27
 

Added: trunk/dports/devel/mercurial/files/patch-hg.py.diff
===================================================================
--- trunk/dports/devel/mercurial/files/patch-hg.py.diff	                        (rev 0)
+++ trunk/dports/devel/mercurial/files/patch-hg.py.diff	2012-08-11 15:53:41 UTC (rev 96485)
@@ -0,0 +1,11 @@
+--- mercurial/hg.py
++++ mercurial/hg.py
+@@ -398,7 +398,7 @@
+ 
+             if update:
+                 if update is not True:
+-                    checkout = srcrepo.lookup(update)
++                    checkout = srcpeer.lookup(update)
+                 for test in (checkout, 'default', 'tip'):
+                     if test is None:
+                         continue
\ No newline at end of file

Added: trunk/dports/devel/mercurial/files/patch-test-http.t.diff
===================================================================
--- trunk/dports/devel/mercurial/files/patch-test-http.t.diff	                        (rev 0)
+++ trunk/dports/devel/mercurial/files/patch-test-http.t.diff	2012-08-11 15:53:41 UTC (rev 96485)
@@ -0,0 +1,76 @@
+--- tests/test-http.t
++++ tests/test-http.t
+@@ -77,6 +77,24 @@
+   adding bar
+   $ cd ..
+ 
++clone over http with --update
++
++  $ hg clone http://localhost:$HGPORT1/ updated --update 0
++  requesting all changes
++  adding changesets
++  adding manifests
++  adding file changes
++  added 2 changesets with 5 changes to 5 files
++  updating to branch default
++  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
++  $ hg log -r . -R updated
++  changeset:   0:8b6053c928fe
++  user:        test
++  date:        Thu Jan 01 00:00:00 1970 +0000
++  summary:     1
++  
++  $ rm -rf updated
++
+ incoming via HTTP
+ 
+   $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
+@@ -129,7 +147,7 @@
+   >     if not auth:
+   >         raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who',
+   >                 [('WWW-Authenticate', 'Basic Realm="mercurial"')])
+-  >     if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']: 
++  >     if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']:
+   >         raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no')
+   > def extsetup():
+   >     common.permhooks.insert(0, perform_authentication)
+@@ -138,24 +156,24 @@
+   >    --config server.preferuncompressed=True
+   $ cat pid >> $DAEMON_PIDS
+ 
+-  $ hg id http://localhost:$HGPORT2/  
++  $ hg id http://localhost:$HGPORT2/
+   abort: http authorization required
+   [255]
+-  $ hg id http://user@localhost:$HGPORT2/ 
++  $ hg id http://user@localhost:$HGPORT2/
+   abort: http authorization required
+   [255]
+   $ hg id http://user:pass@localhost:$HGPORT2/
+   5fed3813f7f5
+-  $ echo '[auth]' >> .hg/hgrc 
++  $ echo '[auth]' >> .hg/hgrc
+   $ echo 'l.schemes=http' >> .hg/hgrc
+   $ echo 'l.prefix=lo' >> .hg/hgrc
+   $ echo 'l.username=user' >> .hg/hgrc
+   $ echo 'l.password=pass' >> .hg/hgrc
+-  $ hg id http://localhost:$HGPORT2/ 
++  $ hg id http://localhost:$HGPORT2/
+   5fed3813f7f5
+-  $ hg id http://localhost:$HGPORT2/  
++  $ hg id http://localhost:$HGPORT2/
+   5fed3813f7f5
+-  $ hg id http://user@localhost:$HGPORT2/ 
++  $ hg id http://user@localhost:$HGPORT2/
+   5fed3813f7f5
+   $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
+   streaming all changes
+@@ -164,7 +182,7 @@
+   updating to branch default
+   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 
+-  $ hg id http://user2@localhost:$HGPORT2/ 
++  $ hg id http://user2@localhost:$HGPORT2/
+   abort: http authorization required
+   [255]
+   $ hg id http://user:pass2@localhost:$HGPORT2/
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120811/9eb5a14b/attachment.html>