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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r13897:375872fd default


                r22285:85bded43

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')