Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 9036:32e678f9045f
split local and stdlib module imports (eases migration issues)
author | Alejandro Santos <alejolp@alejolp.com> |
---|---|
date | Sun, 05 Jul 2009 11:06:09 +0200 |
parents | 8e34f363dd77 |
children | f8e25885d975 |
comparison
equal
deleted
inserted
replaced
9035:8e34f363dd77 | 9036:32e678f9045f |
---|---|
6 # GNU General Public License version 2, incorporated herein by reference. | 6 # GNU General Public License version 2, incorporated herein by reference. |
7 | 7 |
8 from node import hex, nullid, nullrev, short | 8 from node import hex, nullid, nullrev, short |
9 from lock import release | 9 from lock import release |
10 from i18n import _, gettext | 10 from i18n import _, gettext |
11 import os, re, sys, subprocess, difflib, time | 11 import os, re, sys, subprocess, difflib, time, tempfile |
12 import hg, util, revlog, bundlerepo, extensions, copies, context, error | 12 import hg, util, revlog, bundlerepo, extensions, copies, context, error |
13 import patch, help, mdiff, tempfile, url, encoding | 13 import patch, help, mdiff, url, encoding |
14 import archival, changegroup, cmdutil, sshserver, hbisect | 14 import archival, changegroup, cmdutil, sshserver, hbisect |
15 from hgweb import server | 15 from hgweb import server |
16 import merge as merge_ | 16 import merge as merge_ |
17 | 17 |
18 # Commands start here, listed alphabetically | 18 # Commands start here, listed alphabetically |