hg-git: git_handler.py annotate

annotate git_handler.py @ 125:5b702bbf078f

local git branches to remotes

author	Ian Dees <undees@gmail.com>
date	Sun, 17 May 2009 15:29:18 -0700
parents	9dafb9ac24ff
children	705b88c9f3d1

rev	line source
99 541571f2e429 add progress indication during export Sverre Rabbelier <sverre@rabbelier.nl> parents: 97 diff changeset	1 import os, errno, sys, time, datetime, pickle, copy, math
76 aa2dadf04144 fixed the topo sorting and added a unit test Scott Chacon <schacon@gmail.com> parents: 75 diff changeset	2 import toposort
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	3 import dulwich
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	4 from dulwich.repo import Repo
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	5 from dulwich.client import SimpleFetchGraphWalker
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	6 from hgext import bookmarks
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	7 from mercurial.i18n import _
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	8 from mercurial.node import bin, hex, nullid
c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	9 from mercurial import hg, util, context, error
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	10 from dulwich.objects import (
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	11 Blob,
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	12 Commit,
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	13 ShaFile,
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	14 Tag,
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	15 Tree,
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	16 hex_to_sha
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	17 )
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	18
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	19 import math
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	20
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	21 def seconds_to_offset(time):
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	22 hours = (float(time) / 60 / 60)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	23 hour_diff = math.fmod(time, 60)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	24 minutes = int(hour_diff)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	25 hours = int(math.floor(hours))
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	26 if hours > 12:
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	27 sign = '+'
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	28 hours = 12 - (hours - 12)
69 983c2792f8d8 Better deal with negative timezone offsets Chris Wanstrath <chris@ozmm.org> parents: 68 diff changeset	29 elif hours > 0:
983c2792f8d8 Better deal with negative timezone offsets Chris Wanstrath <chris@ozmm.org> parents: 68 diff changeset	30 sign = '-'
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	31 else:
69 983c2792f8d8 Better deal with negative timezone offsets Chris Wanstrath <chris@ozmm.org> parents: 68 diff changeset	32 sign = ''
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	33 return sign + str(hours).rjust(2, '0') + str(minutes).rjust(2, '0')
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	34
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	35 def offset_to_seconds(offset):
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	36 if len(offset) == 5:
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	37 sign = offset[0:1]
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	38 hours = int(offset[1:3])
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	39 minutes = int(offset[3:5])
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	40 if sign == '+':
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	41 hours = 12 + (12 - hours)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	42 return (hours * 60 * 60) + (minutes) * 60
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	43 else:
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	44 return 0
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	45
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	46 class GitHandler(object):
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	47
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	48 def __init__(self, dest_repo, ui):
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	49 self.repo = dest_repo
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	50 self.ui = ui
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	51 self.mapfile = 'git-mapfile'
41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	52 self.configfile = 'git-config'
106 3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	53 self.gitdir = self.repo.join('git')
16 58cd05129119 moved init into git_handler Scott Chacon <schacon@gmail.com> parents: 14 diff changeset	54 self.init_if_missing()
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	55 self.load_git()
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	56 self.load_map()
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	57 self.load_config()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	58
2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	59 # make the git data directory
16 58cd05129119 moved init into git_handler Scott Chacon <schacon@gmail.com> parents: 14 diff changeset	60 def init_if_missing(self):
106 3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	61 if not os.path.exists(self.gitdir):
3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	62 os.mkdir(self.gitdir)
3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	63 Repo.init_bare(self.gitdir)
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	64
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	65 def load_git(self):
106 3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	66 self.git = Repo(self.gitdir)
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	67
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	68 ## FILE LOAD AND SAVE METHODS
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	69
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	70 def map_set(self, gitsha, hgsha):
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	71 self._map_git[gitsha] = hgsha
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	72 self._map_hg[hgsha] = gitsha
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	73
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	74 def map_hg_get(self, gitsha):
94 b88d6b214914 strip redundant module path and dict accessing Sverre Rabbelier <sverre@rabbelier.nl> parents: 92 diff changeset	75 return self._map_git.get(gitsha)
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	76
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	77 def map_git_get(self, hgsha):
94 b88d6b214914 strip redundant module path and dict accessing Sverre Rabbelier <sverre@rabbelier.nl> parents: 92 diff changeset	78 return self._map_hg.get(hgsha)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	79
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	80 def load_map(self):
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	81 self._map_git = {}
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	82 self._map_hg = {}
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	83 if os.path.exists(self.repo.join(self.mapfile)):
41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	84 for line in self.repo.opener(self.mapfile):
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	85 gitsha, hgsha = line.strip().split(' ', 1)
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	86 self._map_git[gitsha] = hgsha
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	87 self._map_hg[hgsha] = gitsha
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	88
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	89 def save_map(self):
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	90 file = self.repo.opener(self.mapfile, 'w+', atomictemp=True)
100 e17d9eea44ab sort the mapfile before writing Sverre Rabbelier <sverre@rabbelier.nl> parents: 99 diff changeset	91 for gitsha, hgsha in sorted(self._map_git.iteritems()):
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	92 file.write("%s %s\n" % (gitsha, hgsha))
101 7c57f15d397c use atomictemp to prevent corruption on ctrl-c Sverre Rabbelier <sverre@rabbelier.nl> parents: 100 diff changeset	93 file.rename()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	94
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	95 def load_config(self):
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	96 self._config = {}
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	97 if os.path.exists(self.repo.join(self.configfile)):
41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	98 for line in self.repo.opener(self.configfile):
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	99 key, value = line.strip().split(' ', 1)
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	100 self._config[key] = value
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	101
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	102 def save_config(self):
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	103 file = self.repo.opener(self.configfile, 'w+', atomictemp=True)
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	104 for key, value in self._config.iteritems():
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	105 file.write("%s %s\n" % (key, value))
104 7e345078425e use atomictemp to prevent corruption on ctrl-c Sverre Rabbelier <sverre@rabbelier.nl> parents: 103 diff changeset	106 file.rename()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	107
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	108
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	109 ## END FILE LOAD AND SAVE METHODS
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	110
12 227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	111 def fetch(self, remote_name):
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	112 self.ui.status(_("fetching from : %s\n") % remote_name)
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	113 self.export_git_objects()
56 5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	114 refs = self.fetch_pack(remote_name)
5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	115 if refs:
5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	116 self.import_git_objects(remote_name)
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	117 self.save_map()
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	118
97 f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	119 def export(self):
f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	120 self.export_git_objects()
f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	121 self.update_references()
f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	122 self.save_map()
f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	123
17 ace0f6ed65a1 setting up for upload-pack functionality Scott Chacon <schacon@gmail.com> parents: 16 diff changeset	124 def push(self, remote_name):
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	125 self.ui.status(_("pushing to : %s\n") % remote_name)
97 f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	126 self.export()
125 5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	127 self.update_remote_references(remote_name)
17 ace0f6ed65a1 setting up for upload-pack functionality Scott Chacon <schacon@gmail.com> parents: 16 diff changeset	128 self.upload_pack(remote_name)
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	129
12 227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	130 def remote_add(self, remote_name, git_url):
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	131 self._config['remote.' + remote_name + '.url'] = git_url
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	132 self.save_config()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	133
39 173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	134 def remote_remove(self, remote_name):
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	135 key = 'remote.' + remote_name + '.url'
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	136 if key in self._config:
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	137 del self._config[key]
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	138 self.save_config()
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	139
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	140 def remote_show(self, remote_name):
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	141 key = 'remote.' + remote_name + '.url'
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	142 if key in self._config:
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	143 name = self._config[key]
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	144 self.ui.status(_("URL for %s : %s\n") % (remote_name, name, ))
39 173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	145 else:
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	146 self.ui.status(_("No remote named : %s\n") % remote_name)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	147 return
39 173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	148
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	149 def remote_list(self):
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	150 for key, value in self._config.iteritems():
173e738d0da4 remote management tools Scott Chacon <schacon@gmail.com> parents: 38 diff changeset	151 if key[0:6] == 'remote':
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	152 self.ui.status('%s\t%s\n' % (key, value, ))
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	153
12 227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	154 def remote_name_to_url(self, remote_name):
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	155 return self._config['remote.' + remote_name + '.url']
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	156
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	157 def update_references(self):
124 9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	158 try:
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	159 # We only care about bookmarks of the form 'name',
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	160 # not 'remote/name'.
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	161 def is_local_ref(item): return item[0].count('/') == 0
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	162 bms = bookmarks.parse(self.repo)
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	163 bms = dict(filter(is_local_ref, bms.items()))
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	164
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	165 # Create a local Git branch name for each
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	166 # Mercurial bookmark.
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	167 for key in bms:
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	168 hg_sha = hex(bms[key])
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	169 git_sha = self.map_git_get(hg_sha)
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	170 self.git.set_ref('refs/heads/' + key, git_sha)
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	171 except AttributeError:
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	172 # No bookmarks extension
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	173 pass
9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	174
25 88e9e9e1caf1 will now set the current tip() as your git 'master' branch for packfile upload Scott Chacon <schacon@gmail.com> parents: 24 diff changeset	175 c = self.map_git_get(hex(self.repo.changelog.tip()))
88e9e9e1caf1 will now set the current tip() as your git 'master' branch for packfile upload Scott Chacon <schacon@gmail.com> parents: 24 diff changeset	176 self.git.set_ref('refs/heads/master', c)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	177
125 5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	178 def update_remote_references(self, remote_name):
5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	179 def is_local_head(item): return item[0].startswith('refs/heads')
5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	180 refs = self.git.get_refs()
5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	181 heads = dict(filter(is_local_head, refs.items()))
5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	182
5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	183 self.git.set_remote_refs(heads, remote_name)
5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	184
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	185 def export_git_objects(self):
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	186 self.ui.status(_("exporting git objects\n"))
99 541571f2e429 add progress indication during export Sverre Rabbelier <sverre@rabbelier.nl> parents: 97 diff changeset	187 total = len(self.repo.changelog)
107 8c83d2021b03 more pythonic way to calculate the magnitude Sverre Rabbelier <sverre@rabbelier.nl> parents: 106 diff changeset	188 magnitude = int(math.log(total, 10)) + 1 if total else 1
99 541571f2e429 add progress indication during export Sverre Rabbelier <sverre@rabbelier.nl> parents: 97 diff changeset	189 for i, rev in enumerate(self.repo.changelog):
541571f2e429 add progress indication during export Sverre Rabbelier <sverre@rabbelier.nl> parents: 97 diff changeset	190 if i%100 == 0:
541571f2e429 add progress indication during export Sverre Rabbelier <sverre@rabbelier.nl> parents: 97 diff changeset	191 self.ui.status(_("at: %*d/%d\n") % (magnitude, i, total))
102 302df8a2a8d0 major speedup in the already-converted case Sverre Rabbelier <sverre@rabbelier.nl> parents: 101 diff changeset	192 pgit_sha, already_written = self.export_hg_commit(rev)
302df8a2a8d0 major speedup in the already-converted case Sverre Rabbelier <sverre@rabbelier.nl> parents: 101 diff changeset	193 if not already_written:
302df8a2a8d0 major speedup in the already-converted case Sverre Rabbelier <sverre@rabbelier.nl> parents: 101 diff changeset	194 self.save_map()
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	195
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	196 # convert this commit into git objects
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	197 # go through the manifest, convert all blobs/trees we don't have
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	198 # write the commit object (with metadata info)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	199 def export_hg_commit(self, rev):
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	200 # return if we've already processed this
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	201 node = self.repo.changelog.lookup(rev)
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	202 phgsha = hex(node)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	203 pgit_sha = self.map_git_get(phgsha)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	204 if pgit_sha:
102 302df8a2a8d0 major speedup in the already-converted case Sverre Rabbelier <sverre@rabbelier.nl> parents: 101 diff changeset	205 return pgit_sha, True
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	206
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	207 self.ui.status(_("converting revision %s\n") % str(rev))
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	208
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	209 # make sure parents are converted first
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	210 parents = self.repo.parents(rev)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	211 for parent in parents:
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	212 p_rev = parent.rev()
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	213 hgsha = hex(parent.node())
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	214 git_sha = self.map_git_get(hgsha)
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	215 if not p_rev == -1:
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	216 if not git_sha:
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	217 self.export_hg_commit(p_rev)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	218
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	219 ctx = self.repo.changectx(rev)
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	220 tree_sha, renames = self.write_git_tree(ctx)
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	221
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	222 commit = {}
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	223 commit['tree'] = tree_sha
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	224 (time, timezone) = ctx.date()
68 d28d3763eda3 Deal with hg authors missing email attributes. Chris Wanstrath <chris@ozmm.org> parents: 65 diff changeset	225
d28d3763eda3 Deal with hg authors missing email attributes. Chris Wanstrath <chris@ozmm.org> parents: 65 diff changeset	226 # hg authors might not have emails
d28d3763eda3 Deal with hg authors missing email attributes. Chris Wanstrath <chris@ozmm.org> parents: 65 diff changeset	227 author = ctx.user()
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	228 if not '>' in author: # TODO : this kills losslessness - die (submodules)?
68 d28d3763eda3 Deal with hg authors missing email attributes. Chris Wanstrath <chris@ozmm.org> parents: 65 diff changeset	229 author = author + ' <none@none>'
d28d3763eda3 Deal with hg authors missing email attributes. Chris Wanstrath <chris@ozmm.org> parents: 65 diff changeset	230 commit['author'] = author + ' ' + str(int(time)) + ' ' + seconds_to_offset(timezone)
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	231 message = ctx.description()
80 0e0a2d20deed added a missing newline back to git conversion Scott Chacon <schacon@gmail.com> parents: 79 diff changeset	232 commit['message'] = ctx.description() + "\n"
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	233
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	234 extra = ctx.extra()
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	235 if 'committer' in extra:
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	236 commit['committer'] = extra['committer']
118 b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	237 if 'encoding' in extra:
b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	238 commit['encoding'] = extra['encoding']
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	239
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	240 # HG EXTRA INFORMATION
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	241 add_extras = False
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	242 extra_message = ''
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	243 if not ctx.branch() == 'default':
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	244 add_extras = True
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	245 extra_message += "branch : " + ctx.branch() + "\n"
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	246
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	247 if renames:
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	248 add_extras = True
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	249 for oldfile, newfile in renames:
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	250 extra_message += "rename : " + oldfile + " => " + newfile + "\n"
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	251
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	252 if add_extras:
80 0e0a2d20deed added a missing newline back to git conversion Scott Chacon <schacon@gmail.com> parents: 79 diff changeset	253 commit['message'] += "\n--HG--\n" + extra_message
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	254
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	255 commit['parents'] = []
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	256 for parent in parents:
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	257 hgsha = hex(parent.node())
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	258 git_sha = self.map_git_get(hgsha)
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	259 if git_sha:
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	260 commit['parents'].append(git_sha)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	261
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	262 commit_sha = self.git.write_commit_hash(commit) # writing new blobs to git
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	263 self.map_set(commit_sha, phgsha)
102 302df8a2a8d0 major speedup in the already-converted case Sverre Rabbelier <sverre@rabbelier.nl> parents: 101 diff changeset	264 return commit_sha, False
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	265
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	266 def write_git_tree(self, ctx):
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	267 trees = {}
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	268 man = ctx.manifest()
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	269 renames = []
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	270 for filenm in man.keys():
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	271 # write blob if not in our git database
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	272 fctx = ctx.filectx(filenm)
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	273 rename = fctx.renamed()
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	274 if rename:
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	275 filerename, sha = rename
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	276 renames.append((filerename, filenm))
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	277 is_exec = 'x' in fctx.flags()
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	278 is_link = 'l' in fctx.flags()
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	279 file_id = hex(fctx.filenode())
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	280 blob_sha = self.map_git_get(file_id)
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	281 if not blob_sha:
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	282 blob_sha = self.git.write_blob(fctx.data()) # writing new blobs to git
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	283 self.map_set(blob_sha, file_id)
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	284
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	285 parts = filenm.split('/')
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	286 if len(parts) > 1:
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	287 # get filename and path for leading subdir
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	288 filepath = parts[-1:][0]
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	289 dirpath = "/".join([v for v in parts[0:-1]]) + '/'
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	290
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	291 # get subdir name and path for parent dir
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	292 parpath = '/'
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	293 nparpath = '/'
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	294 for part in parts[0:-1]:
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	295 if nparpath == '/':
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	296 nparpath = part + '/'
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	297 else:
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	298 nparpath += part + '/'
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	299
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	300 treeentry = ['tree', part + '/', nparpath]
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	301
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	302 if parpath not in trees:
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	303 trees[parpath] = []
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	304 if treeentry not in trees[parpath]:
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	305 trees[parpath].append( treeentry )
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	306
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	307 parpath = nparpath
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	308
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	309 # set file entry
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	310 fileentry = ['blob', filepath, blob_sha, is_exec, is_link]
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	311 if dirpath not in trees:
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	312 trees[dirpath] = []
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	313 trees[dirpath].append(fileentry)
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	314
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	315 else:
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	316 fileentry = ['blob', parts[0], blob_sha, is_exec, is_link]
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	317 if '/' not in trees:
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	318 trees['/'] = []
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	319 trees['/'].append(fileentry)
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	320
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	321 # sort by tree depth, so we write the deepest trees first
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	322 dirs = trees.keys()
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	323 dirs.sort(lambda a, b: len(b.split('/'))-len(a.split('/')))
42 fcfb4db848e1 added hack for pushing first branch Scott Chacon <schacon@gmail.com> parents: 40 diff changeset	324 dirs.remove('/')
fcfb4db848e1 added hack for pushing first branch Scott Chacon <schacon@gmail.com> parents: 40 diff changeset	325 dirs.append('/')
92 6305f274fc63 fixed subtree issue and zero padding issue Scott Chacon <schacon@gmail.com> parents: 90 diff changeset	326
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	327 # write all the trees
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	328 tree_sha = None
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	329 tree_shas = {}
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	330 for dirnm in dirs:
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	331 tree_data = []
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	332 for entry in trees[dirnm]:
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	333 # replace tree path with tree SHA
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	334 if entry[0] == 'tree':
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	335 sha = tree_shas[entry[2]]
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	336 entry[2] = sha
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	337 tree_data.append(entry)
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	338 tree_sha = self.git.write_tree_array(tree_data) # writing new trees to git
ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	339 tree_shas[dirnm] = tree_sha
92 6305f274fc63 fixed subtree issue and zero padding issue Scott Chacon <schacon@gmail.com> parents: 90 diff changeset	340
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	341 return (tree_sha, renames) # should be the last root tree sha
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	342
13 01f28d40cb6a checks out the HEAD node from a clone Scott Chacon <schacon@gmail.com> parents: 12 diff changeset	343 def remote_head(self, remote_name):
01f28d40cb6a checks out the HEAD node from a clone Scott Chacon <schacon@gmail.com> parents: 12 diff changeset	344 for head, sha in self.git.remote_refs(remote_name).iteritems():
01f28d40cb6a checks out the HEAD node from a clone Scott Chacon <schacon@gmail.com> parents: 12 diff changeset	345 if head == 'HEAD':
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	346 return self.map_hg_get(sha)
13 01f28d40cb6a checks out the HEAD node from a clone Scott Chacon <schacon@gmail.com> parents: 12 diff changeset	347 return None
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	348
17 ace0f6ed65a1 setting up for upload-pack functionality Scott Chacon <schacon@gmail.com> parents: 16 diff changeset	349 def upload_pack(self, remote_name):
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	350 git_url = self.remote_name_to_url(remote_name)
a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	351 client, path = self.get_transport_and_path(git_url)
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	352 changed = self.get_changed_refs
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	353 genpack = self.generate_pack_contents
a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	354 try:
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	355 self.ui.status(_("creating and sending data\n"))
47 3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	356 changed_refs = client.send_pack(path, changed, genpack)
52 87d462a6b796 pushing nothing works better Scott Chacon <schacon@gmail.com> parents: 51 diff changeset	357 if changed_refs:
87d462a6b796 pushing nothing works better Scott Chacon <schacon@gmail.com> parents: 51 diff changeset	358 new_refs = {}
88 52b4be85151d fixed some small compatability issues with the dulwich update Scott Chacon <schacon@gmail.com> parents: 80 diff changeset	359 for ref, sha in changed_refs.iteritems():
52b4be85151d fixed some small compatability issues with the dulwich update Scott Chacon <schacon@gmail.com> parents: 80 diff changeset	360 self.ui.status(" "+ remote_name + "::" + ref + " => GIT:" + sha[0:8] + "\n")
52b4be85151d fixed some small compatability issues with the dulwich update Scott Chacon <schacon@gmail.com> parents: 80 diff changeset	361 new_refs[ref] = sha
52 87d462a6b796 pushing nothing works better Scott Chacon <schacon@gmail.com> parents: 51 diff changeset	362 self.git.set_remote_refs(new_refs, remote_name)
87d462a6b796 pushing nothing works better Scott Chacon <schacon@gmail.com> parents: 51 diff changeset	363 self.update_hg_bookmarks(remote_name)
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	364 except:
96 0cec7b1e07ff add a few more TODO's Sverre Rabbelier <sverre@rabbelier.nl> parents: 95 diff changeset	365 # TODO : remove try/except or do something useful here
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	366 raise
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	367
42 fcfb4db848e1 added hack for pushing first branch Scott Chacon <schacon@gmail.com> parents: 40 diff changeset	368 # TODO : for now, we'll just push all heads that match remote heads
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	369 # * we should have specified push, tracking branches and --all
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	370 # takes a dict of refs:shas from the server and returns what should be
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	371 # pushed up
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	372 def get_changed_refs(self, refs):
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	373 keys = refs.keys()
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	374
88 52b4be85151d fixed some small compatability issues with the dulwich update Scott Chacon <schacon@gmail.com> parents: 80 diff changeset	375 changed = {}
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	376 if not keys:
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	377 return None
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	378
42 fcfb4db848e1 added hack for pushing first branch Scott Chacon <schacon@gmail.com> parents: 40 diff changeset	379 # TODO : this is a huge hack
fcfb4db848e1 added hack for pushing first branch Scott Chacon <schacon@gmail.com> parents: 40 diff changeset	380 if keys[0] == 'capabilities^{}': # nothing on the server yet - first push
88 52b4be85151d fixed some small compatability issues with the dulwich update Scott Chacon <schacon@gmail.com> parents: 80 diff changeset	381 changed['refs/heads/master'] = self.git.ref('master')
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	382
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	383 for ref_name in keys:
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	384 parts = ref_name.split('/')
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	385 if parts[0] == 'refs': # strip off 'refs/heads'
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	386 if parts[1] == 'heads':
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	387 head = "/".join([v for v in parts[2:]])
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	388 local_ref = self.git.ref(ref_name)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	389 if local_ref:
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	390 if not local_ref == refs[ref_name]:
88 52b4be85151d fixed some small compatability issues with the dulwich update Scott Chacon <schacon@gmail.com> parents: 80 diff changeset	391 changed[ref_name] = local_ref
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	392 return changed
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	393
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	394 # takes a list of shas the server wants and shas the server has
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	395 # and generates a list of commit shas we need to push up
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	396 def generate_pack_contents(self, want, have):
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	397 graph_walker = SimpleFetchGraphWalker(want, self.git.get_parents)
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	398 next = graph_walker.next()
77 d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	399 shas = set()
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	400 while next:
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	401 if next in have:
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	402 graph_walker.ack(next)
7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	403 else:
77 d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	404 shas.add(next)
37 7046d792dfcd fix bug where it was not writing the git object names properly Scott Chacon <schacon@gmail.com> parents: 35 diff changeset	405 next = graph_walker.next()
77 d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	406
d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	407 seen = []
d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	408
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	409 # so now i have the shas, need to turn them into a list of
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	410 # tuples (sha, path) for ALL the objects i'm sending
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	411 # TODO : don't send blobs or trees they already have
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	412 def get_objects(tree, path):
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	413 changes = list()
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	414 changes.append((tree, path))
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	415 for (mode, name, sha) in tree.entries():
96 0cec7b1e07ff add a few more TODO's Sverre Rabbelier <sverre@rabbelier.nl> parents: 95 diff changeset	416 if mode == 57344: # TODO : properly handle submodules and document what 57344 means
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	417 continue
77 d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	418 if sha in seen:
d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	419 continue
d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	420
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	421 obj = self.git.get_object(sha)
77 d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	422 seen.append(sha)
76 aa2dadf04144 fixed the topo sorting and added a unit test Scott Chacon <schacon@gmail.com> parents: 75 diff changeset	423 if isinstance (obj, Blob):
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	424 changes.append((obj, path + name))
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	425 elif isinstance(obj, Tree):
77 d7b8768d005a reapplying defunkts changes Scott Chacon <schacon@gmail.com> parents: 76 diff changeset	426 changes.extend(get_objects(obj, path + name + '/'))
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	427 return changes
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	428
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	429 objects = []
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	430 for commit_sha in shas:
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	431 commit = self.git.commit(commit_sha)
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	432 objects.append((commit, 'commit'))
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	433 tree = self.git.get_object(commit.tree)
f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	434 objects.extend( get_objects(tree, '/') )
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	435
38 f0daee676e10 successful push to an upstream git server - BOOYAH! Scott Chacon <schacon@gmail.com> parents: 37 diff changeset	436 return objects
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	437
12 227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	438 def fetch_pack(self, remote_name):
227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	439 git_url = self.remote_name_to_url(remote_name)
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	440 client, path = self.get_transport_and_path(git_url)
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	441 graphwalker = SimpleFetchGraphWalker(self.git.heads().values(), self.git.get_parents)
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	442 f, commit = self.git.object_store.add_pack()
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	443 try:
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	444 determine_wants = self.git.object_store.determine_wants_all
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	445 refs = client.fetch_pack(path, determine_wants, graphwalker, f.write, sys.stdout.write)
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	446 f.close()
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	447 commit()
56 5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	448 if refs:
5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	449 self.git.set_remote_refs(refs, remote_name)
5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	450 else:
5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	451 self.ui.status(_("nothing new on the server\n"))
5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	452 return refs
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	453 except:
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	454 f.close()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	455 raise
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	456
12 227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	457 def import_git_objects(self, remote_name):
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	458 self.ui.status(_("importing Git objects into Hg\n"))
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	459 # import heads as remote references
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	460 todo = []
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	461 done = set()
9 7e776864b301 sorts the commits topologically before converting Scott Chacon <schacon@gmail.com> parents: 8 diff changeset	462 convert_list = {}
112 dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	463 self.renames = {}
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	464
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	465 # get a list of all the head shas
12 227b11d75844 updates bookmarks and beginnings of seperate remotes support Scott Chacon <schacon@gmail.com> parents: 11 diff changeset	466 for head, sha in self.git.remote_refs(remote_name).iteritems():
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	467 todo.append(sha)
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	468
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	469 # traverse the heads getting a list of all the unique commits
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	470 while todo:
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	471 sha = todo.pop()
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	472 assert isinstance(sha, str)
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	473 if sha in done:
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	474 continue
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	475 done.add(sha)
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	476 try:
a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	477 commit = self.git.commit(sha)
a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	478 convert_list[sha] = commit
a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	479 todo.extend([p for p in commit.parents if p not in done])
a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	480 except:
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	481 self.ui.warn(_("Cannot import tags yet\n")) # TODO
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	482
2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	483 # sort the commits
78 71b07e16004f fix, but im not sure its fixed yet Scott Chacon <schacon@gmail.com> parents: 77 diff changeset	484 commits = toposort.TopoSort(convert_list).items()
113 d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	485
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	486 # import each of the commits, oldest first
9 7e776864b301 sorts the commits topologically before converting Scott Chacon <schacon@gmail.com> parents: 8 diff changeset	487 for csha in commits:
113 d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	488 commit = convert_list[csha]
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	489 if not self.map_hg_get(csha): # it's already here
56 5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	490 self.import_git_commit(commit)
113 d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	491 else:
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	492 self.pseudo_import_git_commit(commit)
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	493
47 3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	494 self.update_hg_bookmarks(remote_name)
3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	495
3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	496 def update_hg_bookmarks(self, remote_name):
29 2a5c0bf0fef5 Another way of fixing no-bookmark issue, along with updated test. Augie Fackler <durin42@gmail.com> parents: 28 diff changeset	497 try:
47 3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	498 bms = bookmarks.parse(self.repo)
3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	499 for head, sha in self.git.remote_refs(remote_name).iteritems():
3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	500 hgsha = hex_to_sha(self.map_hg_get(sha))
3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	501 if not head == 'HEAD':
3b62270c1fad writing some status output after a push, updating local bookmarks Scott Chacon <schacon@gmail.com> parents: 42 diff changeset	502 bms[remote_name + '/' + head] = hgsha
29 2a5c0bf0fef5 Another way of fixing no-bookmark issue, along with updated test. Augie Fackler <durin42@gmail.com> parents: 28 diff changeset	503 bookmarks.write(self.repo, bms)
2a5c0bf0fef5 Another way of fixing no-bookmark issue, along with updated test. Augie Fackler <durin42@gmail.com> parents: 28 diff changeset	504 except AttributeError:
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	505 self.ui.warn(_('creating bookmarks failed, do you have'
7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	506 ' bookmarks enabled?\n'))
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	507
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	508 def convert_git_int_mode(self, mode):
96 0cec7b1e07ff add a few more TODO's Sverre Rabbelier <sverre@rabbelier.nl> parents: 95 diff changeset	509 # TODO : make these into constants
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	510 convert = {
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	511 33188: '',
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	512 40960: 'l',
110 8fffec9ec750 quick fix for executable bit settings Scott Chacon <schacon@gmail.com> parents: 107 diff changeset	513 33261: 'x'}
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	514 if mode in convert:
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	515 return convert[mode]
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	516 return ''
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	517
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	518 def extract_hg_metadata(self, message):
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	519 split = message.split("\n\n--HG--\n", 1)
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	520 renames = {}
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	521 branch = False
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	522 if len(split) == 2:
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	523 message, meta = split
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	524 lines = meta.split("\n")
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	525 for line in lines:
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	526 if line == '':
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	527 continue
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	528
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	529 command, data = line.split(" : ", 1)
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	530 if command == 'rename':
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	531 before, after = data.split(" => ", 1)
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	532 renames[after] = before
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	533 if command == 'branch':
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	534 branch = data
7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	535 return (message, renames, branch)
113 d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	536
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	537 def pseudo_import_git_commit(self, commit):
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	538 (strip_message, hg_renames, hg_branch) = self.extract_hg_metadata(commit.message)
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	539 cs = self.map_hg_get(commit.id)
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	540 p1 = "0" * 40
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	541 p2 = "0" * 40
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	542 if len(commit.parents) > 0:
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	543 sha = commit.parents[0]
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	544 p1 = self.map_hg_get(sha)
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	545 if len(commit.parents) > 1:
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	546 sha = commit.parents[1]
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	547 p2 = self.map_hg_get(sha)
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	548 if len(commit.parents) > 2:
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	549 # TODO : map extra parents to the extras file
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	550 pass
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	551 # saving rename info
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	552 if (not (p2 == "0"40) or (p1 == "0"40)):
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	553 self.renames[cs] = {}
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	554 else:
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	555 self.renames[cs] = self.renames[p1].copy()
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	556
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	557 self.renames[cs].update(hg_renames)
d862b6a4fbd4 adding rename detection to already imported objects Scott Chacon <schacon@gmail.com> parents: 112 diff changeset	558
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	559 def import_git_commit(self, commit):
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	560 self.ui.debug(_("importing: %s\n") % commit.id)
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	561 # TODO : find and use hg named branches
35 562fc51b991e we did the same thing, not sure why it conflicted Scott Chacon <schacon@gmail.com> parents: 29 diff changeset	562 # TODO : add extra Git data (committer info) as extras to changeset
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	563
10 66860f141788 update todo file and removed outdated TODO comments Scott Chacon <schacon@gmail.com> parents: 9 diff changeset	564 # TODO : (?) have to handle merge contexts at some point (two parent files, etc)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	565 # TODO : Do something less coarse-grained than try/except on the
d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	566 # get_file call for removed files
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	567
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	568 (strip_message, hg_renames, hg_branch) = self.extract_hg_metadata(commit.message)
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	569
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	570 def getfilectx(repo, memctx, f):
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	571 try:
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	572 (mode, sha, data) = self.git.get_file(commit, f)
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	573 e = self.convert_git_int_mode(mode)
92 6305f274fc63 fixed subtree issue and zero padding issue Scott Chacon <schacon@gmail.com> parents: 90 diff changeset	574 except TypeError:
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	575 raise IOError()
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	576 if f in hg_renames:
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	577 copied_path = hg_renames[f]
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	578 else:
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	579 copied_path = None
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	580 return context.memfilectx(f, data, 'l' in e, 'x' in e, copied_path)
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	581
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	582 p1 = "0" * 40
c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	583 p2 = "0" * 40
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	584 if len(commit.parents) > 0:
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	585 sha = commit.parents[0]
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	586 p1 = self.map_hg_get(sha)
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	587 if len(commit.parents) > 1:
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	588 sha = commit.parents[1]
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	589 p2 = self.map_hg_get(sha)
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	590 if len(commit.parents) > 2:
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	591 # TODO : map extra parents to the extras file
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	592 pass
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	593
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	594 # get a list of the changed, added, removed files
76 aa2dadf04144 fixed the topo sorting and added a unit test Scott Chacon <schacon@gmail.com> parents: 75 diff changeset	595 files = self.git.get_files_changed(commit)
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	596
112 dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	597 # wierd hack for explicit file renames in first but not second branch
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	598 if not (p2 == "0"*40):
112 dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	599 vals = [item for item in self.renames[p1].values() if not item in self.renames[p2].values()]
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	600 for removefile in vals:
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	601 files.remove(removefile)
112 dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	602
76 aa2dadf04144 fixed the topo sorting and added a unit test Scott Chacon <schacon@gmail.com> parents: 75 diff changeset	603 extra = {}
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	604
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	605 # if named branch, add to extra
7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	606 if hg_branch:
7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	607 extra['branch'] = hg_branch
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	608
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	609 # if committer is different than author, add it to extra
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	610 if not commit._author_raw == commit._committer_raw:
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	611 extra['committer'] = commit._committer_raw
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	612
118 b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	613 if commit._encoding:
b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	614 extra['encoding'] = commit._encoding
b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	615
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	616 if hg_branch:
e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	617 extra['branch'] = hg_branch
118 b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	618
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	619 text = strip_message
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	620 date = datetime.datetime.fromtimestamp(commit.author_time).strftime("%Y-%m-%d %H:%M:%S")
6 c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	621 ctx = context.memctx(self.repo, (p1, p2), text, files, getfilectx,
c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	622 commit.author, date, extra)
c77197123d95 importing basic, mostly stubbed changesets Scott Chacon <schacon@gmail.com> parents: 5 diff changeset	623 a = self.repo.commitctx(ctx)
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	624
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	625 # get changeset id
112 dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	626 cs = hex(self.repo.changelog.tip())
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	627 # save changeset to mapping file
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	628 gitsha = commit.id
112 dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	629
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	630 # saving rename info
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	631 if (not (p2 == "0"40) or (p1 == "0"40)):
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	632 self.renames[cs] = {}
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	633 else:
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	634 self.renames[cs] = self.renames[p1].copy()
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	635
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	636 self.renames[cs].update(hg_renames)
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	637
dca3be87e9f1 i cannot for the heck of me figure out why renames are handled this way, but so be it, it works Scott Chacon <schacon@gmail.com> parents: 110 diff changeset	638 self.map_set(gitsha, cs)
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	639
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	640 def check_bookmarks(self):
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	641 if self.ui.config('extensions', 'hgext.bookmarks') is not None:
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	642 self.ui.warn("YOU NEED TO SETUP BOOKMARKS\n")
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	643
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	644 def get_transport_and_path(self, uri):
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	645 from dulwich.client import TCPGitClient, SSHGitClient, SubprocessGitClient
35 562fc51b991e we did the same thing, not sure why it conflicted Scott Chacon <schacon@gmail.com> parents: 29 diff changeset	646 for handler, transport in (("git://", TCPGitClient), ("git@", SSHGitClient), ("git+ssh://", SSHGitClient)):
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	647 if uri.startswith(handler):
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	648 if handler == 'git@':
28 b258ef16ae37 Fix non-ssh URI parsing. Augie Fackler <durin42@gmail.com> parents: 26 diff changeset	649 host, path = uri[len(handler):].split(":", 1)
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	650 host = 'git@' + host
28 b258ef16ae37 Fix non-ssh URI parsing. Augie Fackler <durin42@gmail.com> parents: 26 diff changeset	651 else:
35 562fc51b991e we did the same thing, not sure why it conflicted Scott Chacon <schacon@gmail.com> parents: 29 diff changeset	652 host, path = uri[len(handler):].split("/", 1)
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	653 return transport(host), '/' + path
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	654 # if its not git or git+ssh, try a local url..
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	655 return SubprocessGitClient(), uri
9 7e776864b301 sorts the commits topologically before converting Scott Chacon <schacon@gmail.com> parents: 8 diff changeset	656
40 f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	657 def clear(self):
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	658 mapfile = self.repo.join(self.mapfile)
106 3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	659 if os.path.exists(self.gitdir):
3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	660 for root, dirs, files in os.walk(self.gitdir, topdown=False):
40 f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	661 for name in files:
f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	662 os.remove(os.path.join(root, name))
f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	663 for name in dirs:
f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	664 os.rmdir(os.path.join(root, name))
106 3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	665 os.rmdir(self.gitdir)
40 f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	666 if os.path.exists(mapfile):
f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	667 os.remove(mapfile)

Mercurial > hg > hg-git

annotate git_handler.py @ 125:5b702bbf078f