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,

129

ed4e8c2cd016 cleanup dates handling.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

16 hex_to_sha,

ed4e8c2cd016 cleanup dates handling.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

17 format_timezone,

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'

133

f2dfb2bed724 Allow storing the git directory intree

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 118

54

f2dfb2bed724 Allow storing the git directory intree

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 118

55 if ui.config('git', 'intree'):

f2dfb2bed724 Allow storing the git directory intree

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 118

56 self.gitdir = self.repo.wjoin('.git')

f2dfb2bed724 Allow storing the git directory intree

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 118

57 else:

f2dfb2bed724 Allow storing the git directory intree

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 118

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

f2dfb2bed724 Allow storing the git directory intree

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 118

59

16

58cd05129119 moved init into git_handler

Scott Chacon <schacon@gmail.com>

parents: 14

60 self.init_if_missing()

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

61 self.load_git()

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

62 self.load_map()

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

63 self.load_config()

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

64

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

Augie Fackler <durin42@gmail.com>

parents: 17

65 # make the git data directory

16

58cd05129119 moved init into git_handler

Scott Chacon <schacon@gmail.com>

parents: 14

66 def init_if_missing(self):

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

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

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

68 os.mkdir(self.gitdir)

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

69 Repo.init_bare(self.gitdir)

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

70

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

71 def load_git(self):

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

72 self.git = Repo(self.gitdir)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

73

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

74 ## FILE LOAD AND SAVE METHODS

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

75

21

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

Scott Chacon <schacon@gmail.com>

parents: 19

76 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

77 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

78 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

79

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

Scott Chacon <schacon@gmail.com>

parents: 19

80 def map_hg_get(self, gitsha):

94

b88d6b214914 strip redundant module path and dict accessing

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 92

81 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

82

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

Scott Chacon <schacon@gmail.com>

parents: 19

83 def map_git_get(self, hgsha):

94

b88d6b214914 strip redundant module path and dict accessing

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 92

84 return self._map_hg.get(hgsha)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

85

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

86 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

87 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

88 self._map_hg = {}

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

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

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

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

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

91 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

92 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

93 self._map_hg[hgsha] = gitsha

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

94

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

95 def save_map(self):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

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

100

e17d9eea44ab sort the mapfile before writing

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 99

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

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

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

101

7c57f15d397c use atomictemp to prevent corruption on ctrl-c

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 100

99 file.rename()

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

100

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

101 def load_config(self):

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

102 self._config = {}

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

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

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

104 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

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

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

106 self._config[key] = value

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

107

14

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

108 def save_config(self):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

109 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

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

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

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

104

7e345078425e use atomictemp to prevent corruption on ctrl-c

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 103

112 file.rename()

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

114

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

115 ## END FILE LOAD AND SAVE METHODS

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

116

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

117 def import_commits(self, remote_name):

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

118 self.import_git_objects(remote_name)

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

119 self.save_map()

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

121 def fetch(self, remote_name):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

123 self.export_git_objects()

56

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

124 refs = self.fetch_pack(remote_name)

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

125 if refs:

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

126 self.import_commits(remote_name)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

127

136

74385b613bb7 rename export to export_commits for future consitency

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 135

128 def export_commits(self):

97

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

129 self.export_git_objects()

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

130 self.update_references()

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

131 self.save_map()

f0628f5270b6 add gexport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 96

132

17

ace0f6ed65a1 setting up for upload-pack functionality

Scott Chacon <schacon@gmail.com>

parents: 16

133 def push(self, remote_name):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

136

74385b613bb7 rename export to export_commits for future consitency

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 135

135 self.export_commits()

5b702bbf078f local git branches to remotes

Ian Dees <undees@gmail.com>

parents: 124

136 self.update_remote_references(remote_name)

17

ace0f6ed65a1 setting up for upload-pack functionality

Scott Chacon <schacon@gmail.com>

parents: 16

137 self.upload_pack(remote_name)

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

138

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

139 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

140 self._config['remote.' + remote_name + '.url'] = git_url

36e94e805fa7 added basic config file for remembering remote urls

Scott Chacon <schacon@gmail.com>

