upstream/mercurial-mirror Files · tests/test-narrow-update.t

log: fix crash on empty revision with --copies switch...

log: fix crash on empty revision with --copies switch If a revset is empty, .max() raises ValueError. I don't see any reason to recompute the revs, so I made it reuse the one returned by logcmdutil.getrevs(). If no revs specified by command line, the endrev will be smartset.spanset(repo) + 1, which is basically the same as len(repo), the default of getrenamedfn(). If --follow specified, revs.max() points to the working parent, which seems more correct.

Gregory Szorc - - Load All Authors

File last commit:

r37301:d4e62df1 default


                r37794:141017c7

default

Download file

             test-narrow-update.t
        
                    76 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . "$TESTDIR/narrow-library.sh"

      create full repo

        $ hg init master

        $ cd master

        $ echo init > init

        $ hg ci -Aqm 'initial'

        $ mkdir inside

        $ echo inside > inside/f1

        $ mkdir outside

        $ echo outside > outside/f1

        $ hg ci -Aqm 'add inside and outside'

        $ echo modified > inside/f1

        $ hg ci -qm 'modify inside'

        $ echo modified > outside/f1

        $ hg ci -qm 'modify outside'

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master narrow --include inside

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 4 changesets with 2 changes to 1 files

        new changesets *:* (glob)

        updating to branch default

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

        $ cd narrow

        $ hg debugindex -c

           rev linkrev nodeid       p1           p2

             0       0 9958b1af2add 000000000000 000000000000

             1       1 2db4ce2a3bfe 9958b1af2add 000000000000

             2       2 0980ee31a742 2db4ce2a3bfe 000000000000

             3       3 4410145019b7 0980ee31a742 000000000000

        $ hg update -q 0

      Can update to revision with changes inside

        $ hg update -q 'desc("add inside and outside")'

        $ hg update -q 'desc("modify inside")'

        $ find *

        inside

        inside/f1

        $ cat inside/f1

        modified

      Can update to revision with changes outside

        $ hg update -q 'desc("modify outside")'

        $ find *

        inside

        inside/f1

        $ cat inside/f1

        modified

      Can update with a deleted file inside

        $ hg rm inside/f1

        $ hg update -q 'desc("modify inside")'

        $ hg update -q 'desc("modify outside")'

        $ hg update -q 'desc("initial")'

        $ hg update -q 'desc("modify inside")'

      Can update with a moved file inside

        $ hg mv inside/f1 inside/f2

        $ hg update -q 'desc("modify outside")'

        $ hg update -q 'desc("initial")'

        $ hg update -q 'desc("modify inside")'

	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


				$ . "$TESTDIR/narrow-library.sh"

				create full repo

				$ hg init master
				$ cd master
				$ echo init > init
				$ hg ci -Aqm 'initial'

				$ mkdir inside
				$ echo inside > inside/f1
				$ mkdir outside
				$ echo outside > outside/f1
				$ hg ci -Aqm 'add inside and outside'

				$ echo modified > inside/f1
				$ hg ci -qm 'modify inside'

				$ echo modified > outside/f1
				$ hg ci -qm 'modify outside'

				$ cd ..

				$ hg clone --narrow ssh://user@dummy/master narrow --include inside
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 4 changesets with 2 changes to 1 files
				new changesets : (glob)
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd narrow
				$ hg debugindex -c
				rev linkrev nodeid p1 p2
				0 0 9958b1af2add 000000000000 000000000000
				1 1 2db4ce2a3bfe 9958b1af2add 000000000000
				2 2 0980ee31a742 2db4ce2a3bfe 000000000000
				3 3 4410145019b7 0980ee31a742 000000000000

				$ hg update -q 0

				Can update to revision with changes inside

				$ hg update -q 'desc("add inside and outside")'
				$ hg update -q 'desc("modify inside")'
				$ find *
				inside
				inside/f1
				$ cat inside/f1
				modified

				Can update to revision with changes outside

				$ hg update -q 'desc("modify outside")'
				$ find *
				inside
				inside/f1
				$ cat inside/f1
				modified

				Can update with a deleted file inside

				$ hg rm inside/f1
				$ hg update -q 'desc("modify inside")'
				$ hg update -q 'desc("modify outside")'
				$ hg update -q 'desc("initial")'
				$ hg update -q 'desc("modify inside")'

				Can update with a moved file inside

				$ hg mv inside/f1 inside/f2
				$ hg update -q 'desc("modify outside")'
				$ hg update -q 'desc("initial")'
				$ hg update -q 'desc("modify inside")'