Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 30491:13251523b20c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: refer to dirstateguard by its new name
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:06:22 -0500
parents 356406ac454f
children a87e469201f9
comparison
equal deleted inserted replaced
30490:ee2097c560c1 30491:13251523b20c
38 commandserver, 38 commandserver,
39 copies, 39 copies,
40 dagparser, 40 dagparser,
41 dagutil, 41 dagutil,
42 destutil, 42 destutil,
43 dirstateguard,
43 discovery, 44 discovery,
44 encoding, 45 encoding,
45 error, 46 error,
46 exchange, 47 exchange,
47 extensions, 48 extensions,
684 # the backout should appear on the same branch 685 # the backout should appear on the same branch
685 branch = repo.dirstate.branch() 686 branch = repo.dirstate.branch()
686 bheads = repo.branchheads(branch) 687 bheads = repo.branchheads(branch)
687 rctx = scmutil.revsingle(repo, hex(parent)) 688 rctx = scmutil.revsingle(repo, hex(parent))
688 if not opts.get('merge') and op1 != node: 689 if not opts.get('merge') and op1 != node:
689 dsguard = cmdutil.dirstateguard(repo, 'backout') 690 dsguard = dirstateguard.dirstateguard(repo, 'backout')
690 try: 691 try:
691 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 692 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
692 'backout') 693 'backout')
693 stats = mergemod.update(repo, parent, True, True, node, False) 694 stats = mergemod.update(repo, parent, True, True, node, False)
694 repo.setparents(op1, op2) 695 repo.setparents(op1, op2)
4882 4883
4883 if not opts.get('no_commit'): 4884 if not opts.get('no_commit'):
4884 lock = repo.lock() 4885 lock = repo.lock()
4885 tr = repo.transaction('import') 4886 tr = repo.transaction('import')
4886 else: 4887 else:
4887 dsguard = cmdutil.dirstateguard(repo, 'import') 4888 dsguard = dirstateguard.dirstateguard(repo, 'import')
4888 parents = repo[None].parents() 4889 parents = repo[None].parents()
4889 for patchurl in patches: 4890 for patchurl in patches:
4890 if patchurl == '-': 4891 if patchurl == '-':
4891 ui.status(_('applying patch from stdin\n')) 4892 ui.status(_('applying patch from stdin\n'))
4892 patchfile = ui.fin 4893 patchfile = ui.fin