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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Robert Stanca - - Load All Authors

File last commit:

r28947:812eb3b7 default


                r32255:7e35d31b

default

Download file

             svnxml.py
        
                    53 lines
            
             | 1.7 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.

      from __future__ import absolute_import

      import sys

      import xml.dom.minidom

      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.
				from __future__ import absolute_import
				import sys
				import xml.dom.minidom

				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)