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