2 from yap
import YapPlugin
, YapError
3 from yap
.util
import get_output
, takes_options
, run_command
, run_safely
, short_help
10 class RepoBlob(object):
11 def __init__(self
, url
, fetch
):
20 def add_metadata(self
, branch
):
21 assert branch
not in self
.metadata
22 gitdir
= get_output("git rev-parse --git-dir")
24 revmap
= os
.path
.join(gitdir
[0], "svn", "svn", branch
, ".rev_map*")
25 revmap
= glob
.glob(revmap
)[0]
26 uuid
= revmap
.split('.')[-1]
29 assert self
.uuid
== uuid
30 data
= file(revmap
).read()
31 self
.metadata
[branch
] = data
33 class SvnPlugin(YapPlugin
):
34 def __init__(self
, yap
):
37 def _get_root(self
, url
):
38 root
= get_output("svn info %s 2>/dev/null | gawk '/Repository Root:/{print $3}'" % url
)
40 raise YapError("Not an SVN repo: %s" % url
)
43 def _configure_repo(self
, url
, fetch
=None):
44 root
= self
._get
_root
(url
)
45 os
.system("git config svn-remote.svn.url %s" % root
)
47 trunk
= url
.replace(root
, '').strip('/')
49 trunk
= fetch
.split(':')[0]
50 os
.system("git config svn-remote.svn.fetch %s:refs/remotes/svn/trunk"
53 branches
= trunk
.replace('trunk', 'branches')
54 os
.system("git config svn-remote.svn.branches %s/*:refs/remotes/svn/*"
56 tags
= trunk
.replace('trunk', 'tags')
57 os
.system("git config svn-remote.svn.tags %s/*:refs/tags/*" % tags
)
58 self
.yap
.cmd_repo("svn", url
)
59 os
.system("git config yap.svn.enabled 1")
61 def _create_tagged_blob(self
):
62 url
= get_output("git config svn-remote.svn.url")[0]
63 fetch
= get_output("git config svn-remote.svn.fetch")[0]
64 blob
= RepoBlob(url
, fetch
)
65 for b
in get_output("git for-each-ref --format='%(refname)' 'refs/remotes/svn/*'"):
66 b
= b
.replace('refs/remotes/svn/', '')
69 fd_w
, fd_r
= os
.popen2("git hash-object -w --stdin")
71 __builtin__
.RepoBlob
= RepoBlob
72 pickle
.dump(blob
, fd_w
)
74 hash = fd_r
.readline().strip()
75 run_safely("git tag -f yap-svn %s" % hash)
77 def _clone_svn(self
, url
, directory
=None, **flags
):
80 directory
= url
.rsplit('/')[-1]
81 directory
= directory
.replace('.git', '')
86 raise YapError("Directory exists: %s" % directory
)
90 run_command("git config svn-remote.svn.noMetadata 1")
91 self
._configure
_repo
(url
)
92 os
.system("git svn fetch -r %s:HEAD" % flags
.get('-r', '1'))
93 self
._create
_tagged
_blob
()
95 def _push_svn(self
, branch
, **flags
):
97 raise YapError("Deleting svn branches not supported")
98 print "Verifying branch is up-to-date"
99 run_safely("git svn fetch svn")
101 branch
= branch
.replace('refs/heads/', '')
102 rev
= get_output("git rev-parse --verify refs/remotes/svn/%s" % branch
)
104 # Create the branch if requested
106 if '-c' not in flags
:
107 raise YapError("No matching branch on the repo. Use -c to create a new branch there.")
108 src
= get_output("git svn info | gawk '/URL:/{print $2}'")[0]
109 brev
= get_output("git svn info | gawk '/Revision:/{print $2}'")[0]
110 root
= get_output("git config svn-remote.svn.url")[0]
111 branch_path
= get_output("git config svn-remote.svn.branches")[0].split(':')[0]
112 branch_path
= branch_path
.rstrip('/*')
113 dst
= '/'.join((root
, branch_path
, branch
))
115 # Create the branch in svn
116 run_safely("svn cp -r%s %s %s -m 'create branch %s'"
117 % (brev
, src
, dst
, branch
))
118 run_safely("git svn fetch svn")
119 rev
= get_output("git rev-parse refs/remotes/svn/%s 2>/dev/null" % branch
)
120 base
= get_output("git svn find-rev r%s" % brev
)
122 # Apply our commits to the new branch
124 fd
, tmpfile
= tempfile
.mkstemp("yap")
127 os
.system("git format-patch -k --stdout '%s' > %s"
128 % (base
[0], tmpfile
))
129 start
= get_output("git rev-parse HEAD")
130 self
.yap
.cmd_point("refs/remotes/svn/%s"
131 % branch
, **{'-f': True})
133 stat
= os
.stat(tmpfile
)
136 rc
= run_command("git am -3 %s" % tmpfile
)
138 self
.yap
.cmd_point(start
[0], **{'-f': True})
139 raise YapError("Failed to port changes to new svn branch")
143 base
= get_output("git merge-base HEAD %s" % rev
[0])
144 if base
[0] != rev
[0]:
145 raise YapError("Branch not up-to-date. Update first.")
146 current
= get_output("git symbolic-ref HEAD")
148 raise YapError("Not on a branch!")
149 current
= current
[0].replace('refs/heads/', '')
150 self
.yap
._confirm
_push
(current
, branch
, "svn")
151 if run_command("git update-index --refresh"):
152 raise YapError("Can't push with uncommitted changes")
154 master
= get_output("git rev-parse --verify refs/heads/master 2>/dev/null")
155 os
.system("git svn dcommit")
156 run_safely("git svn rebase")
158 master
= get_output("git rev-parse --verify refs/heads/master 2>/dev/null")
160 run_safely("git update-ref -d refs/heads/master %s" % master
[0])
163 enabled
= get_output("git config yap.svn.enabled")
166 # Ensure users don't accidentally kill our "svn" repo
167 def pre_repo(self
, *args
, **flags
):
168 if not self
._enabled
():
170 if '-d' in flags
and args
and args
[0] == "svn":
171 raise YapError("Refusing to delete special svn repository")
174 def cmd_clone(self
, *args
, **flags
):
175 if args
and not run_command("svn info %s" % args
[0]):
176 self
._clone
_svn
(*args
, **flags
)
178 self
.yap
._call
_base
("cmd_clone", *args
, **flags
)
180 def cmd_fetch(self
, *args
, **flags
):
182 if args
and args
[0] == 'svn':
183 os
.system("git svn fetch svn")
184 self
._create
_tagged
_blob
()
187 current
= get_output("git symbolic-ref HEAD")
189 raise YapError("Not on a branch!")
191 current
= current
[0].replace('refs/heads/', '')
192 remote
, merge
= self
.yap
._get
_tracking
(current
)
194 os
.system("git svn fetch svn")
195 self
._create
_tagged
_blob
()
197 self
.yap
._call
_base
("cmd_fetch", *args
, **flags
)
199 def cmd_push(self
, *args
, **flags
):
201 if args
and args
[0] == 'svn':
203 raise YapError("Need a branch name")
204 self
._push
_svn
(args
[1], **flags
)
207 current
= get_output("git symbolic-ref HEAD")
209 raise YapError("Not on a branch!")
211 current
= current
[0].replace('refs/heads/', '')
212 remote
, merge
= self
.yap
._get
_tracking
(current
)
214 self
._push
_svn
(merge
, **flags
)
217 self
.yap
._call
_base
("cmd_push", *args
, **flags
)
219 @short_help("change options for the svn plugin")
220 def cmd_svn(self
, subcmd
):
223 if subcmd
not in ["enable"]:
226 if "svn" in [x
[0] for x
in self
.yap
._list
_remotes
()]:
227 raise YapError("A remote named 'svn' already exists")
230 if not run_command("git config svn-remote.svn.branches"):
231 raise YapError("Cannot currently enable in a repository with svn branches")
233 url
= get_output("git config svn-remote.svn.url")
235 raise YapError("Not a git-svn repository?")
236 fetch
= get_output("git config svn-remote.svn.fetch")
238 lhs
, rhs
= fetch
[0].split(':')
241 rev
= get_output("git rev-parse %s" % rhs
)
243 run_safely("git update-ref refs/remotes/svn/trunk %s" % rev
[0])
245 url
= '/'.join((url
[0], lhs
))
246 self
._configure
_repo
(url
)
247 run_safely("git update-ref -d %s %s" % (rhs
, rev
[0]))