From fd99b7389f2c268b76850af1830c9bdc3e9b473f Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 30 Dec 2007 20:50:09 -0800 Subject: [PATCH] Changed the create_new_branch method's signature to be consistent The calling order was changed to create_new_branch(model,view) which is consistent with the other gui helper methods. --- ugitlibs/controllers.py | 4 ++-- ugitlibs/createbranchcontroller.py | 2 +- ugitlibs/models.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ugitlibs/controllers.py b/ugitlibs/controllers.py index 5be1b37..99e5200 100644 --- a/ugitlibs/controllers.py +++ b/ugitlibs/controllers.py @@ -180,10 +180,10 @@ class Controller(QObserver): # Qt callbacks def options(self): - update_options(self.view, self.model) + update_options(self.model, self.view) def branch_create(self): - if create_new_branch(self.view, self.model): + if create_new_branch(self.model, self.view): self.rescan() def branch_delete(self): diff --git a/ugitlibs/createbranchcontroller.py b/ugitlibs/createbranchcontroller.py index 73a8d7f..f9022f1 100644 --- a/ugitlibs/createbranchcontroller.py +++ b/ugitlibs/createbranchcontroller.py @@ -7,7 +7,7 @@ import qtutils from qobserver import QObserver from views import CreateBranchGUI -def create_new_branch(parent,model): +def create_new_branch(model,parent): model = model.clone(init=False) view = CreateBranchGUI(parent) ctl = CreateBranchController(model,view) diff --git a/ugitlibs/models.py b/ugitlibs/models.py index fbc1c4b..b0dcadd 100644 --- a/ugitlibs/models.py +++ b/ugitlibs/models.py @@ -189,7 +189,7 @@ class Model(model.Model): commit_msg.pop() break commit_msg.append(msg) - self.set_commitmsg('\n'.join(commit_msg).rstrip()) + self.set_commitmsg(os.linesep.join(commit_msg).rstrip()) def update_status(self): # This allows us to defer notification until the -- 2.11.4.GIT