Preparing further issues

CONTRIBUTING.md

@@ -1,4 +1,8 @@
 # Development and Contribution #
 
-You are very welcome to contribute, fix bugs, and augment SOS by missing features! Please ask for assignment of an issue and send in your pull requests against `master`. This project uses trunk-based development for the same reason SOS was originally developed - it's much more natural than feature- and release-branching and simply does what most developers want - regularly saves current development state to the VCS.
-Note that SOS is currently developed using a private SVN repository which gets mirrored from time to time to Github.
+- You are very welcome to contribute, fix bugs, and augment SOS by missing features!
+
+    - Please ask for assignment of an issue
+    - Send in your pull requests from any of your local branches (or your `master`) against `master`
+- This project uses simplistic trunk-based development for the same reason SOS was originally developed - it's much more natural to the (lone) developer than feature- and release-branching and simply does what most developers want - to regularly save the current development state to the VCS
+- Note that SOS is currently developed using a private SVN repository which gets mirrored from time to time to Github.

README.md

@@ -2,23 +2,22 @@
 
 [![Travis badge](https://travis-ci.org/ArneBachmann/sos.svg?branch=master)](https://travis-ci.org/ArneBachmann/sos)
 [![Build status](https://ci.appveyor.com/api/projects/status/fe915rtx02buqe4r?svg=true)](https://ci.appveyor.com/project/ArneBachmann/sos)
-[![PyPI badge](https://img.shields.io/pypi/v/sos-vcs.svg)](https://badge.fury.io/py/sos-vcs)
 [![Code coverage badge](https://coveralls.io/repos/github/ArneBachmann/sos/badge.svg?branch=master)](https://coveralls.io/github/ArneBachmann/sos?branch=master)
+[![PyPI badge](https://img.shields.io/pypi/v/sos-vcs.svg)](https://badge.fury.io/py/sos-vcs)
 
 - License: [MPL-2.0](https://www.mozilla.org/en-US/MPL/2.0/)
-- [Documentation](https://arnebachmann.github.io/sos/)
-- If you enjoy using SOS, [buy the developer a coffee](http://PayPal.Me/ArneBachmann/) for motivation!
+- [Documentation](http://sos-vcs.net) [Code Repository](https://github.com/ArneBachmann/sos)
+- [Buy a coffee](http://PayPal.Me/ArneBachmann/) for the developer to show your appreciation!
 
-### List of Abbreviations ###
+### List of Abbreviations and Definitions ###
 - **MPL**: [*Mozilla Public License*](https://www.mozilla.org/en-US/MPL/)
 - **PyPI**: [*Python Package Index*](https://pypi.python.org/pypi)
 - **SCM**: *Source Control Management*
 - **SOS**: *Subversion Offline Solution*
 - **SVN**: [Apache Subversion](http://subversion.apache.org/)
 - **VCS**: *Version Control System*
 
-### List of Definitions ###
-- **Filename**: Fixed term for file names
+- **Filename**: Fixed term for file names used throughout SOS and this documentation
 - **File pattern**: A filename or [glob](https://en.wikipedia.org/wiki/Glob_%28programming%29)
 
 

setup.py

@@ -5,7 +5,7 @@
 import os, shutil, subprocess, sys, time, unittest
 from setuptools import setup, find_packages
 
-RELEASE = "1.0.12"
+RELEASE = "1.0.13"
 
 print("sys.argv is %r" % sys.argv)
 readmeFile = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'README.md')

sos/sos.coco

@@ -63,7 +63,7 @@ Usage: {cmd} <command> [<argument>] [<option1>, ...]        When operating in of
 
     commit  [<message>] [--tag]                           Create a new revision from current state file tree, with an optional commit message
     changes [<branch>][/<revision>]                       List changed paths vs. last or specified revision
-    diff    [<branch>][/<revision>]                       List changes vs. last or specified revision
+    diff    [<branch>][/<revision>] [--from=branch/rev.]  List changes in file tree (or `--from` specified revision) vs. last (or specified) revision
     add     [<file pattern>]                              Add a tracking pattern to current branch (file pattern)
     mv      [<oldpattern>] [<newPattern>]                 Rename, move, or move and rename tracked files according to tracked file patterns
       --soft                                              Don't move or rename files, only the tracking pattern
@@ -488,7 +488,8 @@ def diff(argument:str = "", options:str[] = [], onlys:FrozenSet[str]? = None, ex
   m:Metadata = Metadata(os.getcwd()); branch:int?; revision:int?
   m.loadBranches()  # knows current branch
   strict:bool = '--strict' in options or m.strict
-  branch, revision = m.parseRevisionString(argument)
+  _from:str? = {None: option.split("--from=")[1] for option in options if options.startswith("--from=")}.get(None, None)
+  branch, revision = m.parseRevisionString(argument)  # if nothing given, use last commit
   if branch not in m.branches: Exit("Unknown branch")
   m.loadBranch(branch)  # knows commits
   revision = revision if revision >= 0 else len(m.commits) + revision  # negative indexing