mercurial/merge.py
changeset 18639 5774732bb5e5
parent 18633 6390dd22b12f
child 18640 a8648f32b8ed
equal deleted inserted replaced
18638:047110c0e2a8 18639:5774732bb5e5
     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 error, util, filemerge, copies, subrepo
    10 import error, util, filemerge, copies, subrepo, worker
    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):
   430     hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate']
   430     hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate']
   431     if hgsub and hgsub[0] == 'r':
   431     if hgsub and hgsub[0] == 'r':
   432         subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
   432         subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
   433 
   433 
   434     z = 0
   434     z = 0
   435     for i, item in getremove(repo, mctx, overwrite, workeractions):
   435     prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite),
       
   436                          workeractions)
       
   437     for i, item in prog:
   436         z += i
   438         z += i
   437         repo.ui.progress(_('updating'), z, item=item, total=numupdates,
   439         repo.ui.progress(_('updating'), z, item=item, total=numupdates,
   438                          unit=_('files'))
   440                          unit=_('files'))
   439 
   441 
   440     if hgsub and hgsub[0] == 'g':
   442     if hgsub and hgsub[0] == 'g':