upstream/mercurial-mirror Files · tests/test-nested-repo.t

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Siddharth Agarwal - - Load All Authors

File last commit:

r19124:4cdec37f default


                r41198:0101a35d

default

Download file

             test-nested-repo.t
        
                    44 lines
            
             | 559 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-nested-repo.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init a

        $ cd a

        $ hg init b

        $ echo x > b/x

      Should print nothing:

        $ hg add b

        $ hg st

        Siddharth Agarwal
    
test-nested-repo.t: touch another file inside nested repo...

              r19124
            
        $ echo y > b/y

        $ hg st

        Adrian Buehlmann
    
combine tests

              r12279
            
      Should fail:

        $ hg st b/x

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        abort: path 'b/x' is inside nested repo 'b'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg add b/x

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        abort: path 'b/x' is inside nested repo 'b'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
      Should fail:

        $ hg add b b/x

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        abort: path 'b/x' is inside nested repo 'b'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg st

      Should arguably print nothing:

        $ hg st b

        $ echo a > a

        $ hg ci -Ama a

      Should fail:

        $ hg mv a b

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        abort: path 'b/a' is inside nested repo 'b'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg st

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Adrian Buehlmann combine tests	r12279	$ hg init a
		$ cd a
		$ hg init b
		$ echo x > b/x

		Should print nothing:

		$ hg add b
		$ hg st

Siddharth Agarwal test-nested-repo.t: touch another file inside nested repo...	r19124	$ echo y > b/y
		$ hg st

Adrian Buehlmann combine tests	r12279	Should fail:

		$ hg st b/x
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	abort: path 'b/x' is inside nested repo 'b'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg add b/x
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	abort: path 'b/x' is inside nested repo 'b'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279
		Should fail:

		$ hg add b b/x
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	abort: path 'b/x' is inside nested repo 'b'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg st

		Should arguably print nothing:

		$ hg st b

		$ echo a > a
		$ hg ci -Ama a

		Should fail:

		$ hg mv a b
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	abort: path 'b/a' is inside nested repo 'b'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg st

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..