This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4496

tests: order the imports in test-fastannotate-hg.t
ClosedPublic

Authored by pulkit on Sep 5 2018, 5:54 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4babb55e4503: tests: order the imports in test-fastannotate-hg.t
Summary

The wrong ordering breaks test-check-module-imports.t on Python 3. I am not sure
why that test is so much active on py3.

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

pulkit created this revision.Sep 5 2018, 5:54 PM
Closed by commit rHG4babb55e4503: tests: order the imports in test-fastannotate-hg.t (authored by pulkit). · Explain WhySep 6 2018, 8:13 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-fastannotate-hg.t (2 lines)

Diff 10810

tests/test-fastannotate-hg.t

merging between the revision and its ancestor merging between the revision and its ancestor
to reproduce the situation with recent Mercurial, this script uses (1) to reproduce the situation with recent Mercurial, this script uses (1)
"hg debugsetparents" to merge without ancestor check by "hg merge", "hg debugsetparents" to merge without ancestor check by "hg merge",
and (2) the extension to allow filelog merging between the revision and (2) the extension to allow filelog merging between the revision
and its ancestor by overriding "repo._filecommit". and its ancestor by overriding "repo._filecommit".
$ cat > ../legacyrepo.py <<EOF $ cat > ../legacyrepo.py <<EOF
> from mercurial import node, error > from mercurial import error, node
> def reposetup(ui, repo): > def reposetup(ui, repo):
> class legacyrepo(repo.__class__): > class legacyrepo(repo.__class__):
> def _filecommit(self, fctx, manifest1, manifest2, > def _filecommit(self, fctx, manifest1, manifest2,
> linkrev, tr, changelist): > linkrev, tr, changelist):
> fname = fctx.path() > fname = fctx.path()
> text = fctx.data() > text = fctx.data()
> flog = self.file(fname) > flog = self.file(fname)
> fparent1 = manifest1.get(fname, node.nullid) > fparent1 = manifest1.get(fname, node.nullid)