upstream/mercurial-mirror Files · tests/test-hgwebdir-paths.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.

Matt Mackall - - Load All Authors

File last commit:

r15381:c519cd8f stable


                r25878:800e090e

stable

Download file

             test-hgwebdir-paths.py
        
                    40 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-hgwebdir-paths.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
      import os

        Matt Mackall
    
backout dbdb777502dc (issue3077) (issue3071)...

              r15381
            
      from mercurial import hg, ui

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
      from mercurial.hgweb.hgwebdir_mod import hgwebdir

      os.mkdir('webdir')

      os.chdir('webdir')

        Matt Mackall
    
backout dbdb777502dc (issue3077) (issue3071)...

              r15381
            
      webdir = os.path.realpath('.')

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
      u = ui.ui()

      hg.repository(u, 'a', create=1)

      hg.repository(u, 'b', create=1)

      os.chdir('b')

      hg.repository(u, 'd', create=1)

      os.chdir('..')

      hg.repository(u, 'c', create=1)

      os.chdir('..')

      paths = {'t/a/': '%s/a' % webdir,

               'b': '%s/b' % webdir,

               'coll': '%s/*' % webdir,

               'rcoll': '%s/**' % webdir}

      config = os.path.join(webdir, 'hgwebdir.conf')

      configfile = open(config, 'w')

      configfile.write('[paths]\n')

      for k, v in paths.items():

          configfile.write('%s = %s\n' % (k, v))

      configfile.close()

      confwd = hgwebdir(config)

      dictwd = hgwebdir(paths)

      assert len(confwd.repos) == len(dictwd.repos), 'different numbers'

      assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos)

      found = dict(confwd.repos)

      for key, path in dictwd.repos:

          assert key in found, 'repository %s was not found' % key

          assert found[key] == path, 'different paths for repo %s' % key

	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

Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529	import os
Matt Mackall backout dbdb777502dc (issue3077) (issue3071)...	r15381	from mercurial import hg, ui
Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529	from mercurial.hgweb.hgwebdir_mod import hgwebdir

		os.mkdir('webdir')
		os.chdir('webdir')

Matt Mackall backout dbdb777502dc (issue3077) (issue3071)...	r15381	webdir = os.path.realpath('.')
Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529
		u = ui.ui()
		hg.repository(u, 'a', create=1)
		hg.repository(u, 'b', create=1)
		os.chdir('b')
		hg.repository(u, 'd', create=1)
		os.chdir('..')
		hg.repository(u, 'c', create=1)
		os.chdir('..')

		paths = {'t/a/': '%s/a' % webdir,
		'b': '%s/b' % webdir,
		'coll': '%s/*' % webdir,
		'rcoll': '%s/**' % webdir}

		config = os.path.join(webdir, 'hgwebdir.conf')
		configfile = open(config, 'w')
		configfile.write('[paths]\n')
		for k, v in paths.items():
		configfile.write('%s = %s\n' % (k, v))
		configfile.close()

		confwd = hgwebdir(config)
		dictwd = hgwebdir(paths)

		assert len(confwd.repos) == len(dictwd.repos), 'different numbers'
		assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos)

		found = dict(confwd.repos)
		for key, path in dictwd.repos:
		assert key in found, 'repository %s was not found' % key
		assert found[key] == path, 'different paths for repo %s' % key