upstream/mercurial-mirror Files · tests/test-patch.t

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.

Greg Ward - - Load All Authors

File last commit:

r15194:0705f2ac default


                r21195:9336bc7d

stable

Download file

             test-patch.t
        
                    89 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-patch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > patchtool.py <<EOF

        > import sys

        > print 'Using custom patch'

        > if '--binary' in sys.argv:

        >     print '--binary found !'

        > EOF

        $ echo "[ui]" >> $HGRCPATH

        $ echo "patch=python ../patchtool.py" >> $HGRCPATH

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg commit -Ama -d '1 0'

        adding a

        $ echo b >> a

        $ hg commit -Amb -d '2 0'

        $ cd ..

      This test checks that:

       - custom patch commands with arguments actually work

       - patch code does not try to add weird arguments like

       --binary when custom patch commands are used. For instance

       --binary is added by default under win32.

      check custom patch options are honored

        $ hg --cwd a export -o ../a.diff tip

        $ hg clone -r 0 a b

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg --cwd b import -v ../a.diff

        applying ../a.diff

        Using custom patch

        applied to working directory

      Issue2417: hg import with # comments in description

      Prepare source repo and patch:

        $ rm $HGRCPATH

        $ hg init c

        $ cd c

        $ printf "a\rc" > a

        $ hg ci -A -m 0 a -d '0 0'

        $ printf "a\rb\rc" > a

        $ cat << eof > log

        > first line which can't start with '# '

        > # second line is a comment but that shouldn't be a problem.

        > A patch marker like this was more problematic even after d7452292f9d3:

        > # HG changeset patch

        > # User lines looks like this - but it _is_ just a comment

        > eof

        $ hg ci -l log -d '0 0'

        $ hg export -o p 1

        $ cd ..

      Clone and apply patch:

        $ hg clone -r 0 c d

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd d

        $ hg import ../c/p

        applying ../c/p

        $ hg log -v -r 1

        changeset:   1:cd0bde79c428

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        files:       a

        description:

        first line which can't start with '# '

        # second line is a comment but that shouldn't be a problem.

        A patch marker like this was more problematic even after d7452292f9d3:

        # HG changeset patch

        # User lines looks like this - but it _is_ just a comment

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ cat > patchtool.py <<EOF
				> import sys
				> print 'Using custom patch'
				> if '--binary' in sys.argv:
				> print '--binary found !'
				> EOF

				$ echo "[ui]" >> $HGRCPATH
				$ echo "patch=python ../patchtool.py" >> $HGRCPATH

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg commit -Ama -d '1 0'
				adding a
				$ echo b >> a
				$ hg commit -Amb -d '2 0'
				$ cd ..

				This test checks that:
				- custom patch commands with arguments actually work
				- patch code does not try to add weird arguments like
				--binary when custom patch commands are used. For instance
				--binary is added by default under win32.

				check custom patch options are honored

				$ hg --cwd a export -o ../a.diff tip
				$ hg clone -r 0 a b
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg --cwd b import -v ../a.diff
				applying ../a.diff
				Using custom patch
				applied to working directory

				Issue2417: hg import with # comments in description

				Prepare source repo and patch:

				$ rm $HGRCPATH
				$ hg init c
				$ cd c
				$ printf "a\rc" > a
				$ hg ci -A -m 0 a -d '0 0'
				$ printf "a\rb\rc" > a
				$ cat << eof > log
				> first line which can't start with '# '
				> # second line is a comment but that shouldn't be a problem.
				> A patch marker like this was more problematic even after d7452292f9d3:
				> # HG changeset patch
				> # User lines looks like this - but it _is_ just a comment
				> eof
				$ hg ci -l log -d '0 0'
				$ hg export -o p 1
				$ cd ..

				Clone and apply patch:

				$ hg clone -r 0 c d
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd d
				$ hg import ../c/p
				applying ../c/p
				$ hg log -v -r 1
				changeset: 1:cd0bde79c428
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				files: a
				description:
				first line which can't start with '# '
				# second line is a comment but that shouldn't be a problem.
				A patch marker like this was more problematic even after d7452292f9d3:
				# HG changeset patch
				# User lines looks like this - but it _is_ just a comment


				$ cd ..