##// END OF EJS Templates
mergetools: add new conflict marker format with diffs in...
mergetools: add new conflict marker format with diffs in I use 3-way conflict markers. Often when I resolve them, I manually compare one the base with one side and apply the differences to the other side. That can be hard when the conflict marker is large. This patch introduces a new type of conflict marker, which I'm hoping will make it easier to resolve conflicts. The new format uses `<<<<<<<` and `>>>>>>>` to open and close the markers, just like our existing 2-way and 3-way conflict markers. Instead of having 2 or 3 snapshots (left+right or left+base+right), it has a sequence of diffs. A diff looks like this: ``` ------- base +++++++ left a -b +c d ``` A diff that adds one side ("diff from nothing") has a `=======` header instead and does not have have `+` prefixed on its lines. A regular 3-way merge can be viewed as adding one side plus a diff between the base and the other side. It thus has two ways of being represented, depending on which side is being diffed: ``` <<<<<<< ======= left contents on left ------- base +++++++ right contents on -left +right >>>>>>> ``` or ``` <<<<<<< ------- base +++++++ left contents on -right +left ======= right contents on right >>>>>>> ``` I've made it so the new merge tool tries to pick a version that has the most common lines (no difference in the example above). I've called the new tool "mergediff" to stick to the convention of starting with "merge" if the tool tries a regular 3-way merge. The idea came from my pet VCS (placeholder name `jj`), which has support for octopus merges and other ways of ending up with merges of more than 3 versions. I wanted to be able to represent such conflicts in the working copy and therefore thought of this format (although I have not yet implemented it in my VCS). I then attended a meeting with Larry McVoy, who said BitKeeper has an option (`bk smerge -g`) for showing a similar format, which reminded me to actually attempt this in Mercurial. Differential Revision: https://phab.mercurial-scm.org/D9551

File last commit:

r43347:687b865b default
r46724:bdc2bf68 default
Show More
loggingutil.py
141 lines | 3.9 KiB | text/x-python | PythonLexer
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 # loggingutil.py - utility for logging events
#
# Copyright 2010 Nicolas Dumazet
# Copyright 2013 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import errno
Augie Fackler
formatting: blacken the codebase...
r43346 from . import pycompat
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 from .utils import (
dateutil,
procutil,
stringutil,
)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 def openlogfile(ui, vfs, name, maxfiles=0, maxsize=0):
Yuya Nishihara
loggingutil: document openlogfile()...
r40831 """Open log file in append mode, with optional rotation
If maxsize > 0, the log file will be rotated up to maxfiles.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 def rotate(oldpath, newpath):
try:
vfs.unlink(newpath)
except OSError as err:
if err.errno != errno.ENOENT:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"warning: cannot remove '%s': %s\n"
Augie Fackler
formatting: blacken the codebase...
r43346 % (newpath, err.strerror)
)
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 try:
if newpath:
vfs.rename(oldpath, newpath)
except OSError as err:
if err.errno != errno.ENOENT:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"warning: cannot rename '%s' to '%s': %s\n"
Augie Fackler
formatting: blacken the codebase...
r43346 % (newpath, oldpath, err.strerror)
)
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830
if maxsize > 0:
try:
st = vfs.stat(name)
except OSError:
pass
else:
if st.st_size >= maxsize:
path = vfs.join(name)
for i in pycompat.xrange(maxfiles - 1, 1, -1):
Augie Fackler
formatting: blacken the codebase...
r43346 rotate(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 oldpath=b'%s.%d' % (path, i - 1),
newpath=b'%s.%d' % (path, i),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 rotate(oldpath=path, newpath=maxfiles > 0 and path + b'.1')
return vfs(name, b'a', makeparentdirs=False)
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 def _formatlogline(msg):
date = dateutil.datestr(format=b'%Y/%m/%d %H:%M:%S')
pid = procutil.getpid()
return b'%s (%d)> %s' % (date, pid, msg)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 def _matchevent(event, tracked):
return b'*' in tracked or event in tracked
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 class filelogger(object):
"""Basic logger backed by physical file with optional rotation"""
def __init__(self, vfs, name, tracked, maxfiles=0, maxsize=0):
self._vfs = vfs
self._name = name
self._trackedevents = set(tracked)
self._maxfiles = maxfiles
self._maxsize = maxsize
def tracked(self, event):
return _matchevent(event, self._trackedevents)
def log(self, ui, event, msg, opts):
line = _formatlogline(msg)
try:
Augie Fackler
formatting: blacken the codebase...
r43346 with openlogfile(
ui,
self._vfs,
self._name,
maxfiles=self._maxfiles,
maxsize=self._maxsize,
) as fp:
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 fp.write(line)
except IOError as err:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
b'cannot write to %s: %s\n'
% (self._name, stringutil.forcebytestr(err))
)
Yuya Nishihara
loggingutil: add basic logger backends...
r40856
class fileobjectlogger(object):
"""Basic logger backed by file-like object"""
def __init__(self, fp, tracked):
self._fp = fp
self._trackedevents = set(tracked)
def tracked(self, event):
return _matchevent(event, self._trackedevents)
def log(self, ui, event, msg, opts):
line = _formatlogline(msg)
try:
self._fp.write(line)
self._fp.flush()
except IOError as err:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
b'cannot write to %s: %s\n'
% (
stringutil.forcebytestr(self._fp.name),
stringutil.forcebytestr(err),
)
)
Yuya Nishihara
loggingutil: add basic logger backends...
r40856
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 class proxylogger(object):
"""Forward log events to another logger to be set later"""
def __init__(self):
self.logger = None
def tracked(self, event):
return self.logger is not None and self.logger.tracked(event)
def log(self, ui, event, msg, opts):
assert self.logger is not None
self.logger.log(ui, event, msg, opts)