parents: 13

141 self.save_config()

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

142

39

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

143 def remote_remove(self, remote_name):

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

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

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

145 if key in self._config:

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

146 del self._config[key]

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

147 self.save_config()

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_show(self, remote_name):

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

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

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

151 if key in self._config:

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

152 name = self._config[key]

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

39

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

154 else:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

155 self.ui.status(_("No remote named : %s\n") % remote_name)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

156 return

39

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

157

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

158 def remote_list(self):

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

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

173e738d0da4 remote management tools

Scott Chacon <schacon@gmail.com>

parents: 38

160 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

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

162

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

163 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

164 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

165

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

166 def update_references(self):

124

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

167 try:

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

168 # We only care about bookmarks of the form 'name',

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

169 # not 'remote/name'.

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

170 def is_local_ref(item): return item[0].count('/') == 0

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

171 bms = bookmarks.parse(self.repo)

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

172 bms = dict(filter(is_local_ref, bms.items()))

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

173

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

174 # Create a local Git branch name for each

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

175 # Mercurial bookmark.

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

176 for key in bms:

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

177 hg_sha = hex(bms[key])

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

178 git_sha = self.map_git_get(hg_sha)

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

179 self.git.set_ref('refs/heads/' + key, git_sha)

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

180 except AttributeError:

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

181 # No bookmarks extension

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

182 pass

9dafb9ac24ff hg bookmarks to local git branches

Ian Dees <undees@gmail.com>

parents: 118

183

25

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

Scott Chacon <schacon@gmail.com>

parents: 24

184 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

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

186

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

187 # Make sure there's a refs/remotes/remote_name/name

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

188 # for every refs/heads/name

5b702bbf078f local git branches to remotes

Ian Dees <undees@gmail.com>

parents: 124

189 def update_remote_references(self, remote_name):

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

190 self.git.set_remote_refs(self.local_heads(), remote_name)

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

191

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

192 def local_heads(self):

5b702bbf078f local git branches to remotes

Ian Dees <undees@gmail.com>

parents: 124

193 def is_local_head(item): return item[0].startswith('refs/heads')

5b702bbf078f local git branches to remotes

Ian Dees <undees@gmail.com>

parents: 124

194 refs = self.git.get_refs()

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

195 return dict(filter(is_local_head, refs.items()))

5b702bbf078f local git branches to remotes

Ian Dees <undees@gmail.com>

parents: 124

196

21

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

Scott Chacon <schacon@gmail.com>

parents: 19

197 def export_git_objects(self):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

99

541571f2e429 add progress indication during export

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 97

199 total = len(self.repo.changelog)

107

8c83d2021b03 more pythonic way to calculate the magnitude

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 106

200 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

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

541571f2e429 add progress indication during export

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 97

202 if i%100 == 0:

541571f2e429 add progress indication during export

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 97

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

102

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

204 pgit_sha, already_written = self.export_hg_commit(rev)

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

205 if not already_written:

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

206 self.save_map()

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

207

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

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

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

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

211 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

212 # return if we've already processed this

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

213 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

214 phgsha = hex(node)

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

Scott Chacon <schacon@gmail.com>

parents: 23

215 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

216 if pgit_sha:

102

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

217 return pgit_sha, True

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

218

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

220

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

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

222 parents = self.repo.parents(rev)

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

Scott Chacon <schacon@gmail.com>

parents: 23

223 for parent in parents:

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

Scott Chacon <schacon@gmail.com>

parents: 23

224 p_rev = parent.rev()

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

Scott Chacon <schacon@gmail.com>

parents: 23

225 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

226 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

227 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

228 if not git_sha:

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

Scott Chacon <schacon@gmail.com>

parents: 35

229 self.export_hg_commit(p_rev)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

230

21

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

Scott Chacon <schacon@gmail.com>

parents: 19

231 ctx = self.repo.changectx(rev)

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

232 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

233

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

234 commit = {}

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

Scott Chacon <schacon@gmail.com>

parents: 23

235 commit['tree'] = tree_sha

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

Scott Chacon <schacon@gmail.com>

parents: 23

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

68

