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

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Matt Mackall - - Load All Authors

File last commit:

r15381:c519cd8f stable


                r28189:fac3a24b

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