Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 10264:d6512b3e9ac0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Jan 2010 22:45:09 -0600 |
parents | fe699ca08a45 25e572394f5c |
children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
10260:fe699ca08a45 | 10264:d6512b3e9ac0 |
---|---|
1 # cmdutil.py - help for command processing in mercurial | 1 # cmdutil.py - help for command processing in mercurial |
2 # | 2 # |
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
4 # | 4 # |
5 # This software may be used and distributed according to the terms of the | 5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2, incorporated herein by reference. | 6 # GNU General Public License version 2 or any later version. |
7 | 7 |
8 from node import hex, nullid, nullrev, short | 8 from node import hex, nullid, nullrev, short |
9 from i18n import _ | 9 from i18n import _ |
10 import os, sys, errno, re, glob, tempfile, time | 10 import os, sys, errno, re, glob, tempfile, time |
11 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw | 11 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw |