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

phabricator: add a config to use curl for communication...

phabricator: add a config to use curl for communication Not sure why, but I got `phabsend` hang on work network pretty frequently. The traceback indicates it hangs at `_sslobj.do_handshake()`: File "mercurial/sslutil.py", line 404, in wrapsocket sslsocket = sslcontext.wrap_socket(sock, server_hostname=serverhostname) File "/usr/lib/python2.7/ssl.py", line 363, in wrap_socket _context=self) File "/usr/lib/python2.7/ssl.py", line 611, in __init__ self.do_handshake() File "/usr/lib/python2.7/ssl.py", line 840, in do_handshake self._sslobj.do_handshake() I had tried adding `timeout` in various places but they seem not effective. It seems easier to just allow shelling out to `curl` with retry and timeout flags. This could also be helpful for people with an older Python installed without modern security (SNI). Differential Revision: https://phab.mercurial-scm.org/D605

Kostia Balytskyi - - Load All Authors

File last commit:

r32571:92bcaef3 default


                r34066:8b659b73

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