upstream/mercurial-mirror Files · tests/test-bad-extension.t

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Martin Geisler - - Load All Authors

File last commit:

r14286:005a540e default


                r22287:f3ac9677

default

Download file

             test-bad-extension.t
        
                    15 lines
            
             | 518 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bad-extension.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo 'raise Exception("bit bucket overflow")' > badext.py

        $ abspath=`pwd`/badext.py

        $ echo '[extensions]' >> $HGRCPATH

        $ echo "gpg =" >> $HGRCPATH

        $ echo "hgext.gpg =" >> $HGRCPATH

        $ echo "badext = $abspath" >> $HGRCPATH

        $ echo "badext2 =" >> $HGRCPATH

        $ hg -q help help

        *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow

        *** failed to import extension badext2: No module named badext2

        hg help [-ec] [TOPIC]

        show help for a given topic or a help overview

	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 'raise Exception("bit bucket overflow")' > badext.py
				$ abspath=`pwd`/badext.py

				$ echo '[extensions]' >> $HGRCPATH
				$ echo "gpg =" >> $HGRCPATH
				$ echo "hgext.gpg =" >> $HGRCPATH
				$ echo "badext = $abspath" >> $HGRCPATH
				$ echo "badext2 =" >> $HGRCPATH

				$ hg -q help help
				*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
				*** failed to import extension badext2: No module named badext2
				hg help [-ec] [TOPIC]

				show help for a given topic or a help overview