upstream/mercurial-mirror Files · contrib/editmergeps.ps1

compat: initialize LC_CTYPE locale on all Python versions and platforms...

compat: initialize LC_CTYPE locale on all Python versions and platforms Previously, the LC_CTYPE locale was not initialized according to user settings on all Python versions (e.g. never on Python 2) and platforms (e.g. not on some Python < 3.8 on Windows). This broke e.g. non-ASCII filenames passed to the Subversion bindings on Python 2, resulting in error messages like "file:///tmp/a%C3%A4 does not look like a Subversion repository to libsvn version 1.14.0". The following command could be used to test this functionality. Adding it to the test suite would be pointless, as the locale is always set to "C" during test runs. @command(b'check_initial_codeset', norepo=True) def check_initial_codeset(ui): codeset1 = locale.nl_langinfo(locale.CODESET) locale.setlocale(locale.LC_ALL, '') codeset2 = locale.nl_langinfo(locale.CODESET) assert codeset1 == codeset2

Kostia Balytskyi - - Load All Authors

File last commit:

r32571:92bcaef3 default


                r45538:a25343d1

default

Download file

             editmergeps.ps1
        
                    78 lines
            
             | 1.6 KiB
            
                | text/x-powershell
            
             |
                PowerShellLexer
            
             / contrib / editmergeps.ps1
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # A simple script for opening merge conflicts in editor

      # A loose translation of contrib/editmerge to powershell

      # Please make sure that both editmergeps.bat and editmerge.ps1 are available

      # via %PATH% and use the following Mercurial settings to enable it

      #

      # [ui]

      # editmergeps

      # editmergeps.args=$output

      # editmergeps.check=changed

      # editmergeps.premerge=keep

      $file=$args[0]

      function Get-Lines

      {

        Select-String "^<<<<<<" $file | % {"$($_.LineNumber)"}

      }

      $ed = $Env:HGEDITOR;

      if ($ed -eq $nil)

      {

        $ed = $Env:VISUAL;

      }

      if ($ed -eq $nil)

      {

        $ed = $Env:EDITOR;

      }

      if ($ed -eq $nil)

      {

        $ed = $(hg showconfig ui.editor);

      }

      if ($ed -eq $nil)

      {

        Write-Error "merge failed - unable to find editor"

        exit 1

      }

      if (($ed -eq "vim") -or ($ed -eq "emacs") -or `

          ($ed -eq "nano") -or ($ed -eq "notepad++"))

      {

        $lines = Get-Lines

        $firstline = if ($lines.Length -gt 0) { $lines[0] } else { $nil }

        $previousline = $nil;

        # open the editor to the first conflict until there are no more

        # or the user stops editing the file

        while (($firstline -ne $nil) -and ($firstline -ne $previousline))

        {

          if ($ed -eq "notepad++")

          {

              $linearg = "-n$firstline"

          }

          else

          {

              $linearg = "+$firstline"

          }

          Start-Process -Wait -NoNewWindow $ed $linearg,$file

          $previousline = $firstline

          $lines = Get-Lines

          $firstline = if ($lines.Length -gt 0) { $lines[0] } else { $nil }

        }

      }

      else

      {

        & "$ed" $file

      }

      $conflicts=Get-Lines

      if ($conflicts.Length -ne 0)

      {

        Write-Output "merge failed - resolve the conflicts (line $conflicts) then use 'hg resolve --mark'"

        exit 1

      }

      exit 0

	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

				# A simple script for opening merge conflicts in editor
				# A loose translation of contrib/editmerge to powershell
				# Please make sure that both editmergeps.bat and editmerge.ps1 are available
				# via %PATH% and use the following Mercurial settings to enable it
				#
				# [ui]
				# editmergeps
				# editmergeps.args=$output
				# editmergeps.check=changed
				# editmergeps.premerge=keep

				$file=$args[0]

				function Get-Lines
				{
				Select-String "^<<<<<<" $file \| % {"$($_.LineNumber)"}
				}

				$ed = $Env:HGEDITOR;
				if ($ed -eq $nil)
				{
				$ed = $Env:VISUAL;
				}
				if ($ed -eq $nil)
				{
				$ed = $Env:EDITOR;
				}
				if ($ed -eq $nil)
				{
				$ed = $(hg showconfig ui.editor);
				}
				if ($ed -eq $nil)
				{
				Write-Error "merge failed - unable to find editor"
				exit 1
				}

				if (($ed -eq "vim") -or ($ed -eq "emacs") -or `
				($ed -eq "nano") -or ($ed -eq "notepad++"))
				{
				$lines = Get-Lines
				$firstline = if ($lines.Length -gt 0) { $lines[0] } else { $nil }
				$previousline = $nil;


				# open the editor to the first conflict until there are no more
				# or the user stops editing the file
				while (($firstline -ne $nil) -and ($firstline -ne $previousline))
				{
				if ($ed -eq "notepad++")
				{
				$linearg = "-n$firstline"
				}
				else
				{
				$linearg = "+$firstline"
				}

				Start-Process -Wait -NoNewWindow $ed $linearg,$file
				$previousline = $firstline
				$lines = Get-Lines
				$firstline = if ($lines.Length -gt 0) { $lines[0] } else { $nil }
				}
				}
				else
				{
				& "$ed" $file
				}

				$conflicts=Get-Lines
				if ($conflicts.Length -ne 0)
				{
				Write-Output "merge failed - resolve the conflicts (line $conflicts) then use 'hg resolve --mark'"
				exit 1
				}

				exit 0