##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

https: support tls sni (server name indication) for https urls (issue3090)...
https: support tls sni (server name indication) for https urls (issue3090) SNI is a common way of sharing servers across multiple domains using separate SSL certificates. As of Python 2.7.9 SSLContext has been backported from Python 3. This patch changes sslutil's ssl_wrap_socket to use SSLContext and take a server hostname as and argument. It also changes the url module to make use of this argument. The new code for 2.7.9 achieves it's task by attempting to get the SSLContext object from the ssl module. If this fails the try/except goes back to what was there before with the exception that the ssl_wrap_socket functions take a server_hostname argument that doesn't get used. Assuming the SSLContext exists, the arguments to wrap_socket at the module level are emulated on the SSLContext. The SSLContext is initialized with the specified ssl_version. If certfile is not None load_cert_chain is called with certfile and keyfile. keyfile being None is not a problem, load_cert_chain will simply expect the private key to be in the certificate file. verify_mode is set to cert_reqs. If ca_certs is not None load_verify_locations is called with ca_certs as the cafile. Finally the wrap_socket method of the SSLContext is called with the socket and server hostname. Finally, this fails test-check-commit-hg.t because the "new" function ssl_wrap_socket has underscores in its names and underscores in its arguments. All the underscore identifiers are taken from the other functions and as such can't be changed to match naming conventions.
Mads Kiilerich - - Load All Authors

File last commit:

r23749:a387b039 default
r23834:bf07c19b default
Show More
test-rebase-mq-skip.t
188 lines | 3.7 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-mq-skip.t
History | Annotation | Raw |Copy content |Copy permalink
This emulates the effects of an hg pull --rebase in which the remote repo
already has one local mq patch
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
> mq=
>
> [phases]
> publish=False
>
> [alias]
> tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
> EOF
$ hg init a
$ cd a
$ hg qinit -c
$ echo c1 > c1
$ hg add c1
$ hg ci -m C1
$ echo r1 > r1
$ hg add r1
$ hg ci -m R1
$ hg up -q 0
$ hg qnew p0.patch -d '1 0'
$ echo p0 > p0
$ hg add p0
$ hg qref -m P0
$ hg qnew p1.patch -d '2 0'
$ echo p1 > p1
$ hg add p1
$ hg qref -m P1
$ hg export qtip > p1.patch
$ hg up -q -C 1
$ hg import p1.patch
applying p1.patch
$ rm p1.patch
$ hg up -q -C qtip
$ hg rebase -v
rebasing 2:13a46ce44f60 "P0" (p0.patch qbase)
resolving manifests
removing p0
getting r1
resolving manifests
getting p0
committing files:
p0
committing manifest
committing changelog
rebasing 3:148775c71080 "P1" (p1.patch qtip)
resolving manifests
note: rebase of 3:148775c71080 created no changes to commit
rebase merging completed
updating mq patch p0.patch to 5:9ecc820b1737
$TESTTMP/a/.hg/patches/p0.patch (glob)
2 changesets found
uncompressed size of bundle content:
344 (changelog)
284 (manifests)
109 p0
109 p1
saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob)
2 changesets found
uncompressed size of bundle content:
399 (changelog)
284 (manifests)
109 p0
109 p1
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
1 revisions have been skipped
$ hg tglog
@ 3: 'P0' tags: p0.patch qbase qtip tip
|
o 2: 'P1' tags: qparent
|
o 1: 'R1' tags:
|
o 0: 'C1' tags:
$ cd ..
$ hg init b
$ cd b
$ hg qinit -c
$ for i in r0 r1 r2 r3 r4 r5 r6;
> do
> echo $i > $i
> hg ci -Am $i
> done
adding r0
adding r1
adding r2
adding r3
adding r4
adding r5
adding r6
$ hg qimport -r 1:tip
$ hg up -q 0
$ for i in r1 r3 r7 r8;
> do
> echo $i > $i
> hg ci -Am branch2-$i
> done
adding r1
created new head
adding r3
adding r7
adding r8
$ echo somethingelse > r4
$ hg ci -Am branch2-r4
adding r4
$ echo r6 > r6
$ hg ci -Am branch2-r6
adding r6
$ hg up -q qtip
$ HGMERGE=internal:fail hg rebase
rebasing 1:b4bffa6e4776 "r1" (1.diff qbase)
note: rebase of 1:b4bffa6e4776 created no changes to commit
rebasing 2:c0fd129beb01 "r2" (2.diff)
rebasing 3:6ff5b8feed8e "r3" (3.diff)
note: rebase of 3:6ff5b8feed8e created no changes to commit
rebasing 4:094320fec554 "r4" (4.diff)
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ HGMERGE=internal:local hg resolve --all
(no more unresolved files)
$ hg rebase --continue
already rebased 1:b4bffa6e4776 "r1" (1.diff qbase) as 057f55ff8f44
already rebased 2:c0fd129beb01 "r2" (2.diff) as 1660ab13ce9a
already rebased 3:6ff5b8feed8e "r3" (3.diff) as 1660ab13ce9a
rebasing 4:094320fec554 "r4" (4.diff)
note: rebase of 4:094320fec554 created no changes to commit
rebasing 5:681a378595ba "r5" (5.diff)
rebasing 6:512a1f24768b "r6" (6.diff qtip)
note: rebase of 6:512a1f24768b created no changes to commit
saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-backup.hg (glob)
$ hg tglog
@ 8: 'r5' tags: 5.diff qtip tip
|
o 7: 'r2' tags: 2.diff qbase
|
o 6: 'branch2-r6' tags: qparent
|
o 5: 'branch2-r4' tags:
|
o 4: 'branch2-r8' tags:
|
o 3: 'branch2-r7' tags:
|
o 2: 'branch2-r3' tags:
|
o 1: 'branch2-r1' tags:
|
o 0: 'r0' tags:
$ cd ..