This is an archive of the discontinued Mercurial Phabricator instance.

Differential D685

gitmeta: refactor and add more test cases to test-git-getmeta.t
ClosedPublic

Authored by singhsrb on Sep 11 2017, 6:31 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX775244c9042a: gitmeta: refactor and add more test cases to test-git-getmeta.t
Summary

test-git-getmeta.t has some basic tests to check that the git metadata
syncing works as expected. I have added some tests for more complicated
scenarios for robust testing. Also, I did some refactoring of the test for
readability.

Test Plan

Ran all the tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Sep 11 2017, 6:31 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 11 2017, 6:31 PM
durham accepted this revision.Sep 12 2017, 12:10 PM
This revision is now accepted and ready to land.Sep 12 2017, 12:10 PM
singhsrb added inline comments.Sep 12 2017, 4:18 PM
tests/test-git-getmeta.t
238

Will change this from commit->ci

Closed by commit rFBHGX775244c9042a: gitmeta: refactor and add more test cases to test-git-getmeta.t (authored by singhsrb). · Explain WhySep 15 2017, 12:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-git-getmeta.t (276 lines)

Diff 1741

tests/test-git-getmeta.t

$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "gitlookup = $TESTDIR/../hgext3rd/gitlookup.py" >> $HGRCPATH $ echo "gitlookup = $TESTDIR/../hgext3rd/gitlookup.py" >> $HGRCPATH
$ echo "gitrevset = $TESTDIR/../hgext3rd/gitrevset.py" >> $HGRCPATH $ echo "gitrevset = $TESTDIR/../hgext3rd/gitrevset.py" >> $HGRCPATH
$ echo '[ui]' >> $HGRCPATH $ echo "strip = " >> $HGRCPATH
$ echo "[ui]" >> $HGRCPATH
$ echo 'ssh = python "$RUNTESTDIR/dummyssh"' >> $HGRCPATH $ echo 'ssh = python "$RUNTESTDIR/dummyssh"' >> $HGRCPATH
Set up the hg-git files Set up the hg-git files
-----------------------
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ touch a $ touch a
$ hg add a $ hg add a
$ hg ci -ma $ hg ci -m "adding a"
$ hg log -r . --template '{node}\n' $ hg log -r . --template "{node}\n"
3903775176ed42b1458a6281db4a0ccf4d9f287a fc5f87aa174b7d4016abf3e908fd63cc99774540
Add the corresponding git metadata for the commit
$ cd .hg $ cd .hg
$ echo "ffffffffffffffffffffffffffffffffffffffff 3903775176ed42b1458a6281db4a0ccf4d9f287a" > git-mapfile $ echo "ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540" > git-mapfile
$ echo 'ffffffffffffffffffffffffffffffffffffffff default/master' > git-remote-refs $ echo "ffffffffffffffffffffffffffffffffffffffff default/master" > git-remote-refs
$ echo 'ffffffffffffffffffffffffffffffffffffffff 0.1' > git-tags $ echo "ffffffffffffffffffffffffffffffffffffffff 0.1" > git-tags
$ echo '[gitlookup]' >> hgrc $ echo "[gitlookup]" >> hgrc
$ echo "mapfile = $TESTTMP/repo1/.hg/git-mapfile" >> hgrc $ echo "mapfile = $TESTTMP/repo1/.hg/git-mapfile" >> hgrc
Clone new repo from local repo and check that git metadata syncs properly
-------------------------------------------------------------------------
$ cd ../.. $ cd ../..
$ hg clone repo1 repo2 -q $ hg clone repo1 repo2 -q
$ cd repo2 $ cd repo2
$ hg gitgetmeta -v $ hg gitgetmeta -v
getting git metadata from $TESTTMP/repo1 getting git metadata from $TESTTMP/repo1
writing .hg/git-mapfile writing .hg/git-mapfile
writing .hg/git-remote-refs writing .hg/git-remote-refs
writing .hg/git-tags writing .hg/git-tags
wrote 3 files (183 bytes) wrote 3 files (183 bytes)
$ cat .hg/git-mapfile $ sort .hg/git-mapfile
ffffffffffffffffffffffffffffffffffffffff 3903775176ed42b1458a6281db4a0ccf4d9f287a ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1
Clone new repo from remote repo and check that git metadata syncs properly
--------------------------------------------------------------------------
$ cd ..
$ hg clone ssh://user@dummy/repo1 repo3 -q
$ cd repo3
$ hg gitgetmeta -v
getting git metadata from ssh://user@dummy/repo1
writing .hg/git-mapfile
writing .hg/git-remote-refs
writing .hg/git-tags
wrote 3 files (183 bytes)
$ sort .hg/git-mapfile
ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-remote-refs $ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags $ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1 ffffffffffffffffffffffffffffffffffffffff 0.1
$ echo '1111111111111111111111111111111111111111 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' >> ../repo1/.hg/git-mapfile Make changes upstream and check that they get reflected in clones
-----------------------------------------------------------------
$ cd ../repo1
$ echo >> a
$ hg ci -m "modifying a"
$ hg log -r . --template "{node}\n"
d4a59f7c570a8794e6ec20865090e7b848395b92
$ echo "1111111111111111111111111111111111111111 d4a59f7c570a8794e6ec20865090e7b848395b92" >> .hg/git-mapfile
Check local repo syncing
$ cd ../repo2
$ hg gitgetmeta -v $ hg gitgetmeta -v
getting git metadata from $TESTTMP/repo1 getting git metadata from $TESTTMP/repo1
writing .hg/git-mapfile writing .hg/git-mapfile
writing .hg/git-remote-refs writing .hg/git-remote-refs
writing .hg/git-tags writing .hg/git-tags
wrote 3 files (265 bytes) wrote 3 files (265 bytes)
$ cat .hg/git-mapfile $ sort .hg/git-mapfile
ffffffffffffffffffffffffffffffffffffffff 3903775176ed42b1458a6281db4a0ccf4d9f287a 1111111111111111111111111111111111111111 d4a59f7c570a8794e6ec20865090e7b848395b92
1111111111111111111111111111111111111111 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cd .. $ cat .hg/git-remote-refs
$ hg clone ssh://user@dummy/repo1 repo3 -q ffffffffffffffffffffffffffffffffffffffff default/master
$ cd repo3
$ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1
Make more changes upstream
$ cd ../repo1
$ echo >> a
$ hg ci -m "modifying a"
$ hg log -r . --template "{node}\n"
c411819f7fd6036d50b17a28d3edb7aa9121985a
$ echo "2222222222222222222222222222222222222222 c411819f7fd6036d50b17a28d3edb7aa9121985a" >> .hg/git-mapfile
$ hg update -q -r "tip^"
$ echo >> a
$ hg ci -qm "creating new head with modified a"
$ hg log -r . --template "{node}\n"
8ea31c3efb6d2edb6d9fe608c29034e7e7ed5f91
$ echo "3333333333333333333333333333333333333333 8ea31c3efb6d2edb6d9fe608c29034e7e7ed5f91" >> .hg/git-mapfile
$ echo "releases/foo1 foo1" >> .hg/git-named-branches
Check remote repo syncing
$ cd ../repo3
$ hg gitgetmeta -v $ hg gitgetmeta -v
getting git metadata from ssh://user@dummy/repo1 getting git metadata from ssh://user@dummy/repo1
writing .hg/git-mapfile writing .hg/git-mapfile
writing .hg/git-named-branches
writing .hg/git-remote-refs writing .hg/git-remote-refs
writing .hg/git-tags writing .hg/git-tags
wrote 3 files (265 bytes) wrote 4 files (448 bytes)
$ sort .hg/git-mapfile
1111111111111111111111111111111111111111 d4a59f7c570a8794e6ec20865090e7b848395b92
2222222222222222222222222222222222222222 c411819f7fd6036d50b17a28d3edb7aa9121985a
3333333333333333333333333333333333333333 8ea31c3efb6d2edb6d9fe608c29034e7e7ed5f91
ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-named-branches
releases/foo1 foo1
$ cat .hg/git-mapfile
ffffffffffffffffffffffffffffffffffffffff 3903775176ed42b1458a6281db4a0ccf4d9f287a
1111111111111111111111111111111111111111 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
$ cat .hg/git-remote-refs $ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags $ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1 ffffffffffffffffffffffffffffffffffffffff 0.1
Change a file upstream and see that it gets reflected here Strip changes upstream and see that they get reflected in clones
$ echo '2222222222222222222222222222222222222222 dddddddddddddddddddddddddddddddddddddddd' >> ../repo1/.hg/git-mapfile ----------------------------------------------------------------
$ echo 'releases/foo1 foo1' >> ../repo1/.hg/git-named-branches
$ cd ../repo1
$ hg strip . -q
$ grep -v "8ea31c3efb6d2edb6d9fe608c29034e7e7ed5f91" .hg/git-mapfile > tempfile
$ mv tempfile .hg/git-mapfile
Check local repo syncing
$ cd ../repo2
$ hg gitgetmeta -v
getting git metadata from $TESTTMP/repo1
writing .hg/git-mapfile
writing .hg/git-named-branches
writing .hg/git-remote-refs
writing .hg/git-tags
wrote 4 files (366 bytes)
$ sort .hg/git-mapfile
1111111111111111111111111111111111111111 d4a59f7c570a8794e6ec20865090e7b848395b92
2222222222222222222222222222222222222222 c411819f7fd6036d50b17a28d3edb7aa9121985a
ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-named-branches
releases/foo1 foo1
$ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1
Strip some more changes upstream
$ cd ../repo1
$ hg strip . -q
$ grep -v "c411819f7fd6036d50b17a28d3edb7aa9121985a\|d4a59f7c570a8794e6ec20865090e7b848395b92" .hg/git-mapfile > tempfile
$ mv tempfile .hg/git-mapfile
Add a new head upstream
$ echo a >> a
$ hg ci -qm "modifying a"
$ hg log -r . --template "{node}\n"
3bfa460515b210d1e6f7e21bde166ef5c5f0d9b6
$ echo "2222222222222222222222222222222222222222 3bfa460515b210d1e6f7e21bde166ef5c5f0d9b6" >> .hg/git-mapfile
Check remote repo syncing
$ cd ../repo3
$ hg gitgetmeta -v $ hg gitgetmeta -v
getting git metadata from ssh://user@dummy/repo1 getting git metadata from ssh://user@dummy/repo1
writing .hg/git-mapfile writing .hg/git-mapfile
writing .hg/git-named-branches writing .hg/git-named-branches
writing .hg/git-remote-refs writing .hg/git-remote-refs
writing .hg/git-tags writing .hg/git-tags
wrote 4 files (284 bytes)
$ sort .hg/git-mapfile
2222222222222222222222222222222222222222 3bfa460515b210d1e6f7e21bde166ef5c5f0d9b6
ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-named-branches
releases/foo1 foo1
$ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1
Check local repo syncing
$ cd ../repo2
$ hg gitgetmeta -v
getting git metadata from $TESTTMP/repo1
writing .hg/git-mapfile
writing .hg/git-named-branches
writing .hg/git-remote-refs
writing .hg/git-tags
wrote 4 files (284 bytes)
$ sort .hg/git-mapfile
2222222222222222222222222222222222222222 3bfa460515b210d1e6f7e21bde166ef5c5f0d9b6
ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-named-branches
releases/foo1 foo1
$ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1
Create unrelated history upstream and check that the syncing works
------------------------------------------------------------------
$ cd ../repo1
$ hg update -q null
$ touch b
$ hg commit -Aqm "adding b"
singhsrbAuthorUnsubmitted
Not Done

