Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 13972:d1f4e7fd970a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move path_auditor from util to scmutil
author Adrian Buehlmann <adrian@cadifra.com>
date Wed, 20 Apr 2011 22:43:31 +0200
parents a8d13ee0ce68
children e4bfb9c337f3
comparison
equal deleted inserted replaced
13971:bfeaa88b875d 13972:d1f4e7fd970a
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from node import nullid, nullrev, hex, bin 8 from node import nullid, nullrev, hex, bin
9 from i18n import _ 9 from i18n import _
10 import util, filemerge, copies, subrepo 10 import scmutil, util, filemerge, copies, subrepo
11 import errno, os, shutil 11 import errno, os, shutil
12 12
13 class mergestate(object): 13 class mergestate(object):
14 '''track 3-way merge state of individual files''' 14 '''track 3-way merge state of individual files'''
15 def __init__(self, repo): 15 def __init__(self, repo):
301 for f in moves: 301 for f in moves:
302 if os.path.lexists(repo.wjoin(f)): 302 if os.path.lexists(repo.wjoin(f)):
303 repo.ui.debug("removing %s\n" % f) 303 repo.ui.debug("removing %s\n" % f)
304 os.unlink(repo.wjoin(f)) 304 os.unlink(repo.wjoin(f))
305 305
306 audit_path = util.path_auditor(repo.root) 306 audit_path = scmutil.path_auditor(repo.root)
307 307
308 numupdates = len(action) 308 numupdates = len(action)
309 for i, a in enumerate(action): 309 for i, a in enumerate(action):
310 f, m = a[:2] 310 f, m = a[:2]
311 u.progress(_('updating'), i + 1, item=f, total=numupdates, 311 u.progress(_('updating'), i + 1, item=f, total=numupdates,