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

largefiles: factor out procedures to update lfdirstate for post-committing...

largefiles: factor out procedures to update lfdirstate for post-committing Before this patch, procedures to update lfdirstate for post-committing are scattered in "lfilesrepo.commit". In the case of "hg commit" with patterns for target files ("Case 2"), lfdirstate is updated BEFORE real committing. This patch factors out procedures to update lfdirstate for post-committing into "lfutil.markcommitted", and makes it callable via "markcommitted" of the context passed to "lfilesrepo.commitctx". "markcommitted" of the context is called, only when it is committed successfully. Passing original "markcommitted" of the context is meaningless in this patch, but required in subsequent one to prepare something before invocation of it.

Matt Mackall - - Load All Authors

File last commit:

r19510:8b190adb stable


                r23184:3100d1cb

default

Download file

             test-issue660.t
        
                    154 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue660.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue660 and:

      http://mercurial.selenic.com/bts/issue322

        $ hg init

        $ echo a > a

        $ mkdir b

        $ echo b > b/b

        $ hg commit -A -m "a is file, b is dir"

        adding a

        adding b/b

      File replaced with directory:

        $ rm a

        $ mkdir a

        $ echo a > a/a

      Should fail - would corrupt dirstate:

        $ hg add a/a

        abort: file 'a' in dirstate clashes with 'a/a'

        [255]

      Removing shadow:

        $ hg rm --after a

      Should succeed - shadow removed:

        $ hg add a/a

      Directory replaced with file:

        $ rm -r b

        $ echo b > b

      Should fail - would corrupt dirstate:

        $ hg add b

        abort: directory 'b' already in dirstate

        [255]

      Removing shadow:

        $ hg rm --after b/b

      Should succeed - shadow removed:

        $ hg add b

      Look what we got:

        $ hg st

        A a/a

        A b

        R a

        R b/b

      Revert reintroducing shadow - should fail:

        $ rm -r a b

        $ hg revert b/b

        abort: file 'b' in dirstate clashes with 'b/b'

        [255]

      Revert all - should succeed:

        $ hg revert --all

        undeleting a

        forgetting a/a (glob)

        forgetting b

        undeleting b/b (glob)

        $ hg st

      Issue3423:

        $ hg forget a

        $ echo zed > a

        $ hg revert a

        $ hg st

        ? a.orig

        $ rm a.orig

      addremove:

        $ rm -r a b

        $ mkdir a

        $ echo a > a/a

        $ echo b > b

        $ hg addremove -s 0

        removing a

        adding a/a

        adding b

        removing b/b

        $ hg st

        A a/a

        A b

        R a

        R b/b

      commit:

        $ hg ci -A -m "a is dir, b is file"

        $ hg st --all

        C a/a

        C b

      Long directory replaced with file:

        $ mkdir d

        $ mkdir d/d

        $ echo d > d/d/d

        $ hg commit -A -m "d is long directory"

        adding d/d/d

        $ rm -r d

        $ echo d > d

      Should fail - would corrupt dirstate:

        $ hg add d

        abort: directory 'd' already in dirstate

        [255]

      Removing shadow:

        $ hg rm --after d/d/d

      Should succeed - shadow removed:

        $ hg add d

        $ hg ci -md

      Update should work at least with clean working directory:

        $ rm -r a b d

        $ hg up -r 0

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

        $ hg st --all

        C a

        C b/b

        $ rm -r a b

        $ hg up -r 1

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

        $ hg st --all

        C a/a

        C b

	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

				http://mercurial.selenic.com/bts/issue660 and:
				http://mercurial.selenic.com/bts/issue322

				$ hg init
				$ echo a > a
				$ mkdir b
				$ echo b > b/b
				$ hg commit -A -m "a is file, b is dir"
				adding a
				adding b/b

				File replaced with directory:

				$ rm a
				$ mkdir a
				$ echo a > a/a

				Should fail - would corrupt dirstate:

				$ hg add a/a
				abort: file 'a' in dirstate clashes with 'a/a'
				[255]

				Removing shadow:

				$ hg rm --after a

				Should succeed - shadow removed:

				$ hg add a/a

				Directory replaced with file:

				$ rm -r b
				$ echo b > b

				Should fail - would corrupt dirstate:

				$ hg add b
				abort: directory 'b' already in dirstate
				[255]

				Removing shadow:

				$ hg rm --after b/b

				Should succeed - shadow removed:

				$ hg add b

				Look what we got:

				$ hg st
				A a/a
				A b
				R a
				R b/b

				Revert reintroducing shadow - should fail:

				$ rm -r a b
				$ hg revert b/b
				abort: file 'b' in dirstate clashes with 'b/b'
				[255]

				Revert all - should succeed:

				$ hg revert --all
				undeleting a
				forgetting a/a (glob)
				forgetting b
				undeleting b/b (glob)

				$ hg st

				Issue3423:

				$ hg forget a
				$ echo zed > a
				$ hg revert a
				$ hg st
				? a.orig
				$ rm a.orig

				addremove:

				$ rm -r a b
				$ mkdir a
				$ echo a > a/a
				$ echo b > b

				$ hg addremove -s 0
				removing a
				adding a/a
				adding b
				removing b/b

				$ hg st
				A a/a
				A b
				R a
				R b/b

				commit:

				$ hg ci -A -m "a is dir, b is file"
				$ hg st --all
				C a/a
				C b

				Long directory replaced with file:

				$ mkdir d
				$ mkdir d/d
				$ echo d > d/d/d
				$ hg commit -A -m "d is long directory"
				adding d/d/d

				$ rm -r d
				$ echo d > d

				Should fail - would corrupt dirstate:

				$ hg add d
				abort: directory 'd' already in dirstate
				[255]

				Removing shadow:

				$ hg rm --after d/d/d

				Should succeed - shadow removed:

				$ hg add d
				$ hg ci -md

				Update should work at least with clean working directory:

				$ rm -r a b d
				$ hg up -r 0
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg st --all
				C a
				C b/b

				$ rm -r a b
				$ hg up -r 1
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg st --all
				C a/a
				C b