Skip to content

Fix Issue 14 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WtfJoke merged 1 commit into from
May 9, 2015
Merged

Fix Issue 14 #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions rtcFunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def recreateoldestworkspace(self):


class Changes:

latest_accept_command = ""

@staticmethod
Expand All @@ -86,11 +87,11 @@ def discard(*changeentries):
shell.execute("lscm discard --overwrite-uncommitted " + idstodiscard)

@staticmethod
def accept(*changeentries, logpath):
def accept(*changeentries, workspace, repo, logpath):
for changeEntry in changeentries:
shouter.shout("Accepting: " + changeEntry.tostring())
revisions = Changes._collectids(changeentries)
latest_accept_command = "lscm accept -v --overwrite-uncommitted --changes " + revisions
latest_accept_command = "lscm accept -v --overwrite-uncommitted --changes " + revisions + " --target " + workspace + " -r " + repo
return shell.execute(latest_accept_command, logpath, "a")

@staticmethod
Expand Down Expand Up @@ -155,7 +156,7 @@ def acceptchangesintoworkspace(self, changeentries):
if skipnextchangeset:
skipnextchangeset = False
continue
acceptedsuccesfully = Changes.accept(changeEntry, logpath=self.acceptlogpath) is 0
acceptedsuccesfully = Changes.accept(changeEntry, workspace=self.config.workspace, repo=self.config.repo, logpath=self.acceptlogpath) is 0
if not acceptedsuccesfully:
shouter.shout("Change wasnt succesfully accepted into workspace")
skipnextchangeset = self.retryacceptincludingnextchangeset(changeEntry, changeentries)
Expand All @@ -179,7 +180,7 @@ def retryacceptincludingnextchangeset(self, change, changes):
" changeset and continue"):
return False
Changes.discard(change)
successfull = Changes.accept(change, nextchangeentry, logpath=self.acceptlogpath) is 0
successfull = Changes.accept(change, nextchangeentry, workspace=self.config.workspace, repo=self.config.repo, logpath=self.acceptlogpath) is 0
if not successfull:
Changes.discard(change, nextchangeentry)

Expand Down