mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
bf3cad3004
Summary: In order to move our hg-git mirroring off of the main hg servers, we need to make it possible for the hg servers to compute the hg-git mapping without having the entire git repository available. To do so, let's store the git hash as an extra in the hg commit. This breaks bidirectionality, but we've long since not needed that. Reviewed By: phillco Differential Revision: D13362980 fbshipit-source-id: 51df709bc5e77d78bb963abf90d0c35bb743d966
102 lines
2.8 KiB
Perl
102 lines
2.8 KiB
Perl
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ git init gitrepo
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
|
|
$ cd gitrepo
|
|
$ echo alpha > alpha
|
|
$ git add alpha
|
|
$ fn_git_commit -m 'add alpha'
|
|
|
|
$ git tag alpha
|
|
|
|
$ git checkout -b beta
|
|
Switched to a new branch 'beta'
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
|
|
$ cd ..
|
|
clone a tag
|
|
$ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo-a log --graph
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
tag: alpha
|
|
tag: default/master
|
|
tag: tip
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
clone a branch
|
|
$ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating'
|
|
importing git objects into hg
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo-b log --graph
|
|
@ changeset: 1:3bb02b6794dd
|
|
| bookmark: beta
|
|
| tag: default/beta
|
|
| tag: tip
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
tag: alpha
|
|
tag: default/master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
$ cd gitrepo
|
|
$ echo beta line 2 >> beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add to beta'
|
|
|
|
$ cd ..
|
|
$ cd hgrepo-b
|
|
$ hg strip tip 2>&1 | grep -v saving | grep -v backup
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg pull -r beta
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
abort: you appear to have run strip - please run hg git-cleanup
|
|
[255]
|
|
$ hg git-cleanup
|
|
git commit map cleaned
|
|
pull works after 'hg git-cleanup'
|
|
"adding remote bookmark" message was added in Mercurial 2.3
|
|
$ hg pull -r beta | grep -v "adding remote bookmark"
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
(run 'hg update' to get a working copy)
|
|
$ hg log --graph
|
|
o changeset: 2:3db9bf9073b5
|
|
| bookmark: beta
|
|
| tag: default/beta
|
|
| tag: tip
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add to beta
|
|
|
|
|
o changeset: 1:3bb02b6794dd
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
tag: alpha
|
|
tag: default/master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
$ cd ..
|