mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
ab3a7cb21f
Summary: In preparation for merging fb-mercurial sources to the Eden repository, move everything from the top-level directory into an `eden/scm` subdirectory.
105 lines
2.4 KiB
PowerShell
105 lines
2.4 KiB
PowerShell
# 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 | Select-Object -ExpandProperty '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 we have an editor with a full path we need to be careful of quotes
|
|
$full_path = $ed -match "^\`"(.+)\`"(.*)$"
|
|
if ($full_path)
|
|
{
|
|
$process = $Matches[1]
|
|
$process_args = $Matches[2]
|
|
}
|
|
else
|
|
{
|
|
$process = ($ed -split (" ", 2))[0]
|
|
$process_args = $ed -split (" ", 2) | select -skip 1
|
|
}
|
|
|
|
if (($ed -eq "vim") -or ($ed -eq "emacs") -or `
|
|
($ed -eq "nano") -or ($ed -eq "notepad++") -or `
|
|
($process -eq "subl"))
|
|
{
|
|
$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 ($process -eq "subl")
|
|
{
|
|
$line_arg = ":$firstline"
|
|
Start-Process -Wait -NoNewWindow $process -ArgumentList "$process_args $file$line_arg"
|
|
}
|
|
elseif ($ed -eq "notepad++")
|
|
{
|
|
$line_arg = "-n$firstline"
|
|
Start-Process -Wait -NoNewWindow $ed $line_arg,$file
|
|
}
|
|
else
|
|
{
|
|
$line_arg = "+$firstline"
|
|
Start-Process -Wait -NoNewWindow $ed $line_arg,$file
|
|
}
|
|
|
|
$previousline = $firstline
|
|
$lines = Get-Lines
|
|
$firstline = if ($lines.Length -gt 0) { $lines[0] } else { $nil }
|
|
}
|
|
}
|
|
else
|
|
{
|
|
# powershell assumes that start means Start-Process but it probably doesn't
|
|
if ($process -ne 'START')
|
|
{
|
|
Start-Process -Wait -NoNewWindow $process -ArgumentList "$process_args $file"
|
|
}
|
|
else
|
|
{
|
|
cmd /c ''$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
|