Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 22119:fd172ba5c64b

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 Tue, 12 Aug 2014 04:50:58 -0500
parents fff8e1cec90f 42b1344656f7
children 269688a398c4
comparison
equal deleted inserted replaced
22118:9a299c39de01 22119:fd172ba5c64b
5890 Returns 0 on success, 1 if an update has unresolved files. 5890 Returns 0 on success, 1 if an update has unresolved files.
5891 """ 5891 """
5892 fnames = (fname1,) + fnames 5892 fnames = (fname1,) + fnames
5893 5893
5894 lock = repo.lock() 5894 lock = repo.lock()
5895 wc = repo['.']
5896 try: 5895 try:
5897 for fname in fnames: 5896 for fname in fnames:
5898 f = hg.openpath(ui, fname) 5897 f = hg.openpath(ui, fname)
5899 gen = exchange.readbundle(ui, f, fname) 5898 gen = exchange.readbundle(ui, f, fname)
5900 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', 5899 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',