run under python2 for now

README

@@ -35,6 +35,10 @@ Implemented subcommands:
       or a tag or branch name)
     - if <source> is not given the HEAD of the current working-copy URL is used.
     - also switch to the new branch if -s is given
+ checkout [options] [url] [wc_path]
+  - if a URL is given that ends with /trunk and no working copy path is given,
+    then the last directory component before "/trunk" is used as the working
+    copy path
  clean [-x] {-n|-f} [path...]
   - remove (or list) unversioned items
   options:
@@ -45,6 +49,9 @@ Implemented subcommands:
         actually remove them
     -f, --force
       - perform the actual removal of unversioned files
+ commit
+  - removes trailing whitespace (including end-of-line characters) from commit
+    messages before committing if neither -m nor -F arguments are given
  diff
   - allow specifying ref1..ref2 syntax to show the diff between two references
     - references can be tag names, branch names, or 'trunk'
@@ -165,6 +172,8 @@ Available configuration variables:
              for newly added files which should not automatically have the
              svn:executable property added for them even if the files are
              executable. The default value is ['.c', '.cc', '.h', '.txt'].
+  ignore_symlinks: True or False to hide unversioned symlinks from appearing
+             in status output (default: False)
   stash_externals: True or False to enable/disable whether '-e' is implicitly
              on for 'stash' subcommand. Defaults to False.
 

jsvn

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Josh's SVN wrapper script
 #
@@ -20,6 +20,7 @@ import tempfile
 import shutil
 
 STATUS_LINE_REGEX = r'[ACDIMRX?!~ ][CM ][L ][+ ][SX ][KOTB ]..(.+)'
+COMMIT_IGNORE_LINE = "--This line, and those below, will be ignored--"
 
 ###########################################################################
 # Subcommand Handler Return Values                                        #
@@ -68,6 +69,7 @@ def get_config(svn):
             'pager': '',
             'use_pager': True,
             'use_color': True,
+            'ignore_symlinks': False,
             'aliases': {
                 # default jsvn aliases
                 'tags': 'tag',
@@ -94,7 +96,7 @@ class LogEntry(object):
         self.revision = 0
         self.user = ''
         self.date = ''
-        self.lines = ''
+        self.lines_text = ''
         self.message_lines = 0
         self.changed_paths = []
         self.message = []
@@ -401,7 +403,7 @@ def filter_update(pout, out):
             continue
         if re.match(r'\s*$', line):
             continue
-        if re.match(r'External at revision ', line):
+        if re.match(r'(External at|Updated external to) revision ', line):
             if external_printed:
                 out.write(line)
             continue
@@ -410,6 +412,9 @@ def filter_update(pout, out):
                 out.write('\n')
             out.write(line)
             continue
+        if re.match(r'^Removed external ', line):
+            out.write(line)
+            continue
 
         # anything not matched yet will cause an external to be shown
         if not external_printed:
@@ -458,13 +463,14 @@ def filter_status(line, out):
     ansi_reset(out)
     out.write('\n')
 
-def get_unknowns(svn):
+def get_unknowns(svn, config):
     unknowns = []
     pout = Popen([svn, 'status'], stdout=PIPE).stdout
     for line in iter(pout.readline, ''):
         m = re.match(r'\?       (.*)$', line)
         if m is not None:
-            unknowns.append(m.group(1))
+            if not (config['ignore_symlinks'] and os.path.islink(m.group(1))):
+                unknowns.append(m.group(1))
     return unknowns
 
 def descendant_path(child, parent):
@@ -572,6 +578,15 @@ def relpath(path):
         return path[len(cwdprefix):]
     return path
 
+def get_editor():
+    if 'EDITOR' in os.environ and os.environ['EDITOR'] != '':
+        return os.environ['EDITOR']
+    for p_ent in os.environ['PATH'].split(':'):
+        editor_path = os.path.join(p_ent, 'editor')
+        if os.path.isfile(editor_path):
+            return editor_path
+    return 'vim'
+
 ###########################################################################
 # Subcommand Handlers                                                     #
 ###########################################################################
@@ -589,7 +604,7 @@ def add_h(argv, svn, out, config):
     # for each target specified, check if there are unversioned items
     # underneath it (for directories) and add them as well
     # if none are found, fall back to the native svn add
-    unknowns = get_unknowns(svn)
+    unknowns = get_unknowns(svn, config)
     for path in argv:
         if path == '.':
             path = os.getcwd()
@@ -1138,6 +1153,9 @@ def log_h(argv, svn, out, config):
                 if match != target:
                     return False
         return True
+    if pretty not in ("default", "oneline"):
+        sys.stderr.write("Error: unknown --pretty option: '%s'\n" % pretty)
+        return RET_ERR
     pout = Popen([svn] + argv, stdout=PIPE).stdout
     while True:
         le = LogEntry(pout)
@@ -1178,12 +1196,15 @@ def status_h(argv, svn, out, config):
             continue
 
         # look for lines that should be ignored
-        if re.match(STATUS_LINE_REGEX, line):
+        m = re.match(STATUS_LINE_REGEX, line)
+        if m is not None:
             action = line[0]
             if action == 'X':
                 continue            # don't print directory externals
             elif line.startswith('    X  '):
                 continue            # don't print unmodified file externals
+            elif action == '?' and config['ignore_symlinks'] and os.path.islink(m.group(1)):
+                    continue
 
         # anything not matched yet will cause an external to be shown
         if not external_printed:
@@ -1232,23 +1253,30 @@ def revert_h(argv, svn, out, config):
         if target.endswith('/'):
             argv[i] = target[:-1]
     p = Popen([svn, 'status'], stdout=PIPE)
-    status_lines = []
+    modified_files = []
     for line in iter(p.stdout.readline, ''):
-        status_lines.append(line)
-    for line in reversed(status_lines):
         m = re.match(STATUS_LINE_REGEX, line)
         if m is not None:
             action = line[0]
             prop_action = line[1]
-            if action in ('A', 'M', 'D', '!') or prop_action == 'M':
+            if action in ('A', 'M', 'C', 'D', '!') or prop_action == 'M':
                 fname = m.group(1)
-                for target in argv:
+                if action in ('D', '!'):
-                    if fname.startswith(os.getcwd() + os.sep):
+                    modified_files.append((action, fname))
-                        fname = fname[len(os.getcwd() + os.sep):]
+                else:
-                    if target == '.' or target == fname or fname.startswith(target + os.sep):
+                    modified_files.insert(0, (action, fname))
-                        Popen([svn, 'revert', fname]).wait()
+    for action, fname in modified_files:
-                        did_something = True
+        for target in argv:
-                        break
+            if fname.startswith(os.getcwd() + os.sep):
+                fname = fname[len(os.getcwd() + os.sep):]
+            if target == '.' or target == fname or fname.startswith(target + os.sep):
+                cmd = [svn, "revert"]
+                if action == 'A':
+                    cmd += ["--depth", "infinity"]
+                cmd.append(fname)
+                Popen(cmd).wait()
+                did_something = True
+                break
     return RET_OK if did_something else RET_REEXEC
 
 def get_svn_contents_to_stash(targets, svn, out, keep, patch, externals):
@@ -1632,6 +1660,13 @@ def url_h(argv, svn, out, config):
     out.write(get_svn_url(svn, path) + '\n')
     return RET_OK
 
+def checkout_h(argv, svn, out, config):
+    co_url = argv[-1].rstrip('/')
+    if re.search(r'://.*/trunk$', co_url):
+        argv += [co_url.split("/")[-2]]
+    Popen([svn] + argv, stdout=out).wait()
+    return RET_OK
+
 def clean_h(argv, svn, out, config):
     argv = argv[1:] # strip command
     opts, args = getopt.getopt(argv, 'fnx',
@@ -1667,12 +1702,47 @@ def clean_h(argv, svn, out, config):
         if dry_run:
             out.write("Would remove %s\n" % cp)
         if force:
-            if os.path.isdir(cp):
+            if os.path.islink(cp):
+                os.unlink(cp)
+            elif os.path.isdir(cp):
                 shutil.rmtree(cp)
             elif os.path.isfile(cp):
                 os.unlink(cp)
     return RET_OK
 
+def commit_h(argv, svn, out, config):
+    argv = argv[1:] # strip command
+    for arg in argv:
+        if re.search(r'^-[Fm]', arg):
+            # Do not handle the commit if the user supplied a -m or -F.
+            return RET_REEXEC
+    commit_file_fd, commit_file_fname = tempfile.mkstemp('.tmp', 'svn-commit')
+    os.close(commit_file_fd)
+    commit_file_fh = open(commit_file_fname, 'w')
+    commit_file_fh.write("\n%s\n\n" % COMMIT_IGNORE_LINE)
+    pout = Popen([svn, 'status'], stdout=PIPE).stdout
+    commit_file_fh.write(pout.read())
+    commit_file_fh.close()
+    Popen([get_editor(), commit_file_fname]).wait()
+    commit_file_fh = open(commit_file_fname, 'r')
+    commit_file_contents = commit_file_fh.read()
+    commit_file_fh.close()
+    commit_message = ""
+    for line in commit_file_contents.splitlines():
+        if line == COMMIT_IGNORE_LINE:
+            break
+        commit_message += line + "\n"
+    commit_message = commit_message.rstrip()
+    if commit_message == "":
+        out.write("Aborting commit due to empty commit message.\n")
+    else:
+        commit_file_fh = open(commit_file_fname, 'w')
+        commit_file_fh.write(commit_message)
+        commit_file_fh.close()
+        Popen([svn, 'commit'] + argv + ['-F', commit_file_fname]).wait()
+    os.unlink(commit_file_fname)
+    return RET_OK
+
 ###########################################################################
 # Main                                                                    #
 ###########################################################################
@@ -1769,7 +1839,9 @@ def do_cmd(argv, realsvn, config, expand=True):
             'add': add_h,
             'bisect': bisect_h,
             'branch': branch_h,
+            'checkout': checkout_h,
             'clean': clean_h,
+            'commit': commit_h,
             'externals': externals_h,
             'switch': switch_h,
             'merge': merge_h,