rpms/hgsvn/devel hgsvn-no-mercurial.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hgsvn.spec, 1.6, 1.7 sources, 1.3, 1.4

[terjeros]

Author: terjeros

Update of /cvs/extras/rpms/hgsvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29425

Modified Files:
	.cvsignore hgsvn.spec sources 
Added Files:
	hgsvn-no-mercurial.patch 
Log Message:
* Sun Nov 01 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.1.7-1
- Update to 0.1.7
- Fix license issue (bz #531456)
 
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


hgsvn-no-mercurial.patch:
 common.py |   15 ++-------------
 ui.py     |   40 ++++++++++++++++++----------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hgsvn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 18:30:41 -0000	1.3
+++ .cvsignore	1 Nov 2009 13:32:08 -0000	1.4
@@ -1 +1 @@
-hgsvn-0.1.6.tar.gz
+hgsvn-0.1.7.tar.gz


Index: hgsvn.spec
===================================================================
RCS file: /cvs/extras/rpms/hgsvn/devel/hgsvn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hgsvn.spec	25 Jul 2009 02:09:25 -0000	1.6
+++ hgsvn.spec	1 Nov 2009 13:32:09 -0000	1.7
@@ -3,22 +3,19 @@
 
 Summary:       A set of scripts to work locally on subversion checkouts using mercurial
 Name:          hgsvn
-Version:       0.1.6
-Release:       4%{?dist}
+Version:       0.1.7
+Release:       1%{?dist}
 License:       GPLv3+
 Group:         Development/Tools
 URL  :         http://pypi.python.org/pypi/%{name}/
 Source0:       http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz
+Patch0:        hgsvn-no-mercurial.patch
 BuildArch:     noarch
 Requires:      mercurial subversion python-setuptools
 BuildRequires: python-devel
 # Needed in %%check 
 BuildRequires: mercurial python-nose subversion
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -32,6 +29,7 @@ fast local operations like hg log and hg
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
@@ -43,18 +41,23 @@ CFLAGS="%{optflags}" %{__python} setup.p
 %clean
 %{__rm} -rf %{buildroot}
 
-#check
-#{__python} setup.py test
+%check
+%{__python} setup.py test
 
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS.txt COPYING.txt README.txt TODO.txt
 %{_bindir}/hgimportsvn
 %{_bindir}/hgpullsvn
+%{_bindir}/hgpushsvn
 %{python_sitelib}/%{name}
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Sun Nov 01 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.1.7-1
+- Update to 0.1.7
+- Fix license issue (bz #531456)
+ 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hgsvn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Aug 2008 18:30:41 -0000	1.3
+++ sources	1 Nov 2009 13:32:09 -0000	1.4
@@ -1 +1 @@
-717f21210fb84e7538d76a95a582a647  hgsvn-0.1.6.tar.gz
+aaa4ef4124ac388832cddc85c1866236  hgsvn-0.1.7.tar.gz