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, tempfile |
11 import os, re, sys, difflib, time, tempfile |
12 import hg, util, revlog, bundlerepo, extensions, copies, context, error |
12 import hg, util, revlog, bundlerepo, extensions, copies, error |
13 import patch, help, mdiff, 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 import minirst |
17 import minirst |