upstream/mercurial-mirror Files · tests/test-impexp-branch.t

dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657)...

dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657) There are make targets for building mercurial packages for various distributions using docker. One of the preparation steps before building is to create inside the docker image a user with the same uid/gid as the current user on the host system, so that the resulting files have appropriate ownership/permissions. It's possible to run `make docker-<distro>` as a user with uid or gid that is already present in a vanilla docker container of that distibution. For example, issue4657 is about failing to build fedora packages as a user with uid=999 and gid=999 because these ids are already used in fedora, and groupadd fails. useradd would fail too, if the flow ever got to it (and there was a user with such uid already). A straightforward (maybe too much) way to fix this is to allow non-unique uid and gid for the new user and group that get created inside the image. I'm not sure of the implications of this, but marmoute encouraged me to try and send this patch for stable.

Matt Mackall - - Load All Authors

File last commit:

r22485:efedda4a default


                r26888:271a8020

stable

Download file

             test-impexp-branch.t
        
                    81 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-impexp-branch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo '[extensions]' >> $HGRCPATH

        $ echo 'strip =' >> $HGRCPATH

        $ 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

        $ 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

        (branches are permanent and global, did you want a bookmark?)

        $ echo "Rev  2" >rev

        $ hg commit -m "With branch."

        $ hg export 0 > ../r0.patch

        $ hg export 1 > ../r1.patch

        $ cd ..

        $ if python findbranch.py < r0.patch; then

        >     echo "Export of default branch revision has Branch header" 1>&2

        >     exit 1

        > fi

        $ if python findbranch.py < r1.patch; then

        >     :  # 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

        $ hg import ../r0.patch

        applying ../r0.patch

        $ hg import ../r1.patch

        applying ../r1.patch

        $ cd ..

        $ hg init c

        $ cd c

        $ hg import --exact --no-commit ../r0.patch

        applying ../r0.patch

        warning: can't check exact import with --no-commit

        $ hg st

        A rev

        $ hg revert -a

        forgetting rev

        $ rm rev

        $ hg import --exact ../r0.patch

        applying ../r0.patch

        $ hg import --exact ../r1.patch

        applying ../r1.patch

      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

        $ 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

				$ echo '[extensions]' >> $HGRCPATH
				$ echo 'strip =' >> $HGRCPATH

				$ 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

				$ 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
				(branches are permanent and global, did you want a bookmark?)
				$ echo "Rev 2" >rev
				$ hg commit -m "With branch."

				$ hg export 0 > ../r0.patch
				$ hg export 1 > ../r1.patch
				$ cd ..

				$ if python findbranch.py < r0.patch; then
				> echo "Export of default branch revision has Branch header" 1>&2
				> exit 1
				> fi

				$ if python findbranch.py < r1.patch; then
				> : # 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
				$ hg import ../r0.patch
				applying ../r0.patch
				$ hg import ../r1.patch
				applying ../r1.patch
				$ cd ..

				$ hg init c
				$ cd c
				$ hg import --exact --no-commit ../r0.patch
				applying ../r0.patch
				warning: can't check exact import with --no-commit
				$ hg st
				A rev
				$ hg revert -a
				forgetting rev
				$ rm rev
				$ hg import --exact ../r0.patch
				applying ../r0.patch
				$ hg import --exact ../r1.patch
				applying ../r1.patch

				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

				$ cd ..