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

Patrick Mezard - - Load All Authors

File last commit:

r16512:c58bdecd stable


                r23524:a1a7c94d

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)