mercurial-scm/hg: comparison mercurial/patch.py

equal deleted inserted replaced

-:346af7687c6f
+:89a2afe31e82
 ]
 @contextlib.contextmanager
 def extract(ui, fileobj):
-'''extract patch from data read from fileobj.
+"""extract patch from data read from fileobj.
 patch can be a normal patch or contained in an email message.
 return a dictionary. Standard keys are:
 - filename,
 - branch,
 - node,
 - p1,
 - p2.
 Any item can be missing from the dictionary. If filename is missing,
-fileobj did not contain a patch. Caller must unlink filename when done.'''
+fileobj did not contain a patch. Caller must unlink filename when done."""
 fd, tmpname = pycompat.mkstemp(prefix=b'hg-patch-')
 tmpfp = os.fdopen(fd, 'wb')
 try:
 yield _extract(ui, fileobj, tmpname, tmpfp)
 self.write_rej()
 return len(self.rej)
 class header(object):
-"""patch header
+"""patch header"""
-"""
 diffgit_re = re.compile(b'diff --git a/(.*) b/(.*)$')
 diff_re = re.compile(b'diff -r .* (.*)$')
 allhunks_re = re.compile(b'(?:index|deleted file) ')
 pretty_re = re.compile(b'(?:new file|deleted file) ')
 del fp
 return p.finished()
 def pathtransform(path, strip, prefix):
-'''turn a path from a patch into a path suitable for the repository
+"""turn a path from a patch into a path suitable for the repository
 prefix, if not empty, is expected to be normalized with a / at the end.
 Returns (stripped components, path in repository).
 >>> pathtransform(b'   a//b/c   ', 2, b'd/e/')
 ('a//b/', 'd/e/c')
 >>> pathtransform(b'a/b/c', 3, b'')
 Traceback (most recent call last):
 PatchError: unable to strip away 1 of 3 dirs from a/b/c
-'''
+"""
 pathlen = len(path)
 i = 0
 if strip == 0:
 return b'', prefix + path.rstrip()
 count = strip
 pathfn=None,
 copy=None,
 copysourcematch=None,
 hunksfilterfn=None,
 ):
-'''yields diff of changes to files between two nodes, or node and
+"""yields diff of changes to files between two nodes, or node and
 working directory.
 if node1 is None, use first dirstate parent instead.
 if node2 is None, compare node1 with working directory.
 if copysourcematch is not None, then copy sources will be filtered by this
 matcher
 hunksfilterfn, if not None, should be a function taking a filectx and
 hunks generator that may yield filtered hunks.
-'''
+"""
 if not node1 and not node2:
 node1 = repo.dirstate.p1()
 ctx1 = repo[node1]
 ctx2 = repo[node2]
 '''like diff(), but yields 2-tuples of (output, label) for ui.write()'''
 return difflabel(diff, *args, **kw)
 def _filepairs(modified, added, removed, copy, opts):
-'''generates tuples (f1, f2, copyop), where f1 is the name of the file
+"""generates tuples (f1, f2, copyop), where f1 is the name of the file
 before and f2 is the the name after. For added files, f1 will be None,
 and for removed files, f2 will be None. copyop may be set to None, 'copy'
-or 'rename' (the latter two only if opts.git is set).'''
+or 'rename' (the latter two only if opts.git is set)."""
 gone = set()
 copyto = {v: k for k, v in copy.items()}
 addedset, removedset = set(added), set(removed)
 getfilectx,
 opts,
 losedatafn,
 pathfn,
 ):
-'''given input data, generate a diff and yield it in blocks
+"""given input data, generate a diff and yield it in blocks
 If generating a diff would lose data like flags or binary data and
 losedatafn is not None, it will be called.
 pathfn is applied to every path in the diff output.
-'''
+"""
 if opts.noprefix:
 aprefix = bprefix = b''
 else:
 aprefix = b'a/'
 data2 = (ctx2, fctx2, path2, flag2, content2, date2)
 yield diffcontent(data1, data2, header, binary, opts)
 def diffcontent(data1, data2, header, binary, opts):
-""" diffs two versions of a file.
+"""diffs two versions of a file.
 data1 and data2 are tuples containg:
 * ctx: changeset for the file
 * fctx: file context for that file
 return b''.join(output)
 def diffstatui(*args, **kw):
-'''like diffstat(), but yields 2-tuples of (output, label) for
+"""like diffstat(), but yields 2-tuples of (output, label) for
 ui.write()
-'''
+"""
 for line in diffstat(*args, **kw).splitlines():
 if line and line[-1] in b'+-':
 name, graph = line.rsplit(b' ', 1)
 yield (name + b' ', b'')

changeset 45942	89a2afe31e82
parent 45877	ac362d5a7893
child 46030	2cf61e66c6d0