hg-git: git_handler.py annotate

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

2 import toposort

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

3 import dulwich

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

4 from dulwich.repo import Repo

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

5 from dulwich.client import SimpleFetchGraphWalker

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

6 from hgext import bookmarks

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

7 from mercurial.i18n import _

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

8 from mercurial.node import bin, hex, nullid

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

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

10 from dulwich.objects import (

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

11 Blob,

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

12 Commit,

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

13 ShaFile,

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

14 Tag,

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

15 Tree,

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

18 )

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

19

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

20 import math

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

21

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

22 def seconds_to_offset(time):

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

23 hours = (float(time) / 60 / 60)

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

24 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

25 minutes = int(hour_diff)

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

26 hours = int(math.floor(hours))

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

27 if hours > 12:

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

28 sign = '+'

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

29 hours = 12 - (hours - 12)

69

983c2792f8d8 Better deal with negative timezone offsets

Chris Wanstrath <chris@ozmm.org>

parents: 68

30 elif hours > 0:

983c2792f8d8 Better deal with negative timezone offsets

Chris Wanstrath <chris@ozmm.org>

parents: 68

31 sign = '-'

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

32 else:

69

983c2792f8d8 Better deal with negative timezone offsets

Chris Wanstrath <chris@ozmm.org>

parents: 68

33 sign = ''

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

34 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

35

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

36 def offset_to_seconds(offset):

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

37 if len(offset) == 5:

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

38 sign = offset[0:1]

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

39 hours = int(offset[1:3])

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

40 minutes = int(offset[3:5])

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

41 if sign == '+':

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

42 hours = 12 + (12 - hours)

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

43 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

44 else:

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

45 return 0

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

46

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

47 class GitHandler(object):

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

48

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

49 def __init__(self, dest_repo, ui):

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

50 self.repo = dest_repo

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

51 self.ui = ui

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

52 self.mapfile = 'git-mapfile'

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

53 self.configfile = 'git-config'

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

54 self.gitdir = self.repo.join('git')

16

58cd05129119 moved init into git_handler

Scott Chacon <schacon@gmail.com>

parents: 14

55 self.init_if_missing()

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

56 self.load_git()

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

57 self.load_map()

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

58 self.load_config()

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

59

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

60 # make the git data directory

16

58cd05129119 moved init into git_handler

Scott Chacon <schacon@gmail.com>

parents: 14

61 def init_if_missing(self):

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

62 if not os.path.exists(self.gitdir):

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

63 os.mkdir(self.gitdir)

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

64 Repo.init_bare(self.gitdir)

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

65

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

66 def load_git(self):

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

67 self.git = Repo(self.gitdir)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

68

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

69 ## FILE LOAD AND SAVE METHODS

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

70

21

13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo.

Scott Chacon <schacon@gmail.com>

parents: 19

71 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

72 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

73 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

74

13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo.

Scott Chacon <schacon@gmail.com>

parents: 19

75 def map_hg_get(self, gitsha):

94

b88d6b214914 strip redundant module path and dict accessing

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 92

76 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

77

13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo.

Scott Chacon <schacon@gmail.com>

parents: 19

78 def map_git_get(self, hgsha):

94

b88d6b214914 strip redundant module path and dict accessing

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 92

79 return self._map_hg.get(hgsha)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

80

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

81 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

82 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

83 self._map_hg = {}

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

84 if os.path.exists(self.repo.join(self.mapfile)):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

85 for line in self.repo.opener(self.mapfile):

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

86 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

87 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

88 self._map_hg[hgsha] = gitsha

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

89

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

90 def save_map(self):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

91 file = self.repo.opener(self.mapfile, 'w+', atomictemp=True)

100

e17d9eea44ab sort the mapfile before writing

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 99

92 for gitsha, hgsha in sorted(self._map_git.iteritems()):

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

93 file.write("%s %s\n" % (gitsha, hgsha))

101

7c57f15d397c use atomictemp to prevent corruption on ctrl-c

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 100

94 file.rename()

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

95

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

96 def load_config(self):

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

97 self._config = {}

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

98 if os.path.exists(self.repo.join(self.configfile)):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

99 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

100 key, value = line.strip().split(' ', 1)

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

101 self._config[key] = value

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

103 def save_config(self):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

104 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

105 for key, value in self._config.iteritems():

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

106 file.write("%s %s\n" % (key, value))

104

7e345078425e use atomictemp to prevent corruption on ctrl-c

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 103

107 file.rename()

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

108

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

109

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

110 ## END FILE LOAD AND SAVE METHODS

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

111

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

112 def fetch(self, remote_name):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

113 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:

114 self.export_git_objects()

56

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

115 refs = self.fetch_pack(remote_name)

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

116 if refs:

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

117 self.import_git_objects(remote_name)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

118 self.save_map()

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

119

97

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

120 def export(self):

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

121 self.export_git_objects()

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

122 self.update_references()

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

123 self.save_map()

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

124

17

ace0f6ed65a1 setting up for upload-pack functionality

Scott Chacon <schacon@gmail.com>

parents: 16

125 def push(self, remote_name):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

126 self.ui.status(_("pushing to : %s\n") % remote_name)

97

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

127 self.export()

17

ace0f6ed65a1 setting up for upload-pack functionality

Scott Chacon <schacon@gmail.com>

parents: 16

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

129

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

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

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

132 self.save_config()

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

133

39

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

134 def remote_remove(self, remote_name):

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

135 key = 'remote.' + remote_name + '.url'

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

136 if key in self._config:

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

137 del self._config[key]

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

138 self.save_config()

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

139

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

140 def remote_show(self, remote_name):

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

141 key = 'remote.' + remote_name + '.url'

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

142 if key in self._config:

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

143 name = self._config[key]

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

144 self.ui.status(_("URL for %s : %s\n") % (remote_name, name, ))

39

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

145 else:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

147 return

39

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

148

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

149 def remote_list(self):

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

150 for key, value in self._config.iteritems():

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

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

152 self.ui.status('%s\t%s\n' % (key, value, ))

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

153

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

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

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

156

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

157 def update_references(self):

25

88e9e9e1caf1 will now set the current tip() as your git 'master' branch for packfile upload

Scott Chacon <schacon@gmail.com>

parents: 24

158 # TODO : if bookmarks exist, add them as git branches

88e9e9e1caf1 will now set the current tip() as your git 'master' branch for packfile upload

Scott Chacon <schacon@gmail.com>

parents: 24

159 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

160 self.git.set_ref('refs/heads/master', c)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

161

21

13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo.

Scott Chacon <schacon@gmail.com>

parents: 19

162 def export_git_objects(self):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

163 self.ui.status(_("exporting git objects\n"))

99

541571f2e429 add progress indication during export

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 97

164 total = len(self.repo.changelog)

107

8c83d2021b03 more pythonic way to calculate the magnitude

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 106

165 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

166 for i, rev in enumerate(self.repo.changelog):

541571f2e429 add progress indication during export

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 97

167 if i%100 == 0:

541571f2e429 add progress indication during export

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 97

168 self.ui.status(_("at: %*d/%d\n") % (magnitude, i, total))

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

169 pgit_sha, already_written = self.export_hg_commit(rev)

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

170 if not already_written:

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

171 self.save_map()

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

172

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

173 # 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

174 # 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

175 # 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

176 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

177 # return if we've already processed this

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

178 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

179 phgsha = hex(node)

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

180 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

181 if pgit_sha:

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

182 return pgit_sha, True

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

183

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

184 self.ui.status(_("converting revision %s\n") % str(rev))

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

185

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

186 # 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

187 parents = self.repo.parents(rev)

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

188 for parent in parents:

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

189 p_rev = parent.rev()

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

190 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

191 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

192 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

193 if not git_sha:

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

194 self.export_hg_commit(p_rev)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

195

21

13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo.

Scott Chacon <schacon@gmail.com>

parents: 19

196 ctx = self.repo.changectx(rev)

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

197 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

198

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

199 commit = {}

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

200 commit['tree'] = tree_sha

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

201 (time, timezone) = ctx.date()

68

d28d3763eda3 Deal with hg authors missing email attributes.

Chris Wanstrath <chris@ozmm.org>

parents: 65

202

d28d3763eda3 Deal with hg authors missing email attributes.

Chris Wanstrath <chris@ozmm.org>

parents: 65

203 # hg authors might not have emails