Will change this from commit->ci

singhsrb: Will change this from commit->ci
$ hg log -r . --template "{node}\n"
627ddeb6657d60a21b87c725b5c4e60d91b75f19
$ echo "3333333333333333333333333333333333333333 627ddeb6657d60a21b87c725b5c4e60d91b75f19" >> .hg/git-mapfile
Check local repo syncing
$ cd ../repo2
$ hg gitgetmeta -v
getting git metadata from $TESTTMP/repo1
writing .hg/git-mapfile
writing .hg/git-named-branches
writing .hg/git-remote-refs
writing .hg/git-tags
wrote 4 files (366 bytes) wrote 4 files (366 bytes)
$ cat .hg/git-mapfile $ sort .hg/git-mapfile
ffffffffffffffffffffffffffffffffffffffff 3903775176ed42b1458a6281db4a0ccf4d9f287a 2222222222222222222222222222222222222222 3bfa460515b210d1e6f7e21bde166ef5c5f0d9b6
1111111111111111111111111111111111111111 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 3333333333333333333333333333333333333333 627ddeb6657d60a21b87c725b5c4e60d91b75f19
2222222222222222222222222222222222222222 dddddddddddddddddddddddddddddddddddddddd ffffffffffffffffffffffffffffffffffffffff fc5f87aa174b7d4016abf3e908fd63cc99774540
$ cat .hg/git-named-branches
releases/foo1 foo1
$ cat .hg/git-remote-refs
ffffffffffffffffffffffffffffffffffffffff default/master
$ cat .hg/git-tags
ffffffffffffffffffffffffffffffffffffffff 0.1
Check that our revset and template mappings work
------------------------------------------------
Clone a new repo
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/repo1 repo-ssh -q $ hg clone ssh://user@dummy/repo1 repo-ssh -q
$ cd repo-ssh $ cd repo-ssh
Check that our revset and template mappings work
$ hg log -r "gitnode(ffffffffffffffffffffffffffffffffffffffff)" --template "{node}\n" $ hg log -r "gitnode(ffffffffffffffffffffffffffffffffffffffff)" --template "{node}\n"
3903775176ed42b1458a6281db4a0ccf4d9f287a fc5f87aa174b7d4016abf3e908fd63cc99774540
$ hg log -r 'gffffffffffffffffffffffffffffffffffffffff' --template "{node}\n" $ hg log -r "gffffffffffffffffffffffffffffffffffffffff" --template "{node}\n"
3903775176ed42b1458a6281db4a0ccf4d9f287a fc5f87aa174b7d4016abf3e908fd63cc99774540
$ hg log -r . --template "{gitnode}\n" $ hg log -r . --template "{gitnode}\n"
ffffffffffffffffffffffffffffffffffffffff 3333333333333333333333333333333333333333
$ touch b $ touch c
$ hg add b $ hg add c
$ hg ci -mb $ hg ci -mc
$ hg log -r . --template "{gitnode}\n" $ hg log -r . --template "{gitnode}\n"
Check that gitnode revset and template work on the server Check that gitnode revset and template work on the server
$ cd ../repo1 $ cd ../repo1
$ hg log -r . --template "{node}-{gitnode}\n" $ hg log -r . --template "{node}-{gitnode}\n"
3903775176ed42b1458a6281db4a0ccf4d9f287a-ffffffffffffffffffffffffffffffffffffffff 627ddeb6657d60a21b87c725b5c4e60d91b75f19-3333333333333333333333333333333333333333
$ hg log -r "gitnode(ffffffffffffffffffffffffffffffffffffffff)" --template "{node}\n" $ hg log -r "gitnode(ffffffffffffffffffffffffffffffffffffffff)" --template "{node}\n"
3903775176ed42b1458a6281db4a0ccf4d9f287a fc5f87aa174b7d4016abf3e908fd63cc99774540
$ hg log -r "gitnode(unknown)" --template "{node}\n" $ hg log -r "gitnode(unknown)" --template "{node}\n"
abort: unknown revision 'unknown'! abort: unknown revision 'unknown'!
[255] [255]
Check that using revision numbers instead of hashes still works. Use `bundle` command Check that using revision numbers instead of hashes still works. Use `bundle` command
because it calls `repo.lookup(...)` with int argument because it calls `repo.lookup(...)` with int argument
$ touch b $ touch c
$ hg add b $ hg add c
$ hg ci -mb $ hg ci -m "adding c"
$ hg bundle -r . --base 0 file.txt $ hg bundle -r . --base 0 file.txt
1 changesets found 2 changesets found