|
 |
c5d5c31 |
diff -r 31723fc15e14 hgsvn/common.py
|
|
|
c5d5c31 |
--- a/hgsvn/common.py Mon Oct 19 07:31:27 2009 +0200
|
|
|
c5d5c31 |
+++ b/hgsvn/common.py Sun Nov 01 13:58:15 2009 +0100
|
|
|
c5d5c31 |
@@ -37,19 +37,8 @@
|
|
|
c5d5c31 |
pass
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
-# We import the lock logic from Mercurial if it is available, and fall back
|
|
|
c5d5c31 |
-# to a dummy (always successful) lock if not.
|
|
|
c5d5c31 |
-try:
|
|
|
c5d5c31 |
- from mercurial.lock import lock as _lock
|
|
|
c5d5c31 |
- try:
|
|
|
c5d5c31 |
- from mercurial.error import LockHeld
|
|
|
c5d5c31 |
- except ImportError:
|
|
|
c5d5c31 |
- # LockHeld was defined in mercurial.lock in Mercurial < 1.2
|
|
|
c5d5c31 |
- from mercurial.lock import LockHeld
|
|
|
c5d5c31 |
-
|
|
|
c5d5c31 |
-except ImportError:
|
|
|
c5d5c31 |
- _lock = _SimpleFileLock
|
|
|
c5d5c31 |
- LockHeld = _LockHeld
|
|
|
c5d5c31 |
+_lock = _SimpleFileLock
|
|
|
c5d5c31 |
+LockHeld = _LockHeld
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
hgsvn_private_dir = ".hgsvn"
|
|
|
c5d5c31 |
diff -r 31723fc15e14 hgsvn/ui.py
|
|
|
c5d5c31 |
--- a/hgsvn/ui.py Mon Oct 19 07:31:27 2009 +0200
|
|
|
c5d5c31 |
+++ b/hgsvn/ui.py Sun Nov 01 13:58:15 2009 +0100
|
|
|
c5d5c31 |
@@ -5,31 +5,27 @@
|
|
|
c5d5c31 |
import os
|
|
|
c5d5c31 |
import sys
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
-try:
|
|
|
c5d5c31 |
- # First try to import the Mercurial implementation.
|
|
|
c5d5c31 |
- from mercurial.util import termwidth
|
|
|
c5d5c31 |
-except ImportError:
|
|
|
c5d5c31 |
- # Fallback to local copy of Mercurial's implementation.
|
|
|
c5d5c31 |
- def termwidth():
|
|
|
c5d5c31 |
- if 'COLUMNS' in os.environ:
|
|
|
c5d5c31 |
+# Fallback to local copy of Mercurial's implementation.
|
|
|
c5d5c31 |
+def termwidth():
|
|
|
c5d5c31 |
+ if 'COLUMNS' in os.environ:
|
|
|
c5d5c31 |
+ try:
|
|
|
c5d5c31 |
+ return int(os.environ['COLUMNS'])
|
|
|
c5d5c31 |
+ except ValueError:
|
|
|
c5d5c31 |
+ pass
|
|
|
c5d5c31 |
+ try:
|
|
|
c5d5c31 |
+ import termios, array, fcntl
|
|
|
c5d5c31 |
+ for dev in (sys.stdout, sys.stdin):
|
|
|
c5d5c31 |
try:
|
|
|
c5d5c31 |
- return int(os.environ['COLUMNS'])
|
|
|
c5d5c31 |
+ fd = dev.fileno()
|
|
|
c5d5c31 |
+ if not os.isatty(fd):
|
|
|
c5d5c31 |
+ continue
|
|
|
c5d5c31 |
+ arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8)
|
|
|
c5d5c31 |
+ return array.array('h', arri)[1]
|
|
|
c5d5c31 |
except ValueError:
|
|
|
c5d5c31 |
pass
|
|
|
c5d5c31 |
- try:
|
|
|
c5d5c31 |
- import termios, array, fcntl
|
|
|
c5d5c31 |
- for dev in (sys.stdout, sys.stdin):
|
|
|
c5d5c31 |
- try:
|
|
|
c5d5c31 |
- fd = dev.fileno()
|
|
|
c5d5c31 |
- if not os.isatty(fd):
|
|
|
c5d5c31 |
- continue
|
|
|
c5d5c31 |
- arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8)
|
|
|
c5d5c31 |
- return array.array('h', arri)[1]
|
|
|
c5d5c31 |
- except ValueError:
|
|
|
c5d5c31 |
- pass
|
|
|
c5d5c31 |
- except ImportError:
|
|
|
c5d5c31 |
- pass
|
|
|
c5d5c31 |
- return 80
|
|
|
c5d5c31 |
+ except ImportError:
|
|
|
c5d5c31 |
+ pass
|
|
|
c5d5c31 |
+ return 80
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
|
|
|
c5d5c31 |
# Log levels
|