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

fileset: add "tracked()" to explicitly select files in the revision...

fileset: add "tracked()" to explicitly select files in the revision I'm going to rewrite filesets to be match predicates, which means basic patterns such as '*' will no longer be "closed" to the subset constructed from the ctx. Good thing is that 'hg status "set:not binary()"' can include unknown files out of the box, and fileset computation will likely to be faster as we won't have to walk dirstate twice, for example. Bad thing is that we can't select files at a certain revision by 'set:revs(REV, **)' since '**' is "open" to any paths. So, this patch introduces "tracked()" as a replacement for the '**' in the example above.

Kostia Balytskyi - - Load All Authors

File last commit:

r32571:92bcaef3 default


                r38708:131aae58

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