Mercurial > hgsubversion

comparison stupid.py @ 329:235022089da6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Sat, 09 May 2009 12:36:17 +0200
parents b6c6d32c8ef1
children 75f082b5897e
comparison
equal deleted inserted replaced
328:48ec2d62dc29 329:235022089da6
524 files_touched, 524 files_touched,
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)
530 if hg_editor.opts.get('svn_no_branchnames', False):
531 extra.pop('branch', None)
529 ha = hg_editor.repo.commitctx(current_ctx) 532 ha = hg_editor.repo.commitctx(current_ctx)
530 branch = extra.get('branch', None)
531 if not branch in hg_editor.branches: 533 if not branch in hg_editor.branches:
532 hg_editor.branches[branch] = None, 0, r.revnum 534 hg_editor.branches[branch] = None, 0, r.revnum
533 hg_editor.add_to_revmap(r.revnum, b, ha) 535 hg_editor.add_to_revmap(r.revnum, b, ha)
534 hg_editor._save_metadata() 536 hg_editor._save_metadata()
535 util.describe_commit(ui, ha, b) 537 util.describe_commit(ui, ha, b)
556 raise IOError() 558 raise IOError()
557 closed = node.nullid 559 closed = node.nullid
558 if 'closed-branches' in hg_editor.repo.branchtags(): 560 if 'closed-branches' in hg_editor.repo.branchtags():
559 closed = hg_editor.repo['closed-branches'].node() 561 closed = hg_editor.repo['closed-branches'].node()
560 parents = (parent, closed) 562 parents = (parent, closed)
563 extra = {}
564 if not hg_editor.opts.get('svn_no_branchnames', False):
565 extra['branch'] = 'closed-branches'
561 current_ctx = context.memctx(hg_editor.repo, 566 current_ctx = context.memctx(hg_editor.repo,
562 parents, 567 parents,
563 r.message or util.default_commit_msg, 568 r.message or util.default_commit_msg,
564 files_touched, 569 files_touched,
565 filectxfn, 570 filectxfn,
566 hg_editor.authors[r.author], 571 hg_editor.authors[r.author],
567 date, 572 date,
568 {'branch': 'closed-branches'}) 573 extra)
569 ha = hg_editor.repo.commitctx(current_ctx) 574 ha = hg_editor.repo.commitctx(current_ctx)
570 ui.status('Marked branch %s as closed.\n' % (b or 'default')) 575 ui.status('Marked branch %s as closed.\n' % (b or 'default'))
571 hg_editor._save_metadata() 576 hg_editor._save_metadata()