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

largefiles: access to specific fields only if largefiles enabled (issue4547)...

largefiles: access to specific fields only if largefiles enabled (issue4547) Even if largefiles extension is enabled in a repository, "repo" object, which isn't "largefiles.reposetup()"-ed, is passed to overridden functions in the cases below unexpectedly, because extensions are enabled for each repositories strictly. (1) clone without -U: (2) pull with -U: (3) pull with --rebase: combination of "enabled@src", "disabled@dst" and "not-required@src" cause this situation. largefiles requirement @src @dst @src result -------- -------- --------------- -------------------- enabled disabled not-required aborted unexpectedly required requirement error (intentional) -------- -------- --------------- -------------------- enabled enabled * success -------- -------- --------------- -------------------- disabled enabled * success (only for "pull") -------- -------- --------------- -------------------- disabled disabled not-required success required requirement error (intentional) -------- -------- --------------- -------------------- (4) update/revert with a subrepo disabling largefiles In these cases, overridden functions cause accessing to largefiles specific fields of not "largefiles.reposetup()"-ed "repo" object, and execution is aborted. - (1), (2), (4) cause accessing to "_lfstatuswriters" in "getstatuswriter()" invoked via "updatelfiles()" - (3) causes accessing to "_lfcommithooks" in "overriderebase()" For safe accessing to these fields, this patch examines whether passed "repo" object is "largefiles.reposetup()"-ed or not before accessing to them. This patch chooses examining existence of newly introduced "_largefilesenabled" instead of "_lfcommithooks" and "_lfstatuswriters" directly, because the former is better name for the generic "largefiles is enabled in this repo" mark than the latter. In the future, all other overridden functions should avoid largefiles specific processing for efficiency, and "_largefilesenabled" is better also for such purpose. BTW, "lfstatus" can't be used for such purpose, because some code paths set it forcibly regardless of existence of it in specified "repo" object.

Greg Ward - - Load All Authors

File last commit:

r15194:0705f2ac default


                r24158:d414c28d

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 ..