d28d3763eda3 Deal with hg authors missing email attributes.

Chris Wanstrath <chris@ozmm.org>

parents: 65

237

d28d3763eda3 Deal with hg authors missing email attributes.

Chris Wanstrath <chris@ozmm.org>

parents: 65

238 # hg authors might not have emails

d28d3763eda3 Deal with hg authors missing email attributes.

Chris Wanstrath <chris@ozmm.org>

parents: 65

239 author = ctx.user()

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

240 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

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

129

ed4e8c2cd016 cleanup dates handling.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

242 commit['author'] = author + ' ' + str(int(time)) + ' ' + format_timezone(-timezone)

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

243 message = ctx.description()

80

0e0a2d20deed added a missing newline back to git conversion

Scott Chacon <schacon@gmail.com>

parents: 79

244 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

245

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

246 extra = ctx.extra()

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

247 if 'committer' in extra:

131

dd6c77ec206c store commitdate in mercurial's internal format.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 129

248 # fixup timezone

dd6c77ec206c store commitdate in mercurial's internal format.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 129

249 (name_timestamp, timezone) = extra['committer'].rsplit(' ', 1)

dd6c77ec206c store commitdate in mercurial's internal format.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 129

250 timezone = format_timezone(-int(timezone))

dd6c77ec206c store commitdate in mercurial's internal format.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 129

251 commit['committer'] = '%s %s' % (name_timestamp, timezone)

118

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

252 if 'encoding' in extra:

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

253 commit['encoding'] = extra['encoding']

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

254

54

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

Scott Chacon <schacon@gmail.com>

parents: 53

255 # HG EXTRA INFORMATION

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

Scott Chacon <schacon@gmail.com>

parents: 53

256 add_extras = False

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

257 extra_message = ''

54

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

Scott Chacon <schacon@gmail.com>

parents: 53

258 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

259 add_extras = True

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

260 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

261

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

262 if renames:

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

Scott Chacon <schacon@gmail.com>

parents: 65

263 add_extras = True

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

Scott Chacon <schacon@gmail.com>

parents: 65

264 for oldfile, newfile in renames:

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

Scott Chacon <schacon@gmail.com>

parents: 65

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

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

Scott Chacon <schacon@gmail.com>

parents: 65

266

54

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

Scott Chacon <schacon@gmail.com>

parents: 53

267 if add_extras:

80

0e0a2d20deed added a missing newline back to git conversion

Scott Chacon <schacon@gmail.com>

parents: 79

268 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

269

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

270 commit['parents'] = []

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

Scott Chacon <schacon@gmail.com>

parents: 23

271 for parent in parents:

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

Scott Chacon <schacon@gmail.com>

parents: 23

272 hgsha = hex(parent.node())

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

Scott Chacon <schacon@gmail.com>

parents: 23

273 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

274 if git_sha:

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

Scott Chacon <schacon@gmail.com>

parents: 35

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

276

24

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

Scott Chacon <schacon@gmail.com>

parents: 23

277 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

278 self.map_set(commit_sha, phgsha)

102

302df8a2a8d0 major speedup in the already-converted case

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 101

279 return commit_sha, False

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

280

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

281 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

282 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

283 man = ctx.manifest()

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

284 renames = []

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

285 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

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

287 fctx = ctx.filectx(filenm)

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

288 rename = fctx.renamed()

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

Scott Chacon <schacon@gmail.com>

parents: 65

289 if rename:

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

Scott Chacon <schacon@gmail.com>

parents: 65

290 filerename, sha = rename

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

Scott Chacon <schacon@gmail.com>

parents: 65

291 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

292 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

293 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

294 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

295 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

296 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

297 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

298 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

299

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

301 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

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

303 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

304 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

305

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

307 parpath = '/'

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

Scott Chacon <schacon@gmail.com>

parents: 53

308 nparpath = '/'

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

Scott Chacon <schacon@gmail.com>

parents: 53

309 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

310 if nparpath == '/':

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

Scott Chacon <schacon@gmail.com>

parents: 53

311 nparpath = part + '/'

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

Scott Chacon <schacon@gmail.com>

parents: 53

312 else:

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

