view tests/remotefilelog-library.sh @ 46834:535de0e34a79

rebase: filter out descendants of divergence-causing commits earlier

`hg rebase` treats obsolete commits differently depending what has
happened to the commit:

 1) Obsolete commit without non-obsolete successors: Skipped, and a
 note is printed ("it has no successor").

 2) Obsolete commit with a successor in the destination (ancestor of
 it): Skipped, and a note is printed ("already in destination").

 3) Obsolete commit with a successor in the rebase set: The commit and
 its descendants are skipped, and a note is printed ("not rebasing
 <commit> and its descendants as this would cause divergence"), unless
 `allowdivergence` config set.

 4) Obsolete commit with a successor elsewhere: Error ("this rebase
 will cause divergences"), unless `allowdivergence` config set.

Before this patch, we did all those checks up front, except for (3),
which was checked later. The later check consisted of two parts: 1)
filtering out of descendants, and 2) conditionally printing message if
the `allowdivergence` config was not set. This patch makes it so we do
the filtering early.

A consequence of filtering out divergence-causing commits earlier is
that we rebase commits in slightly different order, which has some
impact on tests.

Differential Revision: https://phab.mercurial-scm.org/D10249

CACHEDIR=$PWD/hgcache
cat >> $HGRCPATH <<EOF
[remotefilelog]
cachepath=$CACHEDIR
debug=True
[extensions]
remotefilelog=
rebase=
strip=
[ui]
ssh=$PYTHON "$TESTDIR/dummyssh"
[server]
preferuncompressed=True
[experimental]
changegroup3=True
[rebase]
singletransaction=True
EOF

hgcloneshallow() {
  local name
  local dest
  orig=$1
  shift
  dest=$1
  shift
  hg clone --shallow --config remotefilelog.reponame=master $orig $dest $@
  cat >> $dest/.hg/hgrc <<EOF
[remotefilelog]
reponame=master
[phases]
publish=False
EOF
}

hgcloneshallowlfs() {
  local name
  local dest
  local lfsdir
  orig=$1
  shift
  dest=$1
  shift
  lfsdir=$1
  shift
  hg clone --shallow --config "extensions.lfs=" --config "lfs.url=$lfsdir" --config remotefilelog.reponame=master $orig $dest $@
  cat >> $dest/.hg/hgrc <<EOF
[extensions]
lfs=
[lfs]
url=$lfsdir
[remotefilelog]
reponame=master
[phases]
publish=False
EOF
}

clearcache() {
  rm -rf $CACHEDIR/*
}

mkcommit() {
  echo "$1" > "$1"
  hg add "$1"
  hg ci -m "$1"
}

ls_l() {
  $PYTHON $TESTDIR/ls-l.py "$@"
}

identifyrflcaps() {
    xargs -n 1 echo | egrep '(remotefilelog|getflogheads|getfile)' | sort
}