facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity

git_handler.fetch: only import commits reachable from requested heads

Browse Source 
Previously we'd attempt to import every single reachable commit in the Git
object store.

The test adds another branch to the Git repo and doesn't import it until much
later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now
we won't.
This commit is contained in:
Siddharth Agarwal 2014-03-04 16:23:11 -08:00
parent 759062fbfd
commit bf45b40ca3
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hggit/git_handler.py
View File

@ -206,7 +206,8 @@ class GitHandler(object):
oldheads = self.repo.changelog.heads()
imported = 0
if refs:
imported = self.import_git_objects(remote_name, refs)
filteredrefs = self.filter_refs(refs, heads)
imported = self.import_git_objects(remote_name, filteredrefs)
self.import_tags(refs)
self.update_hg_bookmarks(refs)
if remote_name:

35
tests/test-pull.t
View File

@ -12,6 +12,10 @@ set up a git repo with some commits, branches and a tag
$ echo beta > beta
$ git add beta
$ fn_git_commit -m 'add beta'
$ git checkout -qb delta master
$ echo delta > delta
$ git add delta
$ fn_git_commit -m 'add delta'
$ cd ..
clone a tag (ideally we'd want to pull it, but that seems broken for now)
@ -57,6 +61,7 @@ pull a branch
add another commit and tag to the git repo
$ cd gitrepo
$ git checkout -q beta
$ git tag t_beta
$ git checkout -q master
$ echo gamma > gamma
@ -70,15 +75,23 @@ pull everything else
importing git objects into hg
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R hgrepo log --graph
o changeset: 2:37c124f2d0a0
o changeset: 3:56cabe48c4b0
| bookmark: master
| tag: default/master
| tag: tip
| parent: 0:3442585be8a6
| user: test <test@example.org>
| date: Mon Jan 01 00:00:12 2007 +0000
| date: Mon Jan 01 00:00:13 2007 +0000
| summary: add gamma
|
| o changeset: 2:4d41070bf840
|/ bookmark: delta
| tag: default/delta
| parent: 0:3442585be8a6
| user: test <test@example.org>
| date: Mon Jan 01 00:00:12 2007 +0000
| summary: add delta
|
| o changeset: 1:7bcd915dc873
|/ bookmark: beta
| tag: default/beta
@ -108,22 +121,30 @@ pull the merge
importing git objects into hg
(run 'hg update' to get a working copy)
$ hg -R hgrepo log --graph
o changeset: 3:b8668fddf56c
o changeset: 4:892d20308ddf
|\ bookmark: master
| | tag: default/master
| | tag: tip
| | parent: 2:37c124f2d0a0
| | parent: 3:56cabe48c4b0
| | parent: 1:7bcd915dc873
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:12 2007 +0000
| | date: Mon Jan 01 00:00:13 2007 +0000
| | summary: Merge branch 'beta'
| |
| o changeset: 2:37c124f2d0a0
| o changeset: 3:56cabe48c4b0
| | parent: 0:3442585be8a6
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:12 2007 +0000
| | date: Mon Jan 01 00:00:13 2007 +0000
| | summary: add gamma
| |
| | o changeset: 2:4d41070bf840
| |/ bookmark: delta
| | tag: default/delta
| | parent: 0:3442585be8a6
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:12 2007 +0000
| | summary: add delta
| |
o | changeset: 1:7bcd915dc873
|/ bookmark: beta
| tag: default/beta