Scott Chacon <schacon@gmail.com>

parents: 53

313 nparpath += part + '/'

65

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

Augie Fackler <durin42@gmail.com>

parents: 56

314

54

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

Scott Chacon <schacon@gmail.com>

parents: 53

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

65

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

Augie Fackler <durin42@gmail.com>

parents: 56

316

54

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

Scott Chacon <schacon@gmail.com>

parents: 53

317 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

318 trees[parpath] = []

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

Scott Chacon <schacon@gmail.com>

parents: 53

319 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

320 trees[parpath].append( treeentry )

65

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

Augie Fackler <durin42@gmail.com>

parents: 56

321

54

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

Scott Chacon <schacon@gmail.com>

parents: 53

322 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

323

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

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

325 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

326 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

327 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

328 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

329

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

330 else:

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

331 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

332 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

333 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

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

65

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

Augie Fackler <durin42@gmail.com>

parents: 56

335

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

336 dirs = trees.keys()

122

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

337 if dirs:

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

338 # sort by tree depth, so we write the deepest trees first

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

339 dirs.sort(lambda a, b: len(b.split('/'))-len(a.split('/')))

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

340 dirs.remove('/')

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

341 dirs.append('/')

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

342 else:

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

343 # manifest is empty => make empty root tree

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

344 trees['/'] = []

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

345 dirs = ['/']

76a0e1ee7cf7 don't fail while exporting commit with empty working tree. +test.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 121

346

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

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

348 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

349 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

350 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

351 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

352 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

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

354 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

355 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

356 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

357 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

358 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

359 tree_shas[dirnm] = tree_sha

92

6305f274fc63 fixed subtree issue and zero padding issue

Scott Chacon <schacon@gmail.com>

parents: 90

360

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

361 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

362

13

01f28d40cb6a checks out the HEAD node from a clone

Scott Chacon <schacon@gmail.com>

parents: 12

363 def remote_head(self, remote_name):

01f28d40cb6a checks out the HEAD node from a clone

Scott Chacon <schacon@gmail.com>

parents: 12

364 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

365 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

366 return self.map_hg_get(sha)

13

01f28d40cb6a checks out the HEAD node from a clone

Scott Chacon <schacon@gmail.com>

parents: 12

367 return None

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

368

17

ace0f6ed65a1 setting up for upload-pack functionality

Scott Chacon <schacon@gmail.com>

parents: 16

369 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

370 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

371 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

372 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

373 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

374 try:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

375 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

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

52

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

377 if changed_refs:

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

378 new_refs = {}

88

52b4be85151d fixed some small compatability issues with the dulwich update

Scott Chacon <schacon@gmail.com>

parents: 80

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

52b4be85151d fixed some small compatability issues with the dulwich update

Scott Chacon <schacon@gmail.com>

parents: 80

380 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

381 new_refs[ref] = sha

52

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

382 self.git.set_remote_refs(new_refs, remote_name)

87d462a6b796 pushing nothing works better

Scott Chacon <schacon@gmail.com>

parents: 51

383 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

384 except:

96

0cec7b1e07ff add a few more TODO's

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 95

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

386 raise

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

387

42

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

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

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

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

391 # pushed up

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

Scott Chacon <schacon@gmail.com>

parents: 35

392 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

393 keys = refs.keys()

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

394

88

52b4be85151d fixed some small compatability issues with the dulwich update

Scott Chacon <schacon@gmail.com>

parents: 80

395 changed = {}

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

396 if not keys:

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

397 return None

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

398

42

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

399 # TODO : this is a huge hack

fcfb4db848e1 added hack for pushing first branch

Scott Chacon <schacon@gmail.com>

parents: 40

400 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

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

402

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

403 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

404 parts = ref_name.split('/')

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

Scott Chacon <schacon@gmail.com>

parents: 35

405 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

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

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

Scott Chacon <schacon@gmail.com>

parents: 35

407 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

408 local_ref = self.git.ref(ref_name)

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

409 if local_ref:

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

410 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

411 changed[ref_name] = local_ref

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

412

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

413 # Also push any local branches not on the server yet

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

