Browse Source

Add CHANGES for history track and better versioning

Matthew Wang 11 years ago
parent
commit
5d708554ce
4 changed files with 38 additions and 9 deletions
  1. 12
    0
      CHANGES
  2. 1
    0
      MANIFEST.in
  3. 13
    3
      README.rst
  4. 12
    6
      setup.py

+ 12
- 0
CHANGES View File

@@ -0,0 +1,12 @@
1
+
2
+Change log
3
+==========
4
+
5
+Version 0.0.4 (2013-02-04)
6
+
7
+  - Add CHANGES for history track and better versioning
8
+
9
+Version 0.0.3 (2013-02-04)
10
+  
11
+  - Publish on PyPI, supports read patch from file, pipe and diff output from
12
+    revision tools (thanks to `Steven Myint <https://github.com/myint>`_)

+ 1
- 0
MANIFEST.in View File

@@ -1,3 +1,4 @@
1
+include CHANGES
1 2
 include LICENSE
2 3
 include Makefile
3 4
 include README.rst

+ 13
- 3
README.rst View File

@@ -1,8 +1,8 @@
1 1
 Cdiff
2 2
 =====
3 3
 
4
-View **colored**, **incremental** diff in unified format or **side by side**
5
-with **auto pager**.  Requires python (>= 2.5.0) and ``less``.
4
+Term based tool to view **colored**, **incremental** diff in unified format or
5
+**side by side** with **auto pager**.  Requires python (>= 2.5.0) and ``less``.
6 6
 
7 7
 .. image:: http://ymattw.github.com/cdiff/img/default.png
8 8
    :alt: default
@@ -97,5 +97,15 @@ Redirect output to another patch file is safe:
97 97
 Known issue
98 98
 -----------
99 99
 
100
-- Only support unified format for input diff
100
+- Only support unified diff for input format
101 101
 - Side by side mode has alignment problem for wide chars
102
+
103
+See also
104
+--------
105
+
106
+I have another tool `coderev <https://github.com/ymattw/coderev>`_ which
107
+generates side-by-side diff pages for code review from two given files or
108
+directories, I found it's not easy to extend to support git so invented
109
+`cdiff`.  Idea of ansi color markup is also from project `colordiff
110
+<https://github.com/daveewart/colordiff>`_.
111
+

+ 12
- 6
setup.py View File

@@ -10,22 +10,28 @@ if os.path.exists(link_name):
10 10
     os.unlink(link_name)
11 11
 os.symlink('src/cdiff.py', link_name)
12 12
 
13
-with open('README.rst') as doc:
14
-    long_description = doc.read()
13
+with open('CHANGES') as changes:
14
+    for change in changes:
15
+        if change.startswith('Version '):
16
+            version = change.split()[1]
17
+            break
18
+    changes.seek(0)
19
+    with open('README.rst') as doc:
20
+        long_description = doc.read() + changes.read()
15 21
 
16 22
 setup(
17 23
     name = 'cdiff',
18
-    version = '0.0.3',
24
+    version = version,
19 25
     author = 'Matthew Wang',
20 26
     author_email = 'mattwyl@gmail.com',
21 27
     license = 'BSD-3',
22
-    description = ('View colored, incremental diff in unified format or side '
23
-                   'by side with auto pager'),
28
+    description = ('Term based tool to view colored, incremental diff in '
29
+                   'unified format or side ' 'by side with auto pager'),
24 30
     long_description = long_description,
25 31
     keywords = 'colored incremental side-by-side diff',
26 32
     url = 'https://github.com/ymattw/cdiff',
27 33
     classifiers = [
28
-        'Development Status :: 3 - Alpha',
34
+        'Development Status :: 4 - Beta',
29 35
         'Topic :: Utilities',
30 36
         'License :: OSI Approved :: BSD License',
31 37
         'Environment :: Console',