upstream/mercurial-mirror Files · tests/test-status-inprocess.py

graft: fix collision detection with origin revisions that are missing...

graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

Nicolas Dumazet - - Load All Authors

File last commit:

r10905:13a1b2fb default


                r22302:9472284d

stable

Download file

             test-status-inprocess.py
        
                    31 lines
            
             | 601 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-status-inprocess.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/python

      from mercurial.ui import ui

      from mercurial.localrepo import localrepository

      from mercurial.commands import add, commit, status

      u = ui()

      print '% creating repo'

      repo = localrepository(u, '.', create=True)

      f = open('test.py', 'w')

      try:

          f.write('foo\n')

      finally:

          f.close

      print '% add and commit'

      add(u, repo, 'test.py')

      commit(u, repo, message='*')

      status(u, repo, clean=True)

      print '% change'

      f = open('test.py', 'w')

      try:

          f.write('bar\n')

      finally:

          f.close()

      # this would return clean instead of changed before the fix

      status(u, repo, clean=True, modified=True)

	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

				#!/usr/bin/python
				from mercurial.ui import ui
				from mercurial.localrepo import localrepository
				from mercurial.commands import add, commit, status

				u = ui()

				print '% creating repo'
				repo = localrepository(u, '.', create=True)

				f = open('test.py', 'w')
				try:
				f.write('foo\n')
				finally:
				f.close

				print '% add and commit'
				add(u, repo, 'test.py')
				commit(u, repo, message='*')
				status(u, repo, clean=True)


				print '% change'
				f = open('test.py', 'w')
				try:
				f.write('bar\n')
				finally:
				f.close()

				# this would return clean instead of changed before the fix
				status(u, repo, clean=True, modified=True)