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

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

cmdserver: forcibly use L channel to read password input (issue3161)...
cmdserver: forcibly use L channel to read password input (issue3161) Command server is designed to use the channel protocol even if the server process is accessible to tty, whereas vanilla hg should be able to read password from tty in that case. So it isn't enough to swap sys.stdin: # works only if the server process is detached from the console sys.stdin = self.fin getpass.getpass('') sys.stdin = oldin or test isatty: # vanilla hg can't talk to tty if stdin is redirected if self._isatty(self.fin): return getpass.getpass('') else: ... Since ui.nontty flag is undocumented and command-server channels don't provide isatty(), this change won't affect the other uses of ui._isatty(). issue3161 also suggests to provide some context of messages. I think it can be implemented by using the generic templating function.
Martin Geisler - - Load All Authors

File last commit:

r20115:db6b958c default
r21195:9336bc7d stable
Show More
test-impexp-branch.t
73 lines | 1.7 KiB | text/troff | Tads3Lexer
/ tests / test-impexp-branch.t
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
patch: be more tolerant with "Parent" header (issue3356)...
 r16475 $ echo '[extensions]' >> $HGRCPATH
Martin Geisler
tests: use strip extension instead of mq where it makes sense...
 r20115 $ echo 'strip =' >> $HGRCPATH
Patrick Mezard
patch: be more tolerant with "Parent" header (issue3356)...
 r16475
Nicolas Dumazet
tests: unify test-impexp-branch
 r12119 $ cat >findbranch.py <<EOF
> import re, sys
>
> head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')
>
> for line in sys.stdin:
> hmatch = head_re.match(line)
> if not hmatch:
> sys.exit(1)
> if hmatch.group(1) == 'Branch':
> sys.exit(0)
> sys.exit(1)
> EOF
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
 r14126
Nicolas Dumazet
tests: unify test-impexp-branch
 r12119 $ hg init a
$ cd a
$ echo "Rev 1" >rev
$ hg add rev
$ hg commit -m "No branch."
$ hg branch abranch
marked working directory as branch abranch
Matt Mackall
branch: warn on branching
 r15615 (branches are permanent and global, did you want a bookmark?)
Nicolas Dumazet
tests: unify test-impexp-branch
 r12119 $ echo "Rev 2" >rev
$ hg commit -m "With branch."
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
 r14126
$ hg export 0 > ../r0.patch
$ hg export 1 > ../r1.patch
$ cd ..
$ if python findbranch.py < r0.patch; then
Nicolas Dumazet
tests: unify test-impexp-branch
 r12119 > echo "Export of default branch revision has Branch header" 1>&2
> exit 1
> fi
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
 r14126
$ if python findbranch.py < r1.patch; then
Nicolas Dumazet
tests: unify test-impexp-branch
 r12119 > : # Do nothing
> else
> echo "Export of branch revision is missing Branch header" 1>&2
> exit 1
> fi
Make sure import still works with branch information in patches.
$ hg init b
$ cd b
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
 r14126 $ hg import ../r0.patch
applying ../r0.patch
$ hg import ../r1.patch
applying ../r1.patch
Nicolas Dumazet
tests: unify test-impexp-branch
 r12119 $ cd ..
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
 r14126
$ hg init c
$ cd c
$ hg import --exact ../r0.patch
applying ../r0.patch
$ hg import --exact ../r1.patch
applying ../r1.patch
Patrick Mezard
patch: be more tolerant with "Parent" header (issue3356)...
 r16475
Test --exact and patch header separators (issue3356)
$ hg strip --no-backup .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>>> import re
>>> p = file('../r1.patch', 'rb').read()
>>> p = re.sub(r'Parent\s+', 'Parent ', p)
>>> file('../r1-ws.patch', 'wb').write(p)
$ hg import --exact ../r1-ws.patch
applying ../r1-ws.patch
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..