Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 22103:42b1344656f7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unbundle: fix pyflakes warning about wc
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Aug 2014 13:10:00 -0500
parents f72b71ba756b
children fd172ba5c64b 328efb5ca0b4
comparison
equal deleted inserted replaced
22091:f72b71ba756b 22103:42b1344656f7
5867 Returns 0 on success, 1 if an update has unresolved files. 5867 Returns 0 on success, 1 if an update has unresolved files.
5868 """ 5868 """
5869 fnames = (fname1,) + fnames 5869 fnames = (fname1,) + fnames
5870 5870
5871 lock = repo.lock() 5871 lock = repo.lock()
5872 wc = repo['.']
5873 try: 5872 try:
5874 for fname in fnames: 5873 for fname in fnames:
5875 f = hg.openpath(ui, fname) 5874 f = hg.openpath(ui, fname)
5876 gen = exchange.readbundle(ui, f, fname) 5875 gen = exchange.readbundle(ui, f, fname)
5877 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', 5876 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',