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

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972

Raphaël Gomès - - Load All Authors

File last commit:

r47575:d4ba4d51 default


                r49404:c9141848

default

Download file

             memory.py
        
                    37 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / memory.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # memory.py - track memory usage

      #

      # Copyright 2009 Olivia Mackall <olivia@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 Olivia Mackall <olivia@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)