1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
|
from hgext import rebase as hgrebase
from mercurial import cmdutil
from mercurial import patch
from mercurial import hg
from mercurial import util as hgutil
from mercurial import node
from mercurial import i18n
from mercurial import extensions
import replay
import pushmod
import stupid as stupidmod
import svnwrap
import svnrepo
import util
try:
from mercurial import scmutil
revpair = scmutil.revpair
except ImportError:
revpair = cmdutil.revpair
pullfuns = {
True: replay.convert_rev,
False: stupidmod.convert_rev,
}
revmeta = [
('revision', 'revnum'),
('user', 'author'),
('date', 'date'),
('message', 'message'),
]
def version(orig, ui, *args, **opts):
svn = opts.pop('svn', None)
orig(ui, *args, **opts)
if svn:
svnversion, bindings = svnwrap.version()
ui.status('\n')
ui.status('hgsubversion: %s\n' % util.version(ui))
ui.status('Subversion: %s\n' % svnversion)
ui.status('bindings: %s\n' % bindings)
def parents(orig, ui, repo, *args, **opts):
"""show Mercurial & Subversion parents of the working dir or revision
"""
if not opts.get('svn', False):
return orig(ui, repo, *args, **opts)
meta = repo.svnmeta()
hashes = meta.revmap.hashes()
ha = util.parentrev(ui, repo, meta, hashes)
if ha.node() == node.nullid:
raise hgutil.Abort('No parent svn revision!')
displayer = cmdutil.show_changeset(ui, repo, opts, buffered=False)
displayer.show(ha)
return 0
def incoming(orig, ui, repo, origsource='default', **opts):
"""show incoming revisions from Subversion
"""
source, revs, checkout = util.parseurl(ui.expandpath(origsource))
other = hg.repository(ui, source)
if 'subversion' not in other.capabilities:
return orig(ui, repo, origsource, **opts)
svn = other.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
ui.status('incoming changes from %s\n' % other.svnurl)
for r in svn.revisions(start=meta.revmap.youngest):
ui.status('\n')
for label, attr in revmeta:
l1 = label + ':'
val = str(getattr(r, attr)).strip()
if not ui.verbose:
val = val.split('\n')[0]
ui.status('%s%s\n' % (l1.ljust(13), val))
def findcommonoutgoing(repo, other, onlyheads=None, force=False, commoninc=None):
assert other.capable('subversion')
# split off #rev; TODO implement --revision/#rev support
svn = other.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
parent = repo.parents()[0].node()
hashes = meta.revmap.hashes()
return util.outgoing_common_and_heads(repo, hashes, parent)
def findoutgoing(repo, dest=None, heads=None, force=False):
"""show changesets not found in the Subversion repository
"""
assert dest.capable('subversion')
# split off #rev; TODO implement --revision/#rev support
#svnurl, revs, checkout = util.parseurl(dest.svnurl, heads)
svn = dest.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
parent = repo.parents()[0].node()
hashes = meta.revmap.hashes()
return util.outgoing_revisions(repo, hashes, parent)
def diff(orig, ui, repo, *args, **opts):
"""show a diff of the most recent revision against its parent from svn
"""
if not opts.get('svn', False) or opts.get('change', None):
return orig(ui, repo, *args, **opts)
meta = repo.svnmeta()
hashes = meta.revmap.hashes()
if not opts.get('rev', None):
parent = repo.parents()[0]
o_r = util.outgoing_revisions(repo, hashes, parent.node())
if o_r:
parent = repo[o_r[-1]].parents()[0]
opts['rev'] = ['%s:.' % node.hex(parent.node()), ]
node1, node2 = revpair(repo, opts['rev'])
baserev, _junk = hashes.get(node1, (-1, 'junk'))
newrev, _junk = hashes.get(node2, (-1, 'junk'))
it = patch.diff(repo, node1, node2,
opts=patch.diffopts(ui, opts={'git': True,
'show_function': False,
'ignore_all_space': False,
'ignore_space_change': False,
'ignore_blank_lines': False,
'unified': True,
'text': False,
}))
ui.write(util.filterdiff(''.join(it), baserev, newrev))
def push(repo, dest, force, revs):
"""push revisions starting at a specified head back to Subversion.
"""
assert not revs, 'designated revisions for push remains unimplemented.'
if hasattr(cmdutil, 'bail_if_changed'):
cmdutil.bail_if_changed(repo)
else:
# Since 1.9 (d68ddccf276b)
cmdutil.bailifchanged(repo)
checkpush = getattr(repo, 'checkpush', None)
if checkpush:
checkpush(force, revs)
ui = repo.ui
old_encoding = util.swap_out_encoding()
# TODO: implement --rev/#rev support
# TODO: do credentials specified in the URL still work?
svnurl = repo.ui.expandpath(dest.svnurl)
svn = dest.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
# Strategy:
# 1. Find all outgoing commits from this head
if len(repo.parents()) != 1:
ui.status('Cowardly refusing to push branch merge\n')
return 0 # results in nonzero exit status, see hg's commands.py
workingrev = repo.parents()[0]
ui.status('searching for changes\n')
hashes = meta.revmap.hashes()
outgoing = util.outgoing_revisions(repo, hashes, workingrev.node())
if not (outgoing and len(outgoing)):
ui.status('no changes found\n')
return 1 # so we get a sane exit status, see hg's commands.push
while outgoing:
# 2. Commit oldest revision that needs to be pushed
oldest = outgoing.pop(-1)
old_ctx = repo[oldest]
old_pars = old_ctx.parents()
if len(old_pars) != 1:
ui.status('Found a branch merge, this needs discussion and '
'implementation.\n')
return 0 # results in nonzero exit status, see hg's commands.py
# We will commit to svn against this node's parent rev. Any file-level
# conflicts here will result in an error reported by svn.
base_ctx = old_pars[0]
base_revision = hashes[base_ctx.node()][0]
svnbranch = base_ctx.branch()
# Find most recent svn commit we have on this branch.
# This node will become the nearest known ancestor of the pushed rev.
oldtipctx = base_ctx
old_children = oldtipctx.descendants()
seen = set(c.node() for c in old_children)
samebranchchildren = [c for c in old_children if c.branch() == svnbranch
and c.node() in hashes]
if samebranchchildren:
# The following relies on descendants being sorted by rev.
oldtipctx = samebranchchildren[-1]
# All set, so commit now.
try:
pushmod.commit(ui, repo, old_ctx, meta, base_revision, svn)
except pushmod.NoFilesException:
ui.warn("Could not push revision %s because it had no changes in svn.\n" %
old_ctx)
return 1
# 3. Fetch revisions from svn
# TODO: this probably should pass in the source explicitly - rev too?
r = repo.pull(dest, force=force)
assert not r or r == 0
# 4. Find the new head of the target branch
# We expect to get our own new commit back, but we might also get other
# commits that happened since our last pull, or even right after our own
# commit (race).
for c in oldtipctx.descendants():
if c.node() not in seen and c.branch() == svnbranch:
newtipctx = c
# 5. Rebase all children of the currently-pushing rev to the new head
heads = repo.heads(old_ctx.node())
for needs_transplant in heads:
def extrafn(ctx, extra):
if ctx.node() == oldest:
return
extra['branch'] = ctx.branch()
# TODO: can we avoid calling our own rebase wrapper here?
rebase(hgrebase.rebase, ui, repo, svn=True, svnextrafn=extrafn,
svnsourcerev=needs_transplant)
# Reload the repo after the rebase. Do not reuse contexts across this.
newtip = newtipctx.node()
repo = hg.repository(ui, meta.path)
newtipctx = repo[newtip]
# Rewrite the node ids in outgoing to their rebased versions.
rebasemap = dict()
for child in newtipctx.descendants():
rebasesrc = child.extra().get('rebase_source')
if rebasesrc:
rebasemap[node.bin(rebasesrc)] = child.node()
outgoing = [rebasemap.get(n) or n for n in outgoing]
# TODO: stop constantly creating the SVNMeta instances.
meta = repo.svnmeta(svn.uuid, svn.subdir)
hashes = meta.revmap.hashes()
util.swap_out_encoding(old_encoding)
return 1 # so we get a sane exit status, see hg's commands.push
def pull(repo, source, heads=[], force=False):
"""pull new revisions from Subversion"""
assert source.capable('subversion')
svn_url = source.svnurl
# Split off #rev
svn_url, heads, checkout = util.parseurl(svn_url, heads)
old_encoding = util.swap_out_encoding()
try:
stopat_rev = int(checkout or 0)
except ValueError:
raise hgutil.Abort('unrecognised Subversion revision %s: '
'only numbers work.' % checkout)
have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
if not have_replay:
repo.ui.note('fetching stupidly...\n')
svn = source.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
layout = repo.ui.config('hgsubversion', 'layout', 'auto')
if layout == 'auto':
rootlist = svn.list_dir('', revision=(stopat_rev or None))
if sum(map(lambda x: x in rootlist, ('branches', 'tags', 'trunk'))):
layout = 'standard'
else:
layout = 'single'
repo.ui.setconfig('hgsubversion', 'layout', layout)
repo.ui.note('using %s layout\n' % layout)
branch = repo.ui.config('hgsubversion', 'branch')
if branch:
if layout != 'single':
msg = ('branch cannot be specified for Subversion clones using '
'standard directory layout')
raise hgutil.Abort(msg)
meta.branchmap['default'] = branch
ui = repo.ui
start = meta.revmap.youngest
origrevcount = len(meta.revmap)
if start <= 0:
# we are initializing a new repository
start = repo.ui.config('hgsubversion', 'startrev', 0)
if isinstance(start, str) and start.upper() == 'HEAD':
start = svn.last_changed_rev
else:
start = int(start)
if start > 0:
if layout == 'standard':
raise hgutil.Abort('non-zero start revisions are only '
'supported for single-directory clones.')
ui.note('starting at revision %d; any prior will be ignored\n'
% start)
# fetch all revisions *including* the one specified...
start -= 1
# anything less than zero makes no sense
if start < 0:
start = 0
oldrevisions = len(meta.revmap)
if stopat_rev:
total = stopat_rev - start
else:
total = svn.HEAD - start
lastpulled = None
try:
try:
# start converting revisions
firstrun = True
for r in svn.revisions(start=start, stop=stopat_rev):
lastpulled = r.revnum
if (r.author is None and
r.message == 'This is an empty revision for padding.'):
continue
tbdelta = meta.update_branch_tag_map_for_rev(r)
# got a 502? Try more than once!
tries = 0
converted = False
while not converted:
try:
msg = ''
if r.message:
msg = r.message.strip()
if not msg:
msg = util.default_commit_msg(ui)
else:
msg = [s.strip() for s in msg.splitlines() if s][0]
if getattr(ui, 'termwidth', False):
w = ui.termwidth()
else:
w = hgutil.termwidth()
bits = (r.revnum, r.author, msg)
ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
util.progress(ui, 'pull', r.revnum - start, total=total)
meta.save_tbdelta(tbdelta)
close = pullfuns[have_replay](ui, meta, svn, r, tbdelta,
firstrun)
meta.committags(r, close)
for branch, parent in close.iteritems():
if parent in (None, node.nullid):
continue
meta.delbranch(branch, parent, r)
meta.save()
converted = True
firstrun = False
except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
ui.status('%s\n' % e.message)
stupidmod.print_your_svn_is_old_message(ui)
have_replay = False
except svnwrap.SubversionException, e: #pragma: no cover
if (e.args[1] == svnwrap.ERR_RA_DAV_REQUEST_FAILED
and '502' in str(e)
and tries < 3):
tries += 1
ui.status('Got a 502, retrying (%s)\n' % tries)
else:
ui.traceback()
raise hgutil.Abort(*e.args)
except KeyboardInterrupt:
pass
finally:
util.progress(ui, 'pull', None, total=total)
util.swap_out_encoding(old_encoding)
if lastpulled is not None:
meta.revmap.youngest = lastpulled
revisions = len(meta.revmap) - oldrevisions
if revisions == 0:
ui.status(i18n._("no changes found\n"))
return 0
else:
ui.status("pulled %d revisions\n" % revisions)
def rebase(orig, ui, repo, **opts):
"""rebase current unpushed revisions onto the Subversion head
This moves a line of development from making its own head to the top of
Subversion development, linearizing the changes. In order to make sure you
rebase on top of the current top of Subversion work, you should probably run
'hg svn pull' before running this.
Also looks for svnextrafn and svnsourcerev in **opts.
"""
if not opts.get('svn', False):
return orig(ui, repo, **opts)
def extrafn2(ctx, extra):
"""defined here so we can add things easily.
"""
extra['branch'] = ctx.branch()
extrafn = opts.get('svnextrafn', extrafn2)
sourcerev = opts.get('svnsourcerev', repo.parents()[0].node())
meta = repo.svnmeta()
hashes = meta.revmap.hashes()
o_r = util.outgoing_revisions(repo, hashes, sourcerev=sourcerev)
if not o_r:
ui.status('Nothing to rebase!\n')
return 0
if len(repo[sourcerev].children()):
ui.status('Refusing to rebase non-head commit like a coward\n')
return 0
parent_rev = repo[o_r[-1]].parents()[0]
target_rev = parent_rev
p_n = parent_rev.node()
exhausted_choices = False
while target_rev.children() and not exhausted_choices:
for c in target_rev.children():
exhausted_choices = True
n = c.node()
if (n in hashes and hashes[n][1] == hashes[p_n][1]):
target_rev = c
exhausted_choices = False
break
if parent_rev == target_rev:
ui.status('Already up to date!\n')
return 0
return orig(ui, repo, dest=node.hex(target_rev.node()),
base=node.hex(sourcerev),
extrafn=extrafn)
optionmap = {
'tagpaths': ('hgsubversion', 'tagpaths'),
'authors': ('hgsubversion', 'authormap'),
'filemap': ('hgsubversion', 'filemap'),
'branchmap': ('hgsubversion', 'branchmap'),
'tagmap': ('hgsubversion', 'tagmap'),
'stupid': ('hgsubversion', 'stupid'),
'defaulthost': ('hgsubversion', 'defaulthost'),
'defaultauthors': ('hgsubversion', 'defaultauthors'),
'usebranchnames': ('hgsubversion', 'usebranchnames'),
'layout': ('hgsubversion', 'layout'),
'startrev': ('hgsubversion', 'startrev'),
}
dontretain = { 'hgsubversion': set(['authormap', 'filemap', 'layout', ]) }
def clone(orig, ui, source, dest=None, **opts):
"""
Some of the options listed below only apply to Subversion
%(target)s. See 'hg help %(extension)s' for more information on
them as well as other ways of customising the conversion process.
"""
data = {}
def hgclonewrapper(orig, ui, *args, **opts):
if getattr(hg, 'peer', None):
# Since 1.9 (d976542986d2)
origsource = args[1]
else:
origsource = args[0]
if isinstance(origsource, str):
source, branch, checkout = util.parseurl(ui.expandpath(origsource),
opts.get('branch'))
srcrepo = hg.repository(ui, source)
else:
srcrepo = origsource
if srcrepo.capable('subversion'):
branches = opts.pop('branch', None)
if branches:
data['branches'] = branches
ui.setconfig('hgsubversion', 'branch', branches[-1])
data['srcrepo'], data['dstrepo'] = orig(ui, *args, **opts)
for opt, (section, name) in optionmap.iteritems():
if opt in opts and opts[opt]:
ui.setconfig(section, name, str(opts.pop(opt)))
# calling hg.clone directoly to get the repository instances it returns,
# breaks in subtle ways, so we double-wrap
orighgclone = extensions.wrapfunction(hg, 'clone', hgclonewrapper)
orig(ui, source, dest, **opts)
hg.clone = orighgclone
# do this again; the ui instance isn't shared between the wrappers
if data.get('branches'):
ui.setconfig('hgsubversion', 'branch', data['branches'][-1])
dstrepo = data.get('dstrepo')
srcrepo = data.get('srcrepo')
if dstrepo.local() and srcrepo.capable('subversion'):
fd = dstrepo.opener("hgrc", "a", text=True)
for section in set(s for s, v in optionmap.itervalues()):
config = dict(ui.configitems(section))
for name in dontretain[section]:
config.pop(name, None)
if config:
fd.write('\n[%s]\n' % section)
map(fd.write, ('%s = %s\n' % p for p in config.iteritems()))
def generic(orig, ui, repo, *args, **opts):
"""
Subversion %(target)s can be used for %(command)s. See 'hg help
%(extension)s' for more on the conversion process.
"""
branch = opts.get('branch', None)
if branch:
ui.setconfig('hgsubversion', 'branch', branch[-1])
for opt, (section, name) in optionmap.iteritems():
if opt in opts and opts[opt]:
if isinstance(repo, str):
ui.setconfig(section, name, opts.pop(opt))
else:
repo.ui.setconfig(section, name, opts.pop(opt))
return orig(ui, repo, *args, **opts)
|