Mercurial > hg
view contrib/editmergeps.ps1 @ 35881:fa993c3c8462
lfs: emit a status message to indicate how many blobs were uploaded
Previously, there was a progress bar indicating the byte count, but then it
disappeared once the transfer was done. Having that value stay on the screen
seems useful. Downloads are done one at a time, so hold off on that until they
can be coalesced, to avoid a series of lines being printed. (I don't have any
great ideas on how to do that. It would be a shame to have to wrap a bunch of
read commands to be able to do this.)
I'm not sure if the 'lfs:' prefix is the right thing to do here. The others in
the test are verbose/debug messages, so in the normal case, this is the only
line that's prefixed.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 29 Jan 2018 22:09:48 -0500 |
parents | 92bcaef3420b |
children |
line wrap: on
line source
# 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