comparison mercurial/util.py @ 5921:549a7ebe1607

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 22 Jan 2008 00:55:01 +0100
parents 7c2921a60035 a8dbfa1802cd
children 48d01b1e315f
comparison
equal deleted inserted replaced
5915:d0576d065993 5921:549a7ebe1607
13 """ 13 """
14 14
15 from i18n import _ 15 from i18n import _
16 import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile, strutil 16 import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile, strutil
17 import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil 17 import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil
18 import re, urlparse 18 import urlparse
19 19
20 try: 20 try:
21 set = set 21 set = set
22 frozenset = frozenset 22 frozenset = frozenset
23 except NameError: 23 except NameError: