josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: josh:master
Branches Tags
josh:master
josh:v1.7
josh:v1.6
josh:v1.5
josh:v1.4
josh:v1.3
josh:v1.2
josh:v1.1
josh:v1.0
..
compare: josh:v1.6
Branches Tags
josh:master
josh:v1.7
josh:v1.6
josh:v1.5
josh:v1.4
josh:v1.3
josh:v1.2
josh:v1.1
josh:v1.0

No commits in common. "master" and "v1.6" have entirely different histories.
master ... v1.6

2 changed files with 18 additions and 155 deletions
Show Stats Expand all files Collapse all files

22
README
View File

@ -35,23 +35,6 @@ 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:
-x, --ignore-ignores
- remove/list unversioned items that are ignored by Subversion
-n, --dry-run
- perform a dry-run, i.e. list files that would be removed but do not
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'
@ -172,8 +155,6 @@ 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.
@ -191,9 +172,6 @@ Configuration Examples:
Author: Josh Holtrop
History:
v1.7 - 2013-08-16
- add "clean" subcommand handler
- bugfix: revert subcommand handler: revert deleted items
v1.6 - 2013-07-24
- rework 'stash' subcommand to operate on individual hunks
- add 'revert' subcommand handler

137
jsvn
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python
# Josh's SVN wrapper script
#
@ -17,10 +17,8 @@ import getopt
import signal
import platform
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 #
@ -69,7 +67,6 @@ def get_config(svn):
'pager': '',
'use_pager': True,
'use_color': True,
'ignore_symlinks': False,
'aliases': {
# default jsvn aliases
'tags': 'tag',
@ -96,7 +93,7 @@ class LogEntry(object):
self.revision = 0
self.user = ''
self.date = ''
self.lines_text = ''
self.lines = ''
self.message_lines = 0
self.changed_paths = []
self.message = []
@ -403,7 +400,7 @@ def filter_update(pout, out):
continue
if re.match(r'\s*$', line):
continue
if re.match(r'(External at|Updated external to) revision ', line):
if re.match(r'External at revision ', line):
if external_printed:
out.write(line)
continue
@ -412,9 +409,6 @@ 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:
@ -463,13 +457,12 @@ def filter_status(line, out):
ansi_reset(out)
out.write('\n')
def get_unknowns(svn, config):
def get_unknowns(svn):
unknowns = []
pout = Popen([svn, 'status'], stdout=PIPE).stdout
for line in iter(pout.readline, ''):
m = re.match(r'\? (.*)$', line)
if m is not None:
if not (config['ignore_symlinks'] and os.path.islink(m.group(1))):
unknowns.append(m.group(1))
return unknowns
@ -578,15 +571,6 @@ 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 #
###########################################################################
@ -604,7 +588,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, config)
unknowns = get_unknowns(svn)
for path in argv:
if path == '.':
path = os.getcwd()
@ -1153,9 +1137,6 @@ 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)
@ -1196,15 +1177,12 @@ def status_h(argv, svn, out, config):
continue
# look for lines that should be ignored
m = re.match(STATUS_LINE_REGEX, line)
if m is not None:
if re.match(STATUS_LINE_REGEX, line):
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:
@ -1253,28 +1231,21 @@ def revert_h(argv, svn, out, config):
if target.endswith('/'):
argv[i] = target[:-1]
p = Popen([svn, 'status'], stdout=PIPE)
modified_files = []
status_lines = []
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', 'C', 'D', '!') or prop_action == 'M':
if action in ('A', 'M', 'D') or prop_action == 'M':
fname = m.group(1)
if action in ('D', '!'):
modified_files.append((action, fname))
else:
modified_files.insert(0, (action, fname))
for action, fname in modified_files:
for target in argv:
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()
Popen([svn, 'revert', fname]).wait()
did_something = True
break
return RET_OK if did_something else RET_REEXEC
@ -1660,89 +1631,6 @@ 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',
['force', 'dry-run', 'ignore-ignores'])
force = False
dry_run = False
ignore_ignores = False
for opt, arg in opts:
if opt in ('-f', '--force'):
force = True
elif opt in ('-n', '--dry-run'):
dry_run = True
elif opt in ('-x', '--ignore-ignores'):
ignore_ignores = True
if not force and not dry_run:
sys.stderr.write('Error: specify either -n or -f\n')
return RET_ERR
if force and dry_run:
sys.stderr.write('Error: specify only one of -n or -f\n')
return RET_ERR
status_args = args
if ignore_ignores:
status_args.append('--no-ignore')
clean_paths = []
pout = Popen([svn, 'status'] + status_args, stdout=PIPE).stdout
for line in iter(pout.readline, ''):
m = re.match(STATUS_LINE_REGEX, line)
if m is not None:
action = line[0]
if action in ('?', 'I'):
clean_paths.append(m.group(1))
for cp in clean_paths:
if dry_run:
out.write("Would remove %s\n" % cp)
if force:
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 #
###########################################################################
@ -1839,9 +1727,6 @@ 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,