d28d3763eda3 Deal with hg authors missing email attributes.

Chris Wanstrath <chris@ozmm.org>

parents: 65

204 author = ctx.user()

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

205 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

206 author = author + ' <none@none>'

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

208 message = ctx.description()

80

0e0a2d20deed added a missing newline back to git conversion

Scott Chacon <schacon@gmail.com>

parents: 79

209 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

210

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

211 extra = ctx.extra()

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

212 if 'committer' in extra:

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

213 commit['committer'] = extra['committer']

118

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

214 if 'encoding' in extra:

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

215 commit['encoding'] = extra['encoding']

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

216

54

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

217 # HG EXTRA INFORMATION

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

218 add_extras = False

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

219 extra_message = ''

54

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

220 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

221 add_extras = True

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

222 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

223

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

224 if renames:

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

225 add_extras = True

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

226 for oldfile, newfile in renames:

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

227 extra_message += "rename : " + oldfile + " => " + newfile + "\n"

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

228

54

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

229 if add_extras:

80

0e0a2d20deed added a missing newline back to git conversion

Scott Chacon <schacon@gmail.com>

parents: 79

230 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

231

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

232 commit['parents'] = []

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

233 for parent in parents:

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

234 hgsha = hex(parent.node())

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

235 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

236 if git_sha:

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

237 commit['parents'].append(git_sha)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

238

24

41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs

Scott Chacon <schacon@gmail.com>

parents: 23

239 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

240 self.map_set(commit_sha, phgsha)

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

241 return commit_sha, False

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

242

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

243 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

244 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

245 man = ctx.manifest()

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

246 renames = []

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

247 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

248 # 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

249 fctx = ctx.filectx(filenm)

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

250 rename = fctx.renamed()

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

251 if rename:

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

252 filerename, sha = rename

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

253 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

254 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

255 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

256 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

257 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

258 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

259 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

260 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

261

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

262 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

263 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

264 # 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

265 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

266 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

267

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

268 # 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

269 parpath = '/'

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

270 nparpath = '/'

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

271 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

272 if nparpath == '/':

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

273 nparpath = part + '/'

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

274 else:

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

275 nparpath += part + '/'

65

5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print.

Augie Fackler <durin42@gmail.com>

parents: 56

276

54

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

277 treeentry = ['tree', part + '/', nparpath]

65

5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print.

Augie Fackler <durin42@gmail.com>

parents: 56

278

54

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

279 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

280 trees[parpath] = []

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

281 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

282 trees[parpath].append( treeentry )

65

5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print.

Augie Fackler <durin42@gmail.com>

parents: 56

283

54

f6e11b9d7562 not adding HG extra info if commits were on the default branch

Scott Chacon <schacon@gmail.com>

parents: 53

284 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

285

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

286 # 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

287 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

288 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

289 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

290 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

291

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

292 else:

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

293 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

294 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

295 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

296 trees['/'].append(fileentry)

65

5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print.

Augie Fackler <durin42@gmail.com>

parents: 56

297

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

298 # 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

299 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

300 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

301 dirs.remove('/')

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

302 dirs.append('/')

92

6305f274fc63 fixed subtree issue and zero padding issue

Scott Chacon <schacon@gmail.com>

parents: 90

303

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

304 # 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

305 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

306 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

307 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

308 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

309 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

310 # 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

311 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

312 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

313 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

314 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

315 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

316 tree_shas[dirnm] = tree_sha

92

6305f274fc63 fixed subtree issue and zero padding issue

Scott Chacon <schacon@gmail.com>

parents: 90

317

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

318 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

319

13

01f28d40cb6a checks out the HEAD node from a clone

Scott Chacon <schacon@gmail.com>

parents: 12

320 def remote_head(self, remote_name):

01f28d40cb6a checks out the HEAD node from a clone

Scott Chacon <schacon@gmail.com>

parents: 12

321 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

322 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

323 return self.map_hg_get(sha)

13

01f28d40cb6a checks out the HEAD node from a clone

Scott Chacon <schacon@gmail.com>

parents: 12

324 return None

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

325

17

ace0f6ed65a1 setting up for upload-pack functionality

Scott Chacon <schacon@gmail.com>

parents: 16

326 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

327 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

328 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

329 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

330 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

