upstream/mercurial-mirror Files · contrib/memory.py

copies: add test that makes both the merging csets dirty and fails...

copies: add test that makes both the merging csets dirty and fails This patch is a part of series which is about the case when both the merging csets are not descendant of merge base. The existing code assumes if c1 is dirty there shouldn't be any partial copies from c2 i.e both2['incomplete'] and same for c2, if c2 is dirty both1['incomplete'] should be empty, but this is not the right assumption. Now as we know we can have both c1 and c2 dirty at the same time, it is possible that c1 is dirty and both2['incomplete'] has some value. Or if c2 is dirty and both1['incomplete'] has some value. Added test shows that because of this assumption it could fail. Differential Revision: https://phab.mercurial-scm.org/D5962

Bryan O'Sullivan - - Load All Authors

File last commit:

r31958:de5c9d0e default


                r42097:fc4b7a46

default

Download file

             memory.py
        
                    31 lines
            
             | 1023 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / memory.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # memory.py - track memory usage

      #

      # Copyright 2009 Matt Mackall <mpm@selenic.com> and others

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      '''helper extension to measure memory usage

      Reads current and peak memory usage from ``/proc/self/status`` and

      prints it to ``stderr`` on exit.

      '''

      from __future__ import absolute_import

      def memusage(ui):

          """Report memory usage of the current process."""

          result = {'peak': 0, 'rss': 0}

          with open('/proc/self/status', 'r') as status:

              # This will only work on systems with a /proc file system

              # (like Linux).

              for line in status:

                  parts = line.split()

                  key = parts[0][2:-1].lower()

                  if key in result:

                      result[key] = int(parts[1])

          ui.write_err(", ".join(["%s: %.1f MiB" % (k, v / 1024.0)

                                  for k, v in result.iteritems()]) + "\n")

      def extsetup(ui):

          ui.atexit(memusage, ui)

	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

				# memory.py - track memory usage
				#
				# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''helper extension to measure memory usage

				Reads current and peak memory usage from ``/proc/self/status`` and
				prints it to ``stderr`` on exit.
				'''

				from __future__ import absolute_import

				def memusage(ui):
				"""Report memory usage of the current process."""
				result = {'peak': 0, 'rss': 0}
				with open('/proc/self/status', 'r') as status:
				# This will only work on systems with a /proc file system
				# (like Linux).
				for line in status:
				parts = line.split()
				key = parts[0][2:-1].lower()
				if key in result:
				result[key] = int(parts[1])
				ui.write_err(", ".join(["%s: %.1f MiB" % (k, v / 1024.0)
				for k, v in result.iteritems()]) + "\n")

				def extsetup(ui):
				ui.atexit(memusage, ui)