##// 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.
Mads Kiilerich - - Load All Authors

File last commit:

r18543:c8ba98bf default
r21195:9336bc7d stable
Show More
test-merge-prompt.t
142 lines | 3.2 KiB | text/troff | Tads3Lexer
/ tests / test-merge-prompt.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
 r12328 Test for
b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
(issue897)
840e2b315c1f: Fix misleading error and prompts during update/merge
(issue556)
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259
$ status() {
> echo "--- status ---"
> hg st -A file1 file2
> for file in file1 file2; do
> if [ -f $file ]; then
> echo "--- $file ---"
> cat $file
> else
> echo "*** $file does not exist"
> fi
> done
> }
$ hg init
$ echo 1 > file1
$ echo 2 > file2
$ hg ci -Am 'added file1 and file2'
adding file1
adding file2
$ hg rm file1
$ echo changed >> file2
$ hg ci -m 'removed file1, changed file2'
$ hg co 0
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg ci -m 'changed file1, removed file2'
created new head
Non-interactive merge:
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg merge -y
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt...
 r18543 local changed file1 which remote deleted
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 use (c)hanged version or (d)elete? c
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ status
--- status ---
M file2
C file1
--- file1 ---
1
changed
--- file2 ---
2
changed
Interactive merge:
$ hg co -C
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg merge --config ui.interactive=true <<EOF
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 > c
> d
> EOF
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt...
 r18543 local changed file1 which remote deleted
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ status
--- status ---
Mads Kiilerich
tests: hide 'No such file or directory' messages...
 r15521 file2: * (glob)
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 C file1
--- file1 ---
1
changed
*** file2 does not exist
Interactive merge with bad input:
$ hg co -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg merge --config ui.interactive=true <<EOF
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 > foo
> bar
> d
> baz
> c
> EOF
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt...
 r18543 local changed file1 which remote deleted
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 use (c)hanged version or (d)elete? unrecognized response
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt...
 r18543 local changed file1 which remote deleted
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 use (c)hanged version or (d)elete? unrecognized response
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt...
 r18543 local changed file1 which remote deleted
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? unrecognized response
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ status
--- status ---
M file2
R file1
*** file1 does not exist
--- file2 ---
2
changed
Interactive merge with not enough input:
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg merge --config ui.interactive=true <<EOF
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 > d
> EOF
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt...
 r18543 local changed file1 which remote deleted
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? abort: response expected
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 [255]
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259
$ status
--- status ---
Mads Kiilerich
tests: hide 'No such file or directory' messages...
 r15521 file2: * (glob)
Adrian Buehlmann
tests: unify test-merge-prompt
 r12259 C file1
--- file1 ---
1
changed
*** file2 does not exist