331 try:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

332 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

333 changed_refs = client.send_pack(path, changed, genpack)

52

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

334 if changed_refs:

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

335 new_refs = {}

88

52b4be85151d fixed some small compatability issues with the dulwich update

Scott Chacon <schacon@gmail.com>

parents: 80

336 for ref, sha in changed_refs.iteritems():

52b4be85151d fixed some small compatability issues with the dulwich update

Scott Chacon <schacon@gmail.com>

parents: 80

337 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

338 new_refs[ref] = sha

52

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

339 self.git.set_remote_refs(new_refs, remote_name)

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

340 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

341 except:

96

0cec7b1e07ff add a few more TODO's

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 95

342 # 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

343 raise

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

344

42

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

345 # 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

346 # * we should have specified push, tracking branches and --all

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

347 # 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

348 # pushed up

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

349 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

350 keys = refs.keys()

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

351

88

52b4be85151d fixed some small compatability issues with the dulwich update

Scott Chacon <schacon@gmail.com>

parents: 80

352 changed = {}

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

353 if not keys:

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

354 return None

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

355

42

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

356 # TODO : this is a huge hack

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

357 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

358 changed['refs/heads/master'] = self.git.ref('master')

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

359

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

360 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

361 parts = ref_name.split('/')

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

362 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

363 if parts[1] == 'heads':

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

364 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

365 local_ref = self.git.ref(ref_name)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

366 if local_ref:

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

367 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

368 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

369 return changed

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

370

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

371 # 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

372 # 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

373 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

374 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

375 next = graph_walker.next()

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

376 shas = set()

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

377 while next:

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

378 if next in have:

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

379 graph_walker.ack(next)

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

380 else:

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

381 shas.add(next)

37

7046d792dfcd fix bug where it was not writing the git object names properly

Scott Chacon <schacon@gmail.com>

parents: 35

382 next = graph_walker.next()

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

383

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

384 seen = []

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

385

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

386 # 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

387 # 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

388 # 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

389 def get_objects(tree, path):

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

390 changes = list()

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

391 changes.append((tree, path))

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

392 for (mode, name, sha) in tree.entries():

96

0cec7b1e07ff add a few more TODO's

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 95

393 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

394 continue

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

395 if sha in seen:

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

396 continue

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

397

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

398 obj = self.git.get_object(sha)

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

399 seen.append(sha)

76

aa2dadf04144 fixed the topo sorting and added a unit test

Scott Chacon <schacon@gmail.com>

parents: 75

400 if isinstance (obj, Blob):

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

401 changes.append((obj, path + name))

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

402 elif isinstance(obj, Tree):

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

403 changes.extend(get_objects(obj, path + name + '/'))

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

404 return changes

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

405

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

406 objects = []

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

407 for commit_sha in shas:

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

408 commit = self.git.commit(commit_sha)

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

409 objects.append((commit, 'commit'))

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

410 tree = self.git.get_object(commit.tree)

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

411 objects.extend( get_objects(tree, '/') )

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

412

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

413 return objects

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

414

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

415 def fetch_pack(self, remote_name):

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

416 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:

417 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:

418 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:

419 f, commit = self.git.object_store.add_pack()

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

420 try:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

421 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:

422 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:

423 f.close()

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

424 commit()

56

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

425 if refs:

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

426 self.git.set_remote_refs(refs, remote_name)

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

427 else:

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

428 self.ui.status(_("nothing new on the server\n"))

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

429 return refs

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

430 except:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

431 f.close()

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

432 raise

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

433

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

434 def import_git_objects(self, remote_name):

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

435 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:

436 # import heads as remote references

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

437 todo = []

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

438 done = set()

9

7e776864b301 sorts the commits topologically before converting

Scott Chacon <schacon@gmail.com>

parents: 8

439 convert_list = {}

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

440 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

441

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

442 # 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

443 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:

444 todo.append(sha)

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

445

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

446 # 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:

447 while todo:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

448 sha = todo.pop()

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

449 assert isinstance(sha, str)

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

450 if sha in done:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

451 continue

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

452 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

453 try:

a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch

Scott Chacon <schacon@gmail.com>

parents: 25

454 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

455 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

456 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

457 except:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

458 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

459

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

460 # sort the commits

78

