Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 11645:88b89ace643b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix extract() docstring, it returns branch as well
author Dan Drake <drake@kaist.edu>
date Thu, 22 Jul 2010 14:30:27 +0900
parents 4f5a6df2af92
children 75de514a50f3 a4fbbe0fbc38
comparison
equal deleted inserted replaced
11643:50fede14fe4d 11645:88b89ace643b
172 def extract(ui, fileobj): 172 def extract(ui, fileobj):
173 '''extract patch from data read from fileobj. 173 '''extract patch from data read from fileobj.
174 174
175 patch can be a normal patch or contained in an email message. 175 patch can be a normal patch or contained in an email message.
176 176
177 return tuple (filename, message, user, date, node, p1, p2). 177 return tuple (filename, message, user, date, branch, node, p1, p2).
178 Any item in the returned tuple can be None. If filename is None, 178 Any item in the returned tuple can be None. If filename is None,
179 fileobj did not contain a patch. Caller must unlink filename when done.''' 179 fileobj did not contain a patch. Caller must unlink filename when done.'''
180 180
181 # attempt to detect the start of a patch 181 # attempt to detect the start of a patch
182 # (this heuristic is borrowed from quilt) 182 # (this heuristic is borrowed from quilt)