contrib/editmerge

clone: properly exclude rev-branch-cache from post clone cache warming

When adding "CACHE_REV_BRANCH" to "CACHES_ALL" in e51161b12c7e, I did not
expected it to impact the clone steps. However the "CACHES_POST_CLONE" set is
created rather creatively. (we should fix that, but not on stable)

The benchmark caught a quite significant slowdown one hardlink and ssh-stream
clones. Such slow down can be reduced to around ~5% by fully warming the cache
before the clone. However keeping this expensive step away from the clone
operation fully fix the slowdown and preserve the initial intend.


Example slowdow for hardlink clone

### benchmark.name                               = hg.command.clone
  # bin-env-vars.hg.flavor                       = default
  # bin-env-vars.hg.py-re2-module                = default
  # benchmark.variants.explicit-rev              = none
  # benchmark.variants.issue6528                 = default
  # benchmark.variants.protocol                  = local-hardlink
  # benchmark.variants.pulled-delta-reuse-policy = default
  # benchmark.variants.resource-usage            = default
  # benchmark.variants.validate                  = default
 ## data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog
6.8.2:  19.799752
6.9rc0: 29.017493  (+46.55%, +9.22)
after:  19.929341

 ## data-env-vars.name = mercurial-public-2018-08-01-zstd-sparse-revlog
6.8.2:  0.468020
6.9rc0: 1.701294 (+263.51%, +1.23)
after:  0.471934

 ## data-env-vars.name = pypy-2024-03-22-zstd-sparse-revlog
6.8.2:  2.397564
6.9rc0: 5.666641 (+137.41%, +3.28)
after:  2.428085

#!/usr/bin/env bash
# A simple script for opening merge conflicts in the editor.
# Use the following Mercurial settings to enable it.
#
# [ui]
# merge = editmerge
#
# [merge-tools]
# editmerge.args=$output
# editmerge.check=changed
# editmerge.premerge=keep

FILE="$1"

getlines() {
  grep -n "^<<<<<<" "$FILE" | cut -f1 -d:
}

# editor preference loosely based on https://mercurial-scm.org/wiki/editor
# hg showconfig is at the bottom though, since it's slow to run (0.15 seconds)
ED="$HGEDITOR"
if [ "$ED" = "" ] ; then
  ED="$VISUAL"
fi
if [ "$ED" = "" ] ; then
  ED="$EDITOR"
fi
if [ "$ED" = "" ] ; then
  ED="$(hg showconfig ui.editor)"
fi
if [ "$ED" = "" ] ; then
  echo "merge failed - unable to find editor"
  exit 1
fi

if [ "$ED" = "emacs" ] || [ "$ED" = "nano" ] || [ "$ED" = "vim" ] ; then
  FIRSTLINE="$(getlines | head -n 1)"
  PREVIOUSLINE=""

  # open the editor to the first conflict until there are no more
  # or the user stops editing the file
  while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do
    $ED "+$FIRSTLINE" "$FILE"
    PREVIOUSLINE="$FIRSTLINE"
    FIRSTLINE="$(getlines | head -n 1)"
  done
else
  $ED "$FILE"
fi

# get the line numbers of the remaining conflicts
CONFLICTS="$(getlines | sed ':a;N;$!ba;s/\n/, /g')"
if [ ! "$CONFLICTS" = "" ] ; then
  echo "merge failed - resolve the conflicts (line $CONFLICTS) then use 'hg resolve --mark'"
  exit 1
fi

exit 0