71b07e16004f fix, but im not sure its fixed yet

Scott Chacon <schacon@gmail.com>

parents: 77

461 commits = toposort.TopoSort(convert_list).items()

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

462

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

463 # import each of the commits, oldest first

9

7e776864b301 sorts the commits topologically before converting

Scott Chacon <schacon@gmail.com>

parents: 8

464 for csha in commits:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

465 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

466 if not self.map_hg_get(csha): # it's already here

56

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

467 self.import_git_commit(commit)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

468 else:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

469 self.pseudo_import_git_commit(commit)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

470

47

3b62270c1fad writing some status output after a push, updating local bookmarks

Scott Chacon <schacon@gmail.com>

parents: 42

471 self.update_hg_bookmarks(remote_name)

3b62270c1fad writing some status output after a push, updating local bookmarks

Scott Chacon <schacon@gmail.com>

parents: 42

472

3b62270c1fad writing some status output after a push, updating local bookmarks

Scott Chacon <schacon@gmail.com>

parents: 42

473 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

474 try:

47

3b62270c1fad writing some status output after a push, updating local bookmarks

Scott Chacon <schacon@gmail.com>

parents: 42

475 bms = bookmarks.parse(self.repo)

3b62270c1fad writing some status output after a push, updating local bookmarks

Scott Chacon <schacon@gmail.com>

parents: 42

476 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

477 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

478 if not head == 'HEAD':

3b62270c1fad writing some status output after a push, updating local bookmarks

Scott Chacon <schacon@gmail.com>

parents: 42

479 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

480 bookmarks.write(self.repo, bms)

2a5c0bf0fef5 Another way of fixing no-bookmark issue, along with updated test.

Augie Fackler <durin42@gmail.com>

parents: 28

481 except AttributeError:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

482 self.ui.warn(_('creating bookmarks failed, do you have'

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

483 ' bookmarks enabled?\n'))

65

5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print.

Augie Fackler <durin42@gmail.com>

parents: 56

484

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

485 def convert_git_int_mode(self, mode):

96

0cec7b1e07ff add a few more TODO's

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 95

486 # TODO : make these into constants

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

487 convert = {

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

488 33188: '',

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

489 40960: 'l',

110

8fffec9ec750 quick fix for executable bit settings

Scott Chacon <schacon@gmail.com>

parents: 107

490 33261: 'x'}

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

491 if mode in convert:

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

492 return convert[mode]

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

493 return ''

65

5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print.

Augie Fackler <durin42@gmail.com>

parents: 56

494

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

495 def extract_hg_metadata(self, message):

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

496 split = message.split("\n\n--HG--\n", 1)

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

497 renames = {}

79

7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly

Scott Chacon <schacon@gmail.com>

parents: 78

498 branch = False

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

499 if len(split) == 2:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

500 message, meta = split

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

501 lines = meta.split("\n")

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

502 for line in lines:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

503 if line == '':

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

504 continue

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

505

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

506 command, data = line.split(" : ", 1)

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

507 if command == 'rename':

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

508 before, after = data.split(" => ", 1)

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

509 renames[after] = before

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

510 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

511 branch = data

7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly

Scott Chacon <schacon@gmail.com>

parents: 78

512 return (message, renames, branch)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

513

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

514 def pseudo_import_git_commit(self, commit):

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

