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

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Yuya Nishihara - - Load All Authors

File last commit:

r28843:2c7e6f36 default


                r29480:1e4512ea

default

Download file

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

      #!/usr/bin/env python

      from __future__ import absolute_import, print_function

      from mercurial import (

          commands,

          localrepo,

          ui as uimod,

      )

      u = uimod.ui()

      print('% creating repo')

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

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

      try:

          f.write('foo\n')

      finally:

          f.close

      print('% add and commit')

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

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

      commands.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

      commands.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/env python
				from __future__ import absolute_import, print_function

				from mercurial import (
				commands,
				localrepo,
				ui as uimod,
				)

				u = uimod.ui()

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

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

				print('% add and commit')
				commands.add(u, repo, 'test.py')
				commands.commit(u, repo, message='*')
				commands.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
				commands.status(u, repo, clean=True, modified=True)