Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 22102:fff8e1cec90f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Aug 2014 11:24:05 -0500
parents c1ca47204590 f72b71ba756b
children fd172ba5c64b
comparison
equal deleted inserted replaced
22101:6fa40bd78bc8 22102:fff8e1cec90f
5899 gen = exchange.readbundle(ui, f, fname) 5899 gen = exchange.readbundle(ui, f, fname)
5900 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', 5900 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
5901 'bundle:' + fname) 5901 'bundle:' + fname)
5902 finally: 5902 finally:
5903 lock.release() 5903 lock.release()
5904 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) 5904
5905 return postincoming(ui, repo, modheads, opts.get('update'), None) 5905 return postincoming(ui, repo, modheads, opts.get('update'), None)
5906 5906
5907 @command('^update|up|checkout|co', 5907 @command('^update|up|checkout|co',
5908 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), 5908 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5909 ('c', 'check', None, 5909 ('c', 'check', None,