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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Bryan O'Sullivan - - Load All Authors

File last commit:

r31958:de5c9d0e default


                r38817:bb54db4a

@96 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)