mercurial-scm/hg-stable: mercurial/filemerge.py comparison

comparison mercurial/filemerge.py @ 26512:4c52dd406adc

filemerge: indent filemerge.filemerge This will make upcoming patches much easier to review.

author	Siddharth Agarwal <sid0@fb.com>
date	Tue, 06 Oct 2015 17:39:13 -0700
parents	a4da463df6cf
children	01224c28e0ed

comparison

equal deleted inserted replaced

-:bb3d961c1648
+:4c52dd406adc
 fco = other file context
 fca = ancestor file context
 fcd = local file context for current/destination file
 """
-def temp(prefix, ctx):
+if True:
-pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
+def temp(prefix, ctx):
-(fd, name) = tempfile.mkstemp(prefix=pre)
+pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
-data = repo.wwritedata(ctx.path(), ctx.data())
+(fd, name) = tempfile.mkstemp(prefix=pre)
-f = os.fdopen(fd, "wb")
+data = repo.wwritedata(ctx.path(), ctx.data())
-f.write(data)
+f = os.fdopen(fd, "wb")
-f.close()
+f.write(data)
-return name
+f.close()
+return name
-if not fco.cmp(fcd): # files identical?
-return None
+if not fco.cmp(fcd): # files identical?
+return None
-ui = repo.ui
-fd = fcd.path()
+ui = repo.ui
-binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
+fd = fcd.path()
-symlink = 'l' in fcd.flags() + fco.flags()
+binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
-tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
+symlink = 'l' in fcd.flags() + fco.flags()
-ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
+tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
-(tool, fd, binary, symlink))
+ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
+(tool, fd, binary, symlink))
-if tool in internals:
-func = internals[tool]
+if tool in internals:
-trymerge = func.trymerge
+func = internals[tool]
-onfailure = func.onfailure
+trymerge = func.trymerge
-else:
+onfailure = func.onfailure
-func = _xmerge
+else:
-trymerge = True
+func = _xmerge
-onfailure = _("merging %s failed!\n")
+trymerge = True
+onfailure = _("merging %s failed!\n")
-toolconf = tool, toolpath, binary, symlink
+toolconf = tool, toolpath, binary, symlink
-if not trymerge:
-return func(repo, mynode, orig, fcd, fco, fca, toolconf)
+if not trymerge:
+return func(repo, mynode, orig, fcd, fco, fca, toolconf)
-a = repo.wjoin(fd)
-b = temp("base", fca)
+a = repo.wjoin(fd)
-c = temp("other", fco)
+b = temp("base", fca)
-back = a + ".orig"
+c = temp("other", fco)
-util.copyfile(a, back)
+back = a + ".orig"
+util.copyfile(a, back)
-if orig != fco.path():
-ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
+if orig != fco.path():
-else:
+ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
-ui.status(_("merging %s\n") % fd)
+else:
+ui.status(_("merging %s\n") % fd)
-ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
+ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
-markerstyle = ui.config('ui', 'mergemarkers', 'basic')
-if not labels:
+markerstyle = ui.config('ui', 'mergemarkers', 'basic')
-labels = _defaultconflictlabels
+if not labels:
-if markerstyle != 'basic':
+labels = _defaultconflictlabels
-labels = _formatlabels(repo, fcd, fco, fca, labels)
+if markerstyle != 'basic':
+labels = _formatlabels(repo, fcd, fco, fca, labels)
-needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
-(a, b, c, back), labels=labels)
+needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
-if not needcheck:
+(a, b, c, back), labels=labels)
+if not needcheck:
+if r:
+if onfailure:
+ui.warn(onfailure % fd)
+else:
+util.unlink(back)
+util.unlink(b)
+util.unlink(c)
+return r
+if not r and (_toolbool(ui, tool, "checkconflicts") or
+'conflicts' in _toollist(ui, tool, "check")):
+if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
+re.MULTILINE):
+r = 1
+checked = False
+if 'prompt' in _toollist(ui, tool, "check"):
+checked = True
+if ui.promptchoice(_("was merge of '%s' successful (yn)?"
+"$$ &Yes $$ &No") % fd, 1):
+r = 1
+if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
+'changed' in
+_toollist(ui, tool, "check")):
+if filecmp.cmp(a, back):
+if ui.promptchoice(_(" output file %s appears unchanged\n"
+"was merge successful (yn)?"
+"$$ &Yes $$ &No") % fd, 1):
+r = 1
+if _toolbool(ui, tool, "fixeol"):
+_matcheol(a, back)
 if r:
 if onfailure:
 ui.warn(onfailure % fd)
 else:
 util.unlink(back)
 util.unlink(b)
 util.unlink(c)
 return r
-if not r and (_toolbool(ui, tool, "checkconflicts") or
-'conflicts' in _toollist(ui, tool, "check")):
-if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
-re.MULTILINE):
-r = 1
-checked = False
-if 'prompt' in _toollist(ui, tool, "check"):
-checked = True
-if ui.promptchoice(_("was merge of '%s' successful (yn)?"
-"$$ &Yes $$ &No") % fd, 1):
-r = 1
-if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
-'changed' in _toollist(ui, tool, "check")):
-if filecmp.cmp(a, back):
-if ui.promptchoice(_(" output file %s appears unchanged\n"
-"was merge successful (yn)?"
-"$$ &Yes $$ &No") % fd, 1):
-r = 1
-if _toolbool(ui, tool, "fixeol"):
-_matcheol(a, back)
-if r:
-if onfailure:
-ui.warn(onfailure % fd)
-else:
-util.unlink(back)
-util.unlink(b)
-util.unlink(c)
-return r
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = internals.values()

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 26512:4c52dd406adc