upstream/mercurial-mirror Files · tests/test-hgwebdir-paths.py

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r15381:c519cd8f stable


                r22285:85bded43

default

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