upstream/mercurial-mirror Files · tests/test-resolve.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.

Yuya Nishihara - - Load All Authors

File last commit:

r24127:4cb80026 default


                r24158:d414c28d

stable

Download file

             test-resolve.t
        
                    149 lines
            
             | 3.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-resolve.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test that a commit clears the merge state.

        $ hg init repo

        $ cd repo

        $ echo foo > file1

        $ echo foo > file2

        $ hg commit -Am 'add files'

        adding file1

        adding file2

        $ echo bar >> file1

        $ echo bar >> file2

        $ hg commit -Am 'append bar to files'

      create a second head with conflicting edits

        $ hg up -C 0

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ echo baz >> file1

        $ echo baz >> file2

        $ hg commit -Am 'append baz to files'

        created new head

      create a third head with no conflicting edits

        $ hg up -qC 0

        $ echo foo > file3

        $ hg commit -Am 'add non-conflicting file'

        adding file3

        created new head

      failing merge

        $ hg up -qC 2

        $ hg merge --tool=internal:fail 1

        0 files updated, 0 files merged, 0 files removed, 2 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

      resolve -l should contain unresolved entries

        $ hg resolve -l

        U file1

        U file2

      resolving an unknown path should emit a warning

        $ hg resolve -m does-not-exist

        arguments do not match paths that need resolving

      resolve the failure

        $ echo resolved > file1

        $ hg resolve -m file1

      resolve -l should show resolved file as resolved

        $ hg resolve -l

        R file1

        U file2

      resolve -m without paths should mark all resolved

        $ hg resolve -m

        (no more unresolved files)

        $ hg commit -m 'resolved'

      resolve -l should be empty after commit

        $ hg resolve -l

      resolve --all should abort when no merge in progress

        $ hg resolve --all

        abort: resolve command not applicable when not merging

        [255]

      resolve -m should abort when no merge in progress

        $ hg resolve -m

        abort: resolve command not applicable when not merging

        [255]

      set up conflict-free merge

        $ hg up -qC 3

        $ hg merge 1

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      resolve --all should do nothing in merge without conflicts

        $ hg resolve --all

        (no more unresolved files)

      resolve -m should do nothing in merge without conflicts

        $ hg resolve -m

        (no more unresolved files)

      get back to conflicting state

        $ hg up -qC 2

        $ hg merge --tool=internal:fail 1

        0 files updated, 0 files merged, 0 files removed, 2 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

      resolve without arguments should suggest --all

        $ hg resolve

        abort: no files or directories specified

        (use --all to remerge all files)

        [255]

      resolve --all should re-merge all unresolved files

        $ hg resolve -q --all

        warning: conflicts during merge.

        merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')

        warning: conflicts during merge.

        merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')

        [1]

        $ grep '<<<' file1 > /dev/null

        $ grep '<<<' file2 > /dev/null

      resolve <file> should re-merge file

        $ echo resolved > file1

        $ hg resolve -q file1

        warning: conflicts during merge.

        merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')

        [1]

        $ grep '<<<' file1 > /dev/null

      resolve <file> should do nothing if 'file' was marked resolved

        $ echo resolved > file1

        $ hg resolve -m file1

        $ hg resolve -q file1

        $ cat file1

        resolved

      test crashed merge with empty mergestate

        $ hg up -qC 1

        $ mkdir .hg/merge

        $ touch .hg/merge/state

      resolve -l should be empty

        $ hg resolve -l

        $ 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

				test that a commit clears the merge state.

				$ hg init repo
				$ cd repo

				$ echo foo > file1
				$ echo foo > file2
				$ hg commit -Am 'add files'
				adding file1
				adding file2

				$ echo bar >> file1
				$ echo bar >> file2
				$ hg commit -Am 'append bar to files'

				create a second head with conflicting edits

				$ hg up -C 0
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo baz >> file1
				$ echo baz >> file2
				$ hg commit -Am 'append baz to files'
				created new head

				create a third head with no conflicting edits
				$ hg up -qC 0
				$ echo foo > file3
				$ hg commit -Am 'add non-conflicting file'
				adding file3
				created new head

				failing merge

				$ hg up -qC 2
				$ hg merge --tool=internal:fail 1
				0 files updated, 0 files merged, 0 files removed, 2 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				resolve -l should contain unresolved entries

				$ hg resolve -l
				U file1
				U file2

				resolving an unknown path should emit a warning

				$ hg resolve -m does-not-exist
				arguments do not match paths that need resolving

				resolve the failure

				$ echo resolved > file1
				$ hg resolve -m file1

				resolve -l should show resolved file as resolved

				$ hg resolve -l
				R file1
				U file2

				resolve -m without paths should mark all resolved

				$ hg resolve -m
				(no more unresolved files)
				$ hg commit -m 'resolved'

				resolve -l should be empty after commit

				$ hg resolve -l

				resolve --all should abort when no merge in progress

				$ hg resolve --all
				abort: resolve command not applicable when not merging
				[255]

				resolve -m should abort when no merge in progress

				$ hg resolve -m
				abort: resolve command not applicable when not merging
				[255]

				set up conflict-free merge

				$ hg up -qC 3
				$ hg merge 1
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				resolve --all should do nothing in merge without conflicts
				$ hg resolve --all
				(no more unresolved files)

				resolve -m should do nothing in merge without conflicts

				$ hg resolve -m
				(no more unresolved files)

				get back to conflicting state

				$ hg up -qC 2
				$ hg merge --tool=internal:fail 1
				0 files updated, 0 files merged, 0 files removed, 2 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				resolve without arguments should suggest --all
				$ hg resolve
				abort: no files or directories specified
				(use --all to remerge all files)
				[255]

				resolve --all should re-merge all unresolved files
				$ hg resolve -q --all
				warning: conflicts during merge.
				merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
				warning: conflicts during merge.
				merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')
				[1]
				$ grep '<<<' file1 > /dev/null
				$ grep '<<<' file2 > /dev/null

				resolve <file> should re-merge file
				$ echo resolved > file1
				$ hg resolve -q file1
				warning: conflicts during merge.
				merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
				[1]
				$ grep '<<<' file1 > /dev/null

				resolve <file> should do nothing if 'file' was marked resolved
				$ echo resolved > file1
				$ hg resolve -m file1
				$ hg resolve -q file1
				$ cat file1
				resolved

				test crashed merge with empty mergestate

				$ hg up -qC 1
				$ mkdir .hg/merge
				$ touch .hg/merge/state

				resolve -l should be empty

				$ hg resolve -l

				$ cd ..