Mercurial > hg

comparison mercurial/patch.py @ 10264:d6512b3e9ac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents 3ca8f2ae5fee 25e572394f5c
children 08a0f04b56bd
comparison
equal deleted inserted replaced
10260:fe699ca08a45 10264:d6512b3e9ac0
2 # 2 #
3 # Copyright 2006 Brendan Cully <brendan@kublai.com> 3 # Copyright 2006 Brendan Cully <brendan@kublai.com>
4 # Copyright 2007 Chris Mason <chris.mason@oracle.com> 4 # Copyright 2007 Chris Mason <chris.mason@oracle.com>
5 # 5 #
6 # This software may be used and distributed according to the terms of the 6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2, incorporated herein by reference. 7 # GNU General Public License version 2 or any later version.
8 8
9 from i18n import _ 9 from i18n import _
10 from node import hex, nullid, short 10 from node import hex, nullid, short
11 import base85, cmdutil, mdiff, util, diffhelpers, copies 11 import base85, cmdutil, mdiff, util, diffhelpers, copies
12 import cStringIO, email.Parser, os, re 12 import cStringIO, email.Parser, os, re