comparison stupid.py @ 331:75f082b5897e

Switch to using url scheme wrappers instead of duplicating each command we wrap. The 'hg svn url' command has been killed; the replacement is '.hg/hgrc'. More stuff related to its disappearance has been stripped, including two tests. HgChangeReceiver now takes a UUID argument, which it uses to ensure that remote repositories remain unchanged. This is a temporary solution, and I'm not entirely satisfied with how it's done either. Access to the UUID file has been isolated in a HgChangeReceiver property. Some more tests have been updated to use ui.pushbuffer()/popbuffer(), and to pass through the Mercurial API. Moved the arguments to wrappers.pull() to the UI configuration. Also, remove HgChangeReceiver.opts in favour of a 'usebranchnames' instance & configuration variable. The name is taken from the ConvertExtension.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 15 May 2009 19:18:43 +0200
parents b6c6d32c8ef1
children
comparison
equal deleted inserted replaced
330:5f8f2fd4fd54 331:75f082b5897e
525 filectxfn, 525 filectxfn,
526 hg_editor.authors[r.author], 526 hg_editor.authors[r.author],
527 date, 527 date,
528 extra) 528 extra)
529 branch = extra.get('branch', None) 529 branch = extra.get('branch', None)
530 if hg_editor.opts.get('svn_no_branchnames', False): 530 if not hg_editor.usebranchnames:
531 extra.pop('branch', None) 531 extra.pop('branch', None)
532 ha = hg_editor.repo.commitctx(current_ctx) 532 ha = hg_editor.repo.commitctx(current_ctx)
533 if not branch in hg_editor.branches: 533 if not branch in hg_editor.branches:
534 hg_editor.branches[branch] = None, 0, r.revnum 534 hg_editor.branches[branch] = None, 0, r.revnum
535 hg_editor.add_to_revmap(r.revnum, b, ha) 535 hg_editor.add_to_revmap(r.revnum, b, ha)
559 closed = node.nullid 559 closed = node.nullid
560 if 'closed-branches' in hg_editor.repo.branchtags(): 560 if 'closed-branches' in hg_editor.repo.branchtags():
561 closed = hg_editor.repo['closed-branches'].node() 561 closed = hg_editor.repo['closed-branches'].node()
562 parents = (parent, closed) 562 parents = (parent, closed)
563 extra = {} 563 extra = {}
564 if not hg_editor.opts.get('svn_no_branchnames', False): 564 if hg_editor.usebranchnames:
565 extra['branch'] = 'closed-branches' 565 extra['branch'] = 'closed-branches'
566 current_ctx = context.memctx(hg_editor.repo, 566 current_ctx = context.memctx(hg_editor.repo,
567 parents, 567 parents,
568 r.message or util.default_commit_msg, 568 r.message or util.default_commit_msg,
569 files_touched, 569 files_touched,