upstream/mercurial-mirror Files · tests/svnxml.py

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Patrick Mezard - - Load All Authors

File last commit:

r16512:c58bdecd stable


                r22284:72b37865

default

Download file

             svnxml.py
        
                    51 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / svnxml.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Read the output of a "svn log --xml" command on stdin, parse it and

      # print a subset of attributes common to all svn versions tested by

      # hg.

      import xml.dom.minidom, sys

      def xmltext(e):

          return ''.join(c.data for c

                         in e.childNodes

                         if c.nodeType == c.TEXT_NODE)

      def parseentry(entry):

          e = {}

          e['revision'] = entry.getAttribute('revision')

          e['author'] = xmltext(entry.getElementsByTagName('author')[0])

          e['msg'] = xmltext(entry.getElementsByTagName('msg')[0])

          e['paths'] = []

          paths = entry.getElementsByTagName('paths')

          if paths:

              paths = paths[0]

              for p in paths.getElementsByTagName('path'):

                  action = p.getAttribute('action')

                  path = xmltext(p)

                  frompath = p.getAttribute('copyfrom-path')

                  fromrev = p.getAttribute('copyfrom-rev')

                  e['paths'].append((path, action, frompath, fromrev))

          return e

      def parselog(data):

          entries = []

          doc = xml.dom.minidom.parseString(data)

          for e in doc.getElementsByTagName('logentry'):

              entries.append(parseentry(e))

          return entries

      def printentries(entries):

          fp = sys.stdout

          for e in entries:

              for k in ('revision', 'author', 'msg'):

                  fp.write(('%s: %s\n' % (k, e[k])).encode('utf-8'))

              for path, action, fpath, frev in sorted(e['paths']):

                  frominfo = ''

                  if frev:

                      frominfo = ' (from %s@%s)' % (fpath, frev)

                  p = ' %s %s%s\n' % (action, path, frominfo)

                  fp.write(p.encode('utf-8'))

      if __name__ == '__main__':

          data = sys.stdin.read()

          entries = parselog(data)

          printentries(entries)

	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

				# Read the output of a "svn log --xml" command on stdin, parse it and
				# print a subset of attributes common to all svn versions tested by
				# hg.
				import xml.dom.minidom, sys

				def xmltext(e):
				return ''.join(c.data for c
				in e.childNodes
				if c.nodeType == c.TEXT_NODE)

				def parseentry(entry):
				e = {}
				e['revision'] = entry.getAttribute('revision')
				e['author'] = xmltext(entry.getElementsByTagName('author')[0])
				e['msg'] = xmltext(entry.getElementsByTagName('msg')[0])
				e['paths'] = []
				paths = entry.getElementsByTagName('paths')
				if paths:
				paths = paths[0]
				for p in paths.getElementsByTagName('path'):
				action = p.getAttribute('action')
				path = xmltext(p)
				frompath = p.getAttribute('copyfrom-path')
				fromrev = p.getAttribute('copyfrom-rev')
				e['paths'].append((path, action, frompath, fromrev))
				return e

				def parselog(data):
				entries = []
				doc = xml.dom.minidom.parseString(data)
				for e in doc.getElementsByTagName('logentry'):
				entries.append(parseentry(e))
				return entries

				def printentries(entries):
				fp = sys.stdout
				for e in entries:
				for k in ('revision', 'author', 'msg'):
				fp.write(('%s: %s\n' % (k, e[k])).encode('utf-8'))
				for path, action, fpath, frev in sorted(e['paths']):
				frominfo = ''
				if frev:
				frominfo = ' (from %s@%s)' % (fpath, frev)
				p = ' %s %s%s\n' % (action, path, frominfo)
				fp.write(p.encode('utf-8'))

				if __name__ == '__main__':
				data = sys.stdin.read()
				entries = parselog(data)
				printentries(entries)