Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 28199:d49793aac1ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: indent code in batchget() To make the next patch easier to read.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 20 Feb 2016 15:27:11 -0800
parents 19424f960bf5
children 588695ccbb22
comparison
equal deleted inserted replaced
28198:ddc07ddcca94 28199:d49793aac1ac
1056 verbose = repo.ui.verbose 1056 verbose = repo.ui.verbose
1057 fctx = mctx.filectx 1057 fctx = mctx.filectx
1058 wwrite = repo.wwrite 1058 wwrite = repo.wwrite
1059 ui = repo.ui 1059 ui = repo.ui
1060 i = 0 1060 i = 0
1061 for f, (flags, backup), msg in actions: 1061 if True:
1062 repo.ui.debug(" %s: %s -> g\n" % (f, msg)) 1062 for f, (flags, backup), msg in actions:
1063 if verbose: 1063 repo.ui.debug(" %s: %s -> g\n" % (f, msg))
1064 repo.ui.note(_("getting %s\n") % f) 1064 if verbose:
1065 1065 repo.ui.note(_("getting %s\n") % f)
1066 if backup: 1066
1067 absf = repo.wjoin(f) 1067 if backup:
1068 orig = scmutil.origpath(ui, repo, absf) 1068 absf = repo.wjoin(f)
1069 try: 1069 orig = scmutil.origpath(ui, repo, absf)
1070 # TODO Mercurial has always aborted if an untracked directory 1070 try:
1071 # is replaced by a tracked file, or generally with 1071 # TODO Mercurial has always aborted if an untracked
1072 # file/directory merges. This needs to be sorted out. 1072 # directory is replaced by a tracked file, or generally
1073 if repo.wvfs.isfileorlink(f): 1073 # with file/directory merges. This needs to be sorted out.
1074 util.rename(absf, orig) 1074 if repo.wvfs.isfileorlink(f):
1075 except OSError as e: 1075 util.rename(absf, orig)
1076 if e.errno != errno.ENOENT: 1076 except OSError as e:
1077 raise 1077 if e.errno != errno.ENOENT:
1078 1078 raise
1079 wwrite(f, fctx(f).data(), flags) 1079
1080 if i == 100: 1080 wwrite(f, fctx(f).data(), flags)
1081 yield i, f 1081 if i == 100:
1082 i = 0 1082 yield i, f
1083 i += 1 1083 i = 0
1084 i += 1
1084 if i > 0: 1085 if i > 0:
1085 yield i, f 1086 yield i, f
1086 1087
1087 def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): 1088 def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
1088 """apply the merge action list to the working directory 1089 """apply the merge action list to the working directory