515 (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

516 cs = self.map_hg_get(commit.id)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

517 p1 = "0" * 40

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

518 p2 = "0" * 40

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

519 if len(commit.parents) > 0:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

520 sha = commit.parents[0]

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

521 p1 = self.map_hg_get(sha)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

522 if len(commit.parents) > 1:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

523 sha = commit.parents[1]

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

524 p2 = self.map_hg_get(sha)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

525 if len(commit.parents) > 2:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

526 # TODO : map extra parents to the extras file

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

527 pass

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

528 # saving rename info

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

529 if (not (p2 == "0"*40) or (p1 == "0"*40)):

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

530 self.renames[cs] = {}

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

531 else:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

532 self.renames[cs] = self.renames[p1].copy()

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

533

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

534 self.renames[cs].update(hg_renames)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

535

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

536 def import_git_commit(self, commit):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

537 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

538 # 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

539 # 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

540

10

66860f141788 update todo file and removed outdated TODO comments

Scott Chacon <schacon@gmail.com>

parents: 9

541 # 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

542 # TODO : Do something less coarse-grained than try/except on the

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

543 # 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

544

79

7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly

Scott Chacon <schacon@gmail.com>

parents: 78

545 (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

546

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

547 def getfilectx(repo, memctx, f):

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

548 try:

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

549 (mode, sha, data) = self.git.get_file(commit, f)

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

550 e = self.convert_git_int_mode(mode)

92

6305f274fc63 fixed subtree issue and zero padding issue

Scott Chacon <schacon@gmail.com>

parents: 90

551 except TypeError:

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

552 raise IOError()

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

553 if f in hg_renames:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

554 copied_path = hg_renames[f]

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

555 else:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

556 copied_path = None

67

759ac56497e7 adding hg explicit file renames to the git commit message

Scott Chacon <schacon@gmail.com>

parents: 65

557 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

558

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

559 p1 = "0" * 40

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

560 p2 = "0" * 40

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

561 if len(commit.parents) > 0:

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

562 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

563 p1 = self.map_hg_get(sha)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

564 if len(commit.parents) > 1:

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

565 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

566 p2 = self.map_hg_get(sha)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

567 if len(commit.parents) > 2:

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

568 # TODO : map extra parents to the extras file

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

569 pass

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

570

79

7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly

Scott Chacon <schacon@gmail.com>

parents: 78

571 # 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

572 files = self.git.get_files_changed(commit)

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

573

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

574 # 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

575 if not (p2 == "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

576 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

577 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

578 files.remove(removefile)

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

579

76

aa2dadf04144 fixed the topo sorting and added a unit test

Scott Chacon <schacon@gmail.com>

parents: 75

580 extra = {}

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

581

79

7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly

Scott Chacon <schacon@gmail.com>

parents: 78

582 # 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

583 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

584 extra['branch'] = hg_branch

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

585

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

586 # if committer is different than author, add it to extra

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

587 if not commit._author_raw == commit._committer_raw:

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

588 extra['committer'] = commit._committer_raw

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

589

118

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

590 if commit._encoding:

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

591 extra['encoding'] = commit._encoding

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

592

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

593 if hg_branch:

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

594 extra['branch'] = hg_branch

118

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

595

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

596 text = strip_message

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

598 ctx = context.memctx(self.repo, (p1, p2), text, files, getfilectx,

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

599 commit.author, date, extra)

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

600 a = self.repo.commitctx(ctx)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

601

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

602 # get changeset id

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

603 cs = hex(self.repo.changelog.tip())

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

604 # save changeset to mapping file

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

605 gitsha = commit.id

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

606

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

607 # 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

608 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

609 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

610 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

611 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

612

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

613 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

614

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

615 self.map_set(gitsha, cs)

19

2be9c0bd88af Warn, but don't fail when bookmarks is not enabled.

Augie Fackler <durin42@gmail.com>

parents: 17

616

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

617 def check_bookmarks(self):

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

618 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

619 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:

620

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

621 def get_transport_and_path(self, uri):

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

622 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

623 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:

624 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

625 if handler == 'git@':

28

b258ef16ae37 Fix non-ssh URI parsing.

Augie Fackler <durin42@gmail.com>

parents: 26

626 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

627 host = 'git@' + host

28

b258ef16ae37 Fix non-ssh URI parsing.

Augie Fackler <durin42@gmail.com>

parents: 26

628 else:

35

562fc51b991e we did the same thing, not sure why it conflicted

Scott Chacon <schacon@gmail.com>

parents: 29

629 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

630 return transport(host), '/' + path

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

631 # 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:

632 return SubprocessGitClient(), uri

9

7e776864b301 sorts the commits topologically before converting

Scott Chacon <schacon@gmail.com>

parents: 8

633

40

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

634 def clear(self):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

635 mapfile = self.repo.join(self.mapfile)

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

636 if os.path.exists(self.gitdir):

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

637 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

638 for name in files:

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

639 os.remove(os.path.join(root, name))

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

640 for name in dirs:

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

641 os.rmdir(os.path.join(root, name))

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

642 os.rmdir(self.gitdir)

40

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

643 if os.path.exists(mapfile):

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39