upstream/mercurial-mirror Files · tests/test-symlink-os-yes-fs-no.py

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Augie Fackler - - Load All Authors

File last commit:

r18178:6ae45c0b default


                r25878:800e090e

stable

Download file

             test-symlink-os-yes-fs-no.py
        
                    45 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-symlink-os-yes-fs-no.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os, sys, time

      from mercurial import hg, ui, commands, util

      TESTDIR = os.environ["TESTDIR"]

      BUNDLEPATH = os.path.join(TESTDIR, 'bundles', 'test-no-symlinks.hg')

      # only makes sense to test on os which supports symlinks

      if not getattr(os, "symlink", False):

          sys.exit(80) # SKIPPED_STATUS defined in run-tests.py

      u = ui.ui()

      # hide outer repo

      hg.peer(u, {}, '.', create=True)

      # clone with symlink support

      hg.clone(u, {}, BUNDLEPATH, 'test0')

      repo = hg.repository(u, 'test0')

      # wait a bit, or the status call wont update the dirstate

      time.sleep(1)

      commands.status(u, repo)

      # now disable symlink support -- this is what os.symlink would do on a

      # non-symlink file system

      def symlink_failure(src, dst):

          raise OSError(1, "Operation not permitted")

      os.symlink = symlink_failure

      # dereference links as if a Samba server has exported this to a

      # Windows client

      for f in 'test0/a.lnk', 'test0/d/b.lnk':

          os.unlink(f)

          fp = open(f, 'wb')

          fp.write(util.readfile(f[:-4]))

          fp.close()

      # reload repository

      u = ui.ui()

      repo = hg.repository(u, 'test0')

      commands.status(u, repo)

      # try cloning a repo which contains symlinks

      u = ui.ui()

      hg.clone(u, {}, BUNDLEPATH, 'test1')

	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

				import os, sys, time
				from mercurial import hg, ui, commands, util

				TESTDIR = os.environ["TESTDIR"]
				BUNDLEPATH = os.path.join(TESTDIR, 'bundles', 'test-no-symlinks.hg')

				# only makes sense to test on os which supports symlinks
				if not getattr(os, "symlink", False):
				sys.exit(80) # SKIPPED_STATUS defined in run-tests.py

				u = ui.ui()
				# hide outer repo
				hg.peer(u, {}, '.', create=True)

				# clone with symlink support
				hg.clone(u, {}, BUNDLEPATH, 'test0')

				repo = hg.repository(u, 'test0')

				# wait a bit, or the status call wont update the dirstate
				time.sleep(1)
				commands.status(u, repo)

				# now disable symlink support -- this is what os.symlink would do on a
				# non-symlink file system
				def symlink_failure(src, dst):
				raise OSError(1, "Operation not permitted")
				os.symlink = symlink_failure

				# dereference links as if a Samba server has exported this to a
				# Windows client
				for f in 'test0/a.lnk', 'test0/d/b.lnk':
				os.unlink(f)
				fp = open(f, 'wb')
				fp.write(util.readfile(f[:-4]))
				fp.close()

				# reload repository
				u = ui.ui()
				repo = hg.repository(u, 'test0')
				commands.status(u, repo)

				# try cloning a repo which contains symlinks
				u = ui.ui()
				hg.clone(u, {}, BUNDLEPATH, 'test1')