This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11714

tests: fix test-convert-git to work w/ "git pull" requiring strategy
ClosedPublic

Authored by spectral on Oct 20 2021, 1:55 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfd3d4b7f8e62: tests: fix test-convert-git to work w/ "git pull" requiring strategy
Summary

A recent change to git (031e2f7ae195) made it an error to not specify a strategy
(--rebase, --no-rebase, --ff-only), instead of just the warning it was
previously. As far as I can tell, --no-rebase is the behavior we were getting
before, and the only one that makes the test work.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Oct 20 2021, 1:55 PM
Alphare accepted this revision.Oct 22 2021, 3:25 AM
This revision is now accepted and ready to land.Oct 22 2021, 3:25 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-convert-git.t (6 lines)

Diff 30978

tests/test-convert-git.t

$ commit -m t3 $ commit -m t3
$ echo b >> a $ echo b >> a
$ commit -a -m t4.1 $ commit -a -m t4.1
$ git checkout -b other HEAD~ >/dev/null 2>/dev/null $ git checkout -b other HEAD~ >/dev/null 2>/dev/null
$ echo c > a $ echo c > a
$ echo a >> a $ echo a >> a
$ commit -a -m t4.2 $ commit -a -m t4.2
$ git checkout master >/dev/null 2>/dev/null $ git checkout master >/dev/null 2>/dev/null
$ git pull --no-commit . other > /dev/null 2>/dev/null $ git pull --no-commit . other --no-rebase > /dev/null 2>/dev/null
$ commit -m 'Merge branch other' $ commit -m 'Merge branch other'
$ cd .. $ cd ..
$ hg convert --config extensions.progress= --config progress.assume-tty=1 \ $ hg convert --config extensions.progress= --config progress.assume-tty=1 \
> --config progress.delay=0 --config progress.changedelay=0 \ > --config progress.delay=0 --config progress.changedelay=0 \
> --config progress.refresh=0 --config progress.width=60 \ > --config progress.refresh=0 --config progress.width=60 \
> --config progress.format='topic, bar, number' --datesort git-repo > --config progress.format='topic, bar, number' --datesort git-repo
\r (no-eol) (esc) \r (no-eol) (esc)
scanning [======> ] 1/6\r (no-eol) (esc) scanning [======> ] 1/6\r (no-eol) (esc)
$ echo bar > bar $ echo bar > bar
$ git add bar $ git add bar
$ commit -a -m 'add bar' $ commit -a -m 'add bar'
$ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null
$ echo baz > baz $ echo baz > baz
$ git add baz $ git add baz
$ commit -a -m 'add baz' $ commit -a -m 'add baz'
$ git checkout master >/dev/null 2>/dev/null $ git checkout master >/dev/null 2>/dev/null
$ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null $ git pull --no-commit . Bar Baz --no-rebase > /dev/null 2>/dev/null
$ commit -m 'Octopus merge' $ commit -m 'Octopus merge'
$ echo bar >> bar $ echo bar >> bar
$ commit -a -m 'change bar' $ commit -a -m 'change bar'
$ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null
$ echo >> foo $ echo >> foo
$ commit -a -m 'change foo' $ commit -a -m 'change foo'
$ git checkout master >/dev/null 2>/dev/null $ git checkout master >/dev/null 2>/dev/null
$ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null $ git pull --no-commit -s ours . Foo --no-rebase > /dev/null 2>/dev/null
$ commit -m 'Discard change to foo' $ commit -m 'Discard change to foo'
$ cd .. $ cd ..
$ glog() $ glog()
> { > {
> hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@" > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
> } > }
$ splitrepo() $ splitrepo()
> { > {