Mercurial > hg
comparison mercurial/commands.py @ 3897:7034020aeaf9
merge with main
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 15 Dec 2006 05:38:54 +0100 |
parents | 6b4127c7d52a |
children | 0d27502a804c |
comparison
equal
deleted
inserted
replaced
3896:3b628b5da9e9 | 3897:7034020aeaf9 |
---|---|
5 # This software may be used and distributed according to the terms | 5 # This software may be used and distributed according to the terms |
6 # of the GNU General Public License, incorporated herein by reference. | 6 # of the GNU General Public License, incorporated herein by reference. |
7 | 7 |
8 import demandimport; demandimport.enable() | 8 import demandimport; demandimport.enable() |
9 from node import * | 9 from node import * |
10 from i18n import gettext as _ | 10 from i18n import _ |
11 import bisect, os, re, sys, signal, imp, urllib, pdb, shlex, stat | 11 import bisect, os, re, sys, signal, imp, urllib, pdb, shlex, stat |
12 import fancyopts, ui, hg, util, lock, revlog, bundlerepo | 12 import fancyopts, ui, hg, util, lock, revlog, bundlerepo |
13 import difflib, patch, time, help, mdiff, tempfile | 13 import difflib, patch, time, help, mdiff, tempfile |
14 import traceback, errno, version, atexit | 14 import traceback, errno, version, atexit |
15 import archival, changegroup, cmdutil, hgweb.server, sshserver | 15 import archival, changegroup, cmdutil, hgweb.server, sshserver |