414 for head in self.local_heads():

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

415 if not head in refs:

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

416 ref = self.git.ref(head)

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

417 changed[head] = ref

705b88c9f3d1 remote branches to server

Ian Dees <undees@gmail.com>

parents: 125

418

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

419 return changed

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

420

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

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

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

423 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

424 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

425 next = graph_walker.next()

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

426 shas = set()

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

427 while next:

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

Scott Chacon <schacon@gmail.com>

parents: 35

428 if next in have:

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

Scott Chacon <schacon@gmail.com>

parents: 35

429 graph_walker.ack(next)

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

Scott Chacon <schacon@gmail.com>

parents: 35

430 else:

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

431 shas.add(next)

37

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

Scott Chacon <schacon@gmail.com>

parents: 35

432 next = graph_walker.next()

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

433

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

434 seen = []

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

435

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

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

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

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

439 def get_objects(tree, path):

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

440 changes = list()

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

441 changes.append((tree, path))

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

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

121

0c94e860a0ed use octal numbers for modes.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 120

443 if mode == 0160000: # 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

444 continue

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

445 if sha in seen:

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

446 continue

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

447

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

448 obj = self.git.get_object(sha)

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

449 seen.append(sha)

76

aa2dadf04144 fixed the topo sorting and added a unit test

Scott Chacon <schacon@gmail.com>

parents: 75

450 if isinstance (obj, Blob):

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

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

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

452 elif isinstance(obj, Tree):

77

d7b8768d005a reapplying defunkts changes

Scott Chacon <schacon@gmail.com>

parents: 76

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

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

454 return changes

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

455

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

456 objects = []

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

457 for commit_sha in shas:

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

458 commit = self.git.commit(commit_sha)

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

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

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

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

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

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

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

462

38

f0daee676e10 successful push to an upstream git server - BOOYAH!

Scott Chacon <schacon@gmail.com>

parents: 37

463 return objects

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

464

12

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

465 def fetch_pack(self, remote_name):

227b11d75844 updates bookmarks and beginnings of seperate remotes support

Scott Chacon <schacon@gmail.com>

parents: 11

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

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

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

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

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

470 try:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

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

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

473 f.close()

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

474 commit()

56

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

475 if refs:

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

476 self.git.set_remote_refs(refs, remote_name)

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

477 else:

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

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

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

479 return refs

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

480 except:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

481 f.close()

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

482 raise

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

483

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

484 def import_git_objects(self, remote_name=None):

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

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

486 # import heads as remote references

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

487 todo = []

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

488 done = set()

9

7e776864b301 sorts the commits topologically before converting

Scott Chacon <schacon@gmail.com>

parents: 8

489 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

490 self.renames = {}

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

491

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

492 if remote_name:

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

493 todo = self.git.remote_refs(remote_name).values()[:]

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

494 else:

5aefcbf1e50c add a gimport command

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 136

495 todo = self.git.heads().values()[:]

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

496

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

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

498 while todo:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

499 sha = todo.pop()

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

500 assert isinstance(sha, str)

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

501 if sha in done:

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

502 continue

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

503 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

504 try:

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

Scott Chacon <schacon@gmail.com>

parents: 25

505 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

506 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

507 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

508 except:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

509 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

510

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

Augie Fackler <durin42@gmail.com>

parents: 17

511 # sort the commits

78

71b07e16004f fix, but im not sure its fixed yet

Scott Chacon <schacon@gmail.com>

parents: 77

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

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

513

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

514 # import each of the commits, oldest first

135

421c992c058b import_git_objects: add progress indicator

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 133

515 total = len(commits)

421c992c058b import_git_objects: add progress indicator

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 133

516 magnitude = int(math.log(total, 10)) + 1 if total else 1

421c992c058b import_git_objects: add progress indicator

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 133

517 for i, csha in enumerate(commits):

421c992c058b import_git_objects: add progress indicator

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 133

518 if i%100 == 0:

421c992c058b import_git_objects: add progress indicator

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 133

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

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

520 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

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

56

5185af4e649a hg gfetch now works

Scott Chacon <schacon@gmail.com>

parents: 54

522 self.import_git_commit(commit)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

523 else:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

524 self.pseudo_import_git_commit(commit)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

525

47

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

Scott Chacon <schacon@gmail.com>

parents: 42

526 self.update_hg_bookmarks(remote_name)

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

Scott Chacon <schacon@gmail.com>

parents: 42

527

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

Scott Chacon <schacon@gmail.com>

parents: 42

528 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

529 try:

47

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

Scott Chacon <schacon@gmail.com>

parents: 42

530 bms = bookmarks.parse(self.repo)

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

Scott Chacon <schacon@gmail.com>

parents: 42

531 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

532 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

533 if not head == 'HEAD':

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

Scott Chacon <schacon@gmail.com>

parents: 42

534 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

535 bookmarks.write(self.repo, bms)

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

Augie Fackler <durin42@gmail.com>

parents: 28

536 except AttributeError:

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

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

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

538 ' bookmarks enabled?\n'))

65

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

Augie Fackler <durin42@gmail.com>

parents: 56

539

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

540 def convert_git_int_mode(self, mode):

96

0cec7b1e07ff add a few more TODO's

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 95

541 # TODO : make these into constants

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

542 convert = {

121

0c94e860a0ed use octal numbers for modes.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 120

543 0100644: '',

0c94e860a0ed use octal numbers for modes.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 120

544 0100755: 'x',

0c94e860a0ed use octal numbers for modes.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 120

545 0120000: 'l'}

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

546 if mode in convert:

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

547 return convert[mode]

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

548 return ''

65

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

Augie Fackler <durin42@gmail.com>

parents: 56

549

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

550 def extract_hg_metadata(self, message):

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

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

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

552 renames = {}

79

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

Scott Chacon <schacon@gmail.com>

parents: 78

553 branch = False

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

554 if len(split) == 2:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

555 message, meta = split

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

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

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

557 for line in lines:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

558 if line == '':

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

559 continue

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

560

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

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

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

562 if command == 'rename':

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

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

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

564 renames[after] = before

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

565 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

566 branch = data

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

Scott Chacon <schacon@gmail.com>

parents: 78

567 return (message, renames, branch)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

568

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

569 def pseudo_import_git_commit(self, commit):

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

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

571 cs = self.map_hg_get(commit.id)

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

572 p1 = nullid

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

573 p2 = nullid

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

574 if len(commit.parents) > 0:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

575 sha = commit.parents[0]

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

576 p1 = self.map_hg_get(sha)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

577 if len(commit.parents) > 1:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

578 sha = commit.parents[1]

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

579 p2 = self.map_hg_get(sha)

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

580 if len(commit.parents) > 2:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

581 # TODO : map extra parents to the extras file

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

582 pass

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

583 # saving rename info

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

584 if (not (p2 == nullid) or (p1 == nullid)):

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

585 self.renames[cs] = {}

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

586 else:

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

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

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

588

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

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

d862b6a4fbd4 adding rename detection to already imported objects

Scott Chacon <schacon@gmail.com>

parents: 112

590

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

591 def import_git_commit(self, commit):

95

7de67fcb18b0 be better about internationalizing strings

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 94

592 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

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

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

595

10

66860f141788 update todo file and removed outdated TODO comments

Scott Chacon <schacon@gmail.com>

parents: 9

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

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

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

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

599

79

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

Scott Chacon <schacon@gmail.com>

parents: 78

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

601

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

602 def getfilectx(repo, memctx, f):

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

603 try:

53

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

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

5deb5cbd86aa respecting file modes on git import

Scott Chacon <schacon@gmail.com>

parents: 52

605 e = self.convert_git_int_mode(mode)

92

6305f274fc63 fixed subtree issue and zero padding issue

Scott Chacon <schacon@gmail.com>

parents: 90

606 except TypeError:

50

d274092e3b24 Hacky implementation of file removals.

Augie Fackler <durin42@gmail.com>

parents: 42

607 raise IOError()

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

608 if f in hg_renames:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

609 copied_path = hg_renames[f]

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

610 else:

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

611 copied_path = None

67

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

Scott Chacon <schacon@gmail.com>

parents: 65

612 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

613

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

614 p1 = nullid

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

615 p2 = nullid

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

616 if len(commit.parents) > 0:

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

617 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

618 p1 = self.map_hg_get(sha)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

619 if len(commit.parents) > 1:

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

620 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

621 p2 = self.map_hg_get(sha)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

622 if len(commit.parents) > 2:

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

623 # TODO : map extra parents to the extras file

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

624 pass

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

625

79

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

Scott Chacon <schacon@gmail.com>

parents: 78

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

627 files = self.git.get_files_changed(commit)

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

628

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

629 # wierd hack for explicit file renames in first but not second branch

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

630 if not (p2 == nullid):

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

631 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

632 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

633 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

634

76

aa2dadf04144 fixed the topo sorting and added a unit test

Scott Chacon <schacon@gmail.com>

parents: 75

635 extra = {}

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

636

79

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

Scott Chacon <schacon@gmail.com>

parents: 78

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

638 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

639 extra['branch'] = hg_branch

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

640

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

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

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

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

131

dd6c77ec206c store commitdate in mercurial's internal format.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 129

643 extra['committer'] = "%s %d %d" % (commit.committer, commit.commit_time, -commit.commit_timezone)

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

644

118

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

645 if commit._encoding:

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

646 extra['encoding'] = commit._encoding

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

647

89

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

648 if hg_branch:

e35ed99fa691 committer info now being kept properly

Scott Chacon <schacon@gmail.com>

parents: 88

649 extra['branch'] = hg_branch

118

b3be536e3f50 handles git commit encoding fields now

Scott Chacon <schacon@gmail.com>

parents: 113

650

71

19053d11d520 explicit renames converting both ways now

Scott Chacon <schacon@gmail.com>

parents: 70

651 text = strip_message

129

ed4e8c2cd016 cleanup dates handling.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

652 date = (commit.author_time, -commit.author_timezone)

6

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

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

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

654 commit.author, date, extra)

c77197123d95 importing basic, mostly stubbed changesets

Scott Chacon <schacon@gmail.com>

parents: 5

655 a = self.repo.commitctx(ctx)

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

656

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

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

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

7

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

659 # save changeset to mapping file

89992b6d2eef mapping parents properly now

Scott Chacon <schacon@gmail.com>

parents: 6

660 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

661

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

662 # saving rename info

35ad13185e60 use explicit nullid.

Dmitriy Taychenachev <dimichxp@gmail.com>

parents: 118

663 if (not (p2 == nullid) or (p1 == nullid)):

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

664 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

665 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

666 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

667

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

668 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

669

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

670 self.map_set(gitsha, cs)

19

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

Augie Fackler <durin42@gmail.com>

parents: 17

671

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

672 def check_bookmarks(self):

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

673 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

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

675

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

676 def get_transport_and_path(self, uri):

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

677 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

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

679 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

680 if handler == 'git@':

28

b258ef16ae37 Fix non-ssh URI parsing.

Augie Fackler <durin42@gmail.com>

parents: 26

681 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

682 host = 'git@' + host

28

b258ef16ae37 Fix non-ssh URI parsing.

Augie Fackler <durin42@gmail.com>

parents: 26

683 else:

35

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

Scott Chacon <schacon@gmail.com>

parents: 29

684 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

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

5

d6c443a91b18 refactored the git handling stuff out into another class

Scott Chacon <schacon@gmail.com>

parents:

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

687 return SubprocessGitClient(), uri

9

7e776864b301 sorts the commits topologically before converting

Scott Chacon <schacon@gmail.com>

parents: 8

688

40

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

689 def clear(self):

41e76444105c make git-mapfile and git-configfile constants

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 104

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

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

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

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

692 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

693 for name in files:

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

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

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

695 for name in dirs:

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

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

3aa2f6caed16 make the gitdir a constant

Sverre Rabbelier <sverre@rabbelier.nl>

parents: 105

697 os.rmdir(self.gitdir)

40

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39

698 if os.path.exists(mapfile):

f5b000ec7100 added gclear command to remove all the git data

Scott Chacon <schacon@gmail.com>

parents: 39