upstream/mercurial-mirror Files · tests/test-subrepo-missing.t

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Matt Harbison - - Load All Authors

File last commit:

r24877:cc497780 stable


                r25590:183965a0

default

Download file

             test-subrepo-missing.t
        
                    109 lines
            
             | 2.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-missing.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

              r13017
            
        $ hg init repo

        $ cd repo

        $ hg init subrepo

        $ echo a > subrepo/a

        $ hg -R subrepo ci -Am adda

        adding a

        $ echo 'subrepo = subrepo' > .hgsub

        $ hg ci -Am addsubrepo

        adding .hgsub

        $ echo b > subrepo/b

        $ hg -R subrepo ci -Am addb

        adding b

        $ hg ci -m updatedsub

        Patrick Mezard
    
subrepo: ignore blank lines in .hgsubstate (issue3424)...

              r16595
            
      ignore blanklines in .hgsubstate

        >>> file('.hgsubstate', 'wb').write('\n\n   \t \n   \n')

        $ hg st --subrepos

        M .hgsubstate

        $ hg revert -qC .hgsubstate

        Patrick Mezard
    
subrepo: do not traceback on .hgsubstate parsing errors...

              r16596
            
      abort more gracefully on .hgsubstate parsing error

        $ cp .hgsubstate .hgsubstate.old

        >>> file('.hgsubstate', 'wb').write('\ninvalid')

        $ hg st --subrepos

        Matt Harbison
    
subrepo: precisely identify the missing subrepo spec file...

              r24645
            
        abort: invalid subrepository revision specifier in '.hgsubstate' line 2

        Patrick Mezard
    
subrepo: do not traceback on .hgsubstate parsing errors...

              r16596
            
        [255]

        $ mv .hgsubstate.old .hgsubstate

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

              r13017
            
      delete .hgsub and revert it

        $ rm .hgsub

        $ hg revert .hgsub

        Matt Harbison
    
subrepo: precisely identify the missing subrepo spec file...

              r24645
            
        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

              r13017
            
      delete .hgsubstate and revert it

        $ rm .hgsubstate

        $ hg revert .hgsubstate

      delete .hgsub and update

        $ rm .hgsub

        $ hg up 0

        Matt Harbison
    
subrepo: precisely identify the missing subrepo spec file...

              r24645
            
        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

              r13017
            
        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st

        Matt Harbison
    
subrepo: precisely identify the missing subrepo spec file...

              r24645
            
        warning: subrepo spec file '.hgsub' not found

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

              r13017
            
        ! .hgsub

        $ ls subrepo

        a

      delete .hgsubstate and update

        $ hg up -C

        Matt Harbison
    
subrepo: precisely identify the missing subrepo spec file...

              r24645
            
        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

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

        $ rm .hgsubstate

        Mads Kiilerich
    
check-code: fix check for trailing whitespace on sh command lines...

              r17345
            
        $ hg up 0

        Patrick Mezard
    
subrepo: handle missing subrepo spec file as removed...

              r13017
            
        remote changed .hgsubstate which local deleted

        use (c)hanged version or leave (d)eleted? c

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st

        $ ls subrepo

        a

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

              r16913
            
        Angel Ezquerra
    
subrepo: make it possible to update to hidden subrepo revisions...

              r20319
            
      Enable obsolete

        $ cat >> $HGRCPATH << EOF

        > [ui]

        > logtemplate= {rev}:{node|short} {desc|firstline}

        > [phases]

        > publish=False

        Durham Goode
    
obsolete: update tests to use obsolete options...

              r22955
            
        > [experimental]

        > evolution=createmarkers

        Angel Ezquerra
    
subrepo: make it possible to update to hidden subrepo revisions...

              r20319
            
        > EOF

      check that we can update parent repo with missing (amended) subrepo revision

        $ hg up --repository subrepo -r tip

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg ci -m "updated subrepo to tip"

        created new head

        $ cd subrepo

        $ hg update -r tip

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

        $ echo foo > a

        $ hg commit --amend -m "addb (amended)"

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

              r16913
            
        $ cd ..

        Angel Ezquerra
    
subrepo: make it possible to update to hidden subrepo revisions...

              r20319
            
        $ hg update --clean .

        revision 102a90ea7b4a in subrepo subrepo is hidden

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        Matt Harbison
    
subrepo: propagate the --hidden option to hg subrepositories...

              r24877
            
      check that --hidden is propagated to the subrepo

        $ hg -R subrepo up tip

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg ci -m 'commit with amended subrepo'

        $ echo bar > subrepo/a

        $ hg -R subrepo ci --amend -m "amend a (again)"

        $ hg --hidden cat subrepo/a

        foo

        Angel Ezquerra
    
subrepo: make it possible to update to hidden subrepo revisions...

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

Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017	$ hg init repo
		$ cd repo
		$ hg init subrepo
		$ echo a > subrepo/a
		$ hg -R subrepo ci -Am adda
		adding a
		$ echo 'subrepo = subrepo' > .hgsub
		$ hg ci -Am addsubrepo
		adding .hgsub
		$ echo b > subrepo/b
		$ hg -R subrepo ci -Am addb
		adding b
		$ hg ci -m updatedsub

Patrick Mezard subrepo: ignore blank lines in .hgsubstate (issue3424)...	r16595	ignore blanklines in .hgsubstate

		>>> file('.hgsubstate', 'wb').write('\n\n \t \n \n')
		$ hg st --subrepos
		M .hgsubstate
		$ hg revert -qC .hgsubstate

Patrick Mezard subrepo: do not traceback on .hgsubstate parsing errors...	r16596	abort more gracefully on .hgsubstate parsing error

		$ cp .hgsubstate .hgsubstate.old
		>>> file('.hgsubstate', 'wb').write('\ninvalid')
		$ hg st --subrepos
Matt Harbison subrepo: precisely identify the missing subrepo spec file...	r24645	abort: invalid subrepository revision specifier in '.hgsubstate' line 2
Patrick Mezard subrepo: do not traceback on .hgsubstate parsing errors...	r16596	[255]
		$ mv .hgsubstate.old .hgsubstate

Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017	delete .hgsub and revert it

		$ rm .hgsub
		$ hg revert .hgsub
Matt Harbison subrepo: precisely identify the missing subrepo spec file...	r24645	warning: subrepo spec file '.hgsub' not found
		warning: subrepo spec file '.hgsub' not found
		warning: subrepo spec file '.hgsub' not found
Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017
		delete .hgsubstate and revert it

		$ rm .hgsubstate
		$ hg revert .hgsubstate

		delete .hgsub and update

		$ rm .hgsub
		$ hg up 0
Matt Harbison subrepo: precisely identify the missing subrepo spec file...	r24645	warning: subrepo spec file '.hgsub' not found
		warning: subrepo spec file '.hgsub' not found
Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg st
Matt Harbison subrepo: precisely identify the missing subrepo spec file...	r24645	warning: subrepo spec file '.hgsub' not found
Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017	! .hgsub
		$ ls subrepo
		a

		delete .hgsubstate and update

		$ hg up -C
Matt Harbison subrepo: precisely identify the missing subrepo spec file...	r24645	warning: subrepo spec file '.hgsub' not found
		warning: subrepo spec file '.hgsub' not found
Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm .hgsubstate
Mads Kiilerich check-code: fix check for trailing whitespace on sh command lines...	r17345	$ hg up 0
Patrick Mezard subrepo: handle missing subrepo spec file as removed...	r13017	remote changed .hgsubstate which local deleted
		use (c)hanged version or leave (d)eleted? c
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg st
		$ ls subrepo
		a
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
Angel Ezquerra subrepo: make it possible to update to hidden subrepo revisions...	r20319	Enable obsolete

		$ cat >> $HGRCPATH << EOF
		> [ui]
		> logtemplate= {rev}:{node\|short} {desc\|firstline}
		> [phases]
		> publish=False
Durham Goode obsolete: update tests to use obsolete options...	r22955	> [experimental]
		> evolution=createmarkers
Angel Ezquerra subrepo: make it possible to update to hidden subrepo revisions...	r20319	> EOF

		check that we can update parent repo with missing (amended) subrepo revision

		$ hg up --repository subrepo -r tip
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg ci -m "updated subrepo to tip"
		created new head
		$ cd subrepo
		$ hg update -r tip
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo foo > a
		$ hg commit --amend -m "addb (amended)"
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..
Angel Ezquerra subrepo: make it possible to update to hidden subrepo revisions...	r20319	$ hg update --clean .
		revision 102a90ea7b4a in subrepo subrepo is hidden
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Matt Harbison subrepo: propagate the --hidden option to hg subrepositories...	r24877	check that --hidden is propagated to the subrepo

		$ hg -R subrepo up tip
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg ci -m 'commit with amended subrepo'
		$ echo bar > subrepo/a
		$ hg -R subrepo ci --amend -m "amend a (again)"
		$ hg --hidden cat subrepo/a
		foo

Angel Ezquerra subrepo: make it possible to update to hidden subrepo revisions...	r20319	$ cd ..