Mercurial > hg > hg-git
changeset 305:ad2ea8d6ef94
update_remote_branches: refactor head usage
Splice the ref name only once, and don't loop through refs/heads
multiple times.
This changes the order in which hg tags are created; update test output
to reflect this.
| author | Tay Ray Chuan <rctay89@gmail.com> |
|---|---|
| date | Mon, 29 Mar 2010 13:05:59 +0800 |
| parents | 60acfbd75382 |
| children | aba4284f41ec |
| files | hggit/git_handler.py tests/test-hg-author.out tests/test-hg-branch.out tests/test-hg-tags.out |
| diffstat | 4 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -710,24 +710,24 @@ ' bookmarks enabled?\n')) def update_remote_branches(self, remote_name, refs): - heads = dict([(ref[11:],refs[ref]) for ref in refs - if ref.startswith('refs/heads/')]) - - for head, sha in heads.iteritems(): + def _set_hg_tag(head, sha): # refs contains all the refs in the server, not just the ones # we are pulling if sha not in self.git.object_store: - continue + return hgsha = bin(self.map_hg_get(sha)) tag = '%s/%s' % (remote_name, head) self.repo.tag(tag, hgsha, '', True, None, None) - for ref_name in refs: + for ref_name, sha in refs.iteritems(): if ref_name.startswith('refs/heads'): - new_ref = 'refs/remotes/%s/%s' % (remote_name, ref_name[11:]) - self.git.refs[new_ref] = refs[ref_name] + head = ref_name[11:] + _set_hg_tag(head, sha) + + new_ref = 'refs/remotes/%s/%s' % (remote_name, head) + self.git.refs[new_ref] = sha elif ref_name.startswith('refs/tags'): - self.git.refs[ref_name] = refs[ref_name] + self.git.refs[ref_name] = sha ## UTILITY FUNCTIONS
--- a/tests/test-hg-author.out +++ b/tests/test-hg-author.out @@ -19,8 +19,8 @@ default::refs/heads/master => GIT:2b9ec6a4 @ changeset: 2:92d33c0dd6e1 | tag: master +| tag: tip | tag: default/master -| tag: tip | user: test <test@example.com> (comment) | date: Mon Jan 01 00:00:12 2007 +0000 | summary: modify beta @@ -45,8 +45,8 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @ changeset: 2:92d33c0dd6e1 | tag: master +| tag: tip | tag: default/master -| tag: tip | user: test <test@example.com> (comment) | date: Mon Jan 01 00:00:12 2007 +0000 | summary: modify beta
--- a/tests/test-hg-branch.out +++ b/tests/test-hg-branch.out @@ -21,8 +21,8 @@ @ changeset: 2:d93a72262a83 | branch: gamma | tag: master +| tag: tip | tag: default/master -| tag: tip | user: test | date: Mon Jan 01 00:00:12 2007 +0000 | summary: started branch gamma @@ -48,8 +48,8 @@ o changeset: 2:d93a72262a83 | branch: gamma | tag: master +| tag: tip | tag: default/master -| tag: tip | user: test | date: Mon Jan 01 00:00:12 2007 +0000 | summary: started branch gamma
--- a/tests/test-hg-tags.out +++ b/tests/test-hg-tags.out @@ -15,8 +15,8 @@ default::refs/heads/master => GIT:9a2616b9 @ changeset: 1:d529e9229f6d | tag: master +| tag: tip | tag: default/master -| tag: tip | user: test | date: Mon Jan 01 00:00:11 2007 +0000 | summary: Added tag alpha for changeset 3442585be8a6 @@ -39,8 +39,8 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @ changeset: 1:d529e9229f6d | tag: master +| tag: tip | tag: default/master -| tag: tip | user: test | date: Mon Jan 01 00:00:11 2007 +0000 | summary: Added tag alpha for changeset 3442585be8a6