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

diffstat: fix parsing of filenames with spaces...

diffstat: fix parsing of filenames with spaces The patch changes the output of "hg diff --stat" when one file whose filename has spaces has changed, making it get the full filename instead of just the substring between the last space and the end of the filename. It also changes the diffstat generated by "hg email -d" when one of the commit messages starts with "diff". Because of the regex used to parse the filename, the diffstat generated by "hg email -d" will still be not correct if a commit message starts with "diff -r ". Before the patch Mercurial has the following behavior: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) After the patch: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Before the patch: $ hg add mercurial/patch.py tests/tests-diffstat.t $ hg commit -m "diffstat: fix parsing of filenames" $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] filenames | 0 mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...] After the patch: $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...]

Mads Kiilerich - - Load All Authors

File last commit:

r12642:bb35840e default


                r13395:104c9ed9

default

Download file

             printenv.py
        
                    55 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / printenv.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # simple script to be used in hooks

      # copy it to the current directory when the test starts:

      #

      #     cp "$TESTDIR"/printenv.py .

      #

      # put something like this in the repo .hg/hgrc:

      #

      #     [hooks]

      #     changegroup = python ../printenv.py <hookname> [exit] [output]

      #

      #   - <hookname> is a mandatory argument (e.g. "changegroup")

      #   - [exit] is the exit code of the hook (default: 0)

      #   - [output] is the name of the output file (default: use sys.stdout)

      #              the file will be opened in append mode.

      #

      import os

      import sys

      try:

          import msvcrt

          msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)

          msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

          msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

      except ImportError:

          pass

      exitcode = 0

      out = sys.stdout

      name = sys.argv[1]

      if len(sys.argv) > 2:

          exitcode = int(sys.argv[2])

          if len(sys.argv) > 3:

              out = open(sys.argv[3], "ab")

      # variables with empty values may not exist on all platforms, filter

      # them now for portability sake.

      env = [k for k, v in os.environ.iteritems()

             if k.startswith("HG_") and v]

      env.sort()

      # edit the variable part of the variable

      url = os.environ.get("HG_URL", "")

      if url.startswith("file:"):

          os.environ["HG_URL"] = "file:"

      elif url.startswith("remote:http"):

          os.environ["HG_URL"] = "remote:http"

      out.write("%s hook: " % name)

      for v in env:

          out.write("%s=%s " % (v, os.environ[v]))

      out.write("\n")

      out.close()

      sys.exit(exitcode)

	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

				# simple script to be used in hooks
				# copy it to the current directory when the test starts:
				#
				# cp "$TESTDIR"/printenv.py .
				#
				# put something like this in the repo .hg/hgrc:
				#
				# [hooks]
				# changegroup = python ../printenv.py <hookname> [exit] [output]
				#
				# - <hookname> is a mandatory argument (e.g. "changegroup")
				# - [exit] is the exit code of the hook (default: 0)
				# - [output] is the name of the output file (default: use sys.stdout)
				# the file will be opened in append mode.
				#
				import os
				import sys

				try:
				import msvcrt
				msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
				msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
				msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
				except ImportError:
				pass

				exitcode = 0
				out = sys.stdout

				name = sys.argv[1]
				if len(sys.argv) > 2:
				exitcode = int(sys.argv[2])
				if len(sys.argv) > 3:
				out = open(sys.argv[3], "ab")

				# variables with empty values may not exist on all platforms, filter
				# them now for portability sake.
				env = [k for k, v in os.environ.iteritems()
				if k.startswith("HG_") and v]
				env.sort()

				# edit the variable part of the variable
				url = os.environ.get("HG_URL", "")
				if url.startswith("file:"):
				os.environ["HG_URL"] = "file:"
				elif url.startswith("remote:http"):
				os.environ["HG_URL"] = "remote:http"

				out.write("%s hook: " % name)
				for v in env:
				out.write("%s=%s " % (v, os.environ[v]))
				out.write("\n")
				out.close()

				sys.exit(exitcode)