upstream/mercurial-mirror Files · tests/test-hg-parseurl.py

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r13897:375872fd default


                r23524:a1a7c94d

default

Download file

             test-hg-parseurl.py
        
                    13 lines
            
             | 520 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-hg-parseurl.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martijn Pieters
    
hg: allow hg.parseurl(url, None)...

              r8174
            
      from mercurial.hg import parseurl

        Sune Foldager
    
interpret repo#name url syntax as branch instead of revision...

              r10365
            
      def testparse(url, branch=[]):

          print '%s, branches: %r' % parseurl(url, branch)

        Martijn Pieters
    
hg: allow hg.parseurl(url, None)...

              r8174
            
      testparse('http://example.com/no/anchor')

      testparse('http://example.com/an/anchor#foo')

        Sune Foldager
    
interpret repo#name url syntax as branch instead of revision...

              r10365
            
      testparse('http://example.com/no/anchor/branches', branch=['foo'])

      testparse('http://example.com/an/anchor/branches#bar', branch=['foo'])

      testparse('http://example.com/an/anchor/branches-None#foo', branch=None)

        Thomas Arendsen Hein
    
hg: make parseurl() consistently return normalised path...

              r13897
            
      testparse('http://example.com/')

      testparse('http://example.com')

      testparse('http://example.com#foo')

	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

Martijn Pieters hg: allow hg.parseurl(url, None)...	r8174	from mercurial.hg import parseurl

Sune Foldager interpret repo#name url syntax as branch instead of revision...	r10365	def testparse(url, branch=[]):
		print '%s, branches: %r' % parseurl(url, branch)
Martijn Pieters hg: allow hg.parseurl(url, None)...	r8174
		testparse('http://example.com/no/anchor')
		testparse('http://example.com/an/anchor#foo')
Sune Foldager interpret repo#name url syntax as branch instead of revision...	r10365	testparse('http://example.com/no/anchor/branches', branch=['foo'])
		testparse('http://example.com/an/anchor/branches#bar', branch=['foo'])
		testparse('http://example.com/an/anchor/branches-None#foo', branch=None)
Thomas Arendsen Hein hg: make parseurl() consistently return normalised path...	r13897	testparse('http://example.com/')
		testparse('http://example.com')
		testparse('http://example.com#foo')