Skip to content
This repository has been archived by the owner on Dec 19, 2018. It is now read-only.

Use OS-independent path, enable use on MS-Windows #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use OS-independent path, enable use on MS-Windows #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67461a8
Use OS-independent path handling
martinmoene Jan 7, 2016
b385ed9
Adapt for single .svn folder in working copy (Subversion 1.7 and higher)
martinmoene Jan 7, 2016
86947f7
Use svn patch
martinmoene Jan 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions svn_stash_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

HOME_DIR = os.path.expanduser("~")
CURRENT_DIR = os.getcwd()
SVN_STASH_DIR= HOME_DIR + "/.svn-stash"
SVN_STASH_DIR= os.path.join(HOME_DIR, ".svn-stash")
COMMAND_DEFAULT="push"
TARGET_FILE_DEFAULT="all"
STASH_REGISTER_FILENAME = ".stashed_register"
Expand All @@ -34,7 +34,7 @@ def __init__(self):
def load(self):
try:
create_stash_dir_if_any()
current_dir = SVN_STASH_DIR + "/" + STASH_REGISTER_FILENAME
current_dir = os.path.join(SVN_STASH_DIR, STASH_REGISTER_FILENAME)
with open(current_dir,"r") as f:
for line in f:
content = line.rstrip()
Expand All @@ -52,7 +52,7 @@ def load(self):
def write(self):
try:
create_stash_dir_if_any()
current_dir = SVN_STASH_DIR + "/" + STASH_REGISTER_FILENAME
current_dir = os.path.join(SVN_STASH_DIR, STASH_REGISTER_FILENAME)
with open(current_dir,"w") as f:
content = []
for stash_id in self.all_stashes:
Expand Down Expand Up @@ -104,7 +104,7 @@ def push(self,target_file,filename_list):
else:
randkey = random.getrandbits(128) #unique identifier
self.files[target_file] = randkey
result = os.popen("svn diff " + target_file + " > " + SVN_STASH_DIR + "/" + str(randkey) + ".stash.patch").read()
result = os.popen("svn diff " + target_file + " > " + os.path.join(SVN_STASH_DIR, str(randkey) + ".stash.patch")).read()
result += os.popen("svn revert " + target_file).read()
#print "push " + target_file

Expand All @@ -113,16 +113,16 @@ def pop(self):
if os.path.exists(SVN_STASH_DIR):
for target_file in self.files:
randkey = self.files[target_file]
result = os.popen("patch -p0 < " + SVN_STASH_DIR + "/" + str(randkey) + ".stash.patch").read()
result += os.popen("rm " + SVN_STASH_DIR + "/" + str(randkey) + ".stash.patch").read()
result = os.popen("svn patch " + os.path.join(SVN_STASH_DIR, str(randkey) + ".stash.patch")).read()
result += os.popen("rm " + os.path.join(SVN_STASH_DIR, str(randkey) + ".stash.patch")).read()
#print "pop " + target_file
#delete the file of svn_stash
result += os.popen("rm " + SVN_STASH_DIR + "/" + str(self.key)).read()
result += os.popen("rm " + os.path.join(SVN_STASH_DIR, str(self.key))).read()

def write(self):
#Create file for svn stash
try:
current_dir = SVN_STASH_DIR + "/" + str(self.key)
current_dir = os.path.join(SVN_STASH_DIR, str(self.key))
with open(current_dir,"w") as f:
content = []
#add the first line with root url
Expand All @@ -141,12 +141,12 @@ def clear(self):
if os.path.exists(SVN_STASH_DIR):
for target_file in self.files:
randkey = self.files[target_file]
result += os.popen("rm " + SVN_STASH_DIR + "/" + str(randkey) + ".stash.patch").read()
result += os.popen("rm " + SVN_STASH_DIR + "/" + str(self.key)).read()
result += os.popen("rm " + os.path.join(SVN_STASH_DIR, str(randkey) + ".stash.patch")).read()
result += os.popen("rm " + os.path.join(SVN_STASH_DIR, str(self.key))).read()

def load(self,stash_id):
try:
current_dir = SVN_STASH_DIR + "/" + str(stash_id)
current_dir = os.path.join(SVN_STASH_DIR, str(stash_id))
with open(current_dir,"r") as f:
is_first = True
for line in f:
Expand All @@ -173,7 +173,7 @@ def __str__(self):
for filename in self.files:
try:
real_dir = filename + ".stash.patch"
current_dir = SVN_STASH_DIR + "/" + self.files[filename] + ".stash.patch"
current_dir = os.path.join(SVN_STASH_DIR, self.files[filename] + ".stash.patch")
content += print_hr()
content += "file " + real_dir
content += print_hr()
Expand All @@ -193,7 +193,7 @@ def __str__(self):
def create_stash_dir_if_any():
if not os.path.exists(SVN_STASH_DIR):
os.makedirs(SVN_STASH_DIR)
stash_register_file = SVN_STASH_DIR + "/" + STASH_REGISTER_FILENAME
stash_register_file = os.path.join(SVN_STASH_DIR, STASH_REGISTER_FILENAME)
if not os.path.exists(stash_register_file):
try:
f = open(stash_register_file, "w")
Expand All @@ -206,10 +206,8 @@ def print_hr(lng=30):
def is_a_current_stash(stash_id):
stash = svn_stash()
stash.load(stash_id)
current_dir_parts = CURRENT_DIR.split("/")
stash_dir_parts = stash.root_url.split("/")
current_dir_parts = os.path.split(CURRENT_DIR)
stash_dir_parts = os.path.split(stash.root_url)
stash_dir_parts = stash_dir_parts[:len(current_dir_parts)]
stash_dir = "/".join(stash_dir_parts)
if ".svn" in os.listdir(CURRENT_DIR):
return stash_dir == CURRENT_DIR
return False
stash_dir = os.path.join(*stash_dir_parts)
return stash_dir == CURRENT_DIR