def revertToVersion(self, commit):
head = self.repo.head.id
self.repo.reset(commit.commitid, geogig.RESET_MODE_HARD)
self.repo.reset(head, geogig.RESET_MODE_MIXED)
self.repo.addandcommit("Reverted to version %s (%s)" % (commit.commitid[:10], commit.message))
self.updateCurrentBranchItem()
self.repoChanged.emit()
updateTrackedLayers(self.repo)
def revertToVersion(self, commit):
head = self.repo.head.id
self.repo.reset(commit.commitid, geogig.RESET_MODE_HARD)
self.repo.reset(head, geogig.RESET_MODE_MIXED)
self.repo.addandcommit("Reverted to version %s (%s)" %
(commit.commitid[:10], commit.message))
self.updateCurrentBranchItem()
self.repoChanged.emit()
updateTrackedLayers(self.repo)
def sync(self):
if self.pull():
updateTrackedLayers(self.repo.repo())
self.push()
config.iface.messageBar().pushMessage("Repositories have been successfully synchronized.",
level = QgsMessageBar.INFO, duration = 4)
return True
else:
return False
def syncRepo(self, item):
dlg = SyncDialog(item.repo.repo(), item.repo.title)
dlg.exec_()
if dlg.conflicts:
self.statusWidget.updateLabelText()
if dlg.pulled:
updateTrackedLayers(item.repo.repo())
self.versionsTree.updateCurrentBranchItem
self.statusWidget.updateLabelText()
elif dlg.pushed:
self.statusWidget.updateLabelText()
def mergeBranch(self, branch):
try:
self.repo.merge(branch)
updateTrackedLayers(self.repo)
self.updateCurrentBranchItem()
except GeoGigConflictException:
QtGui.QMessageBox.warning(self, 'Merge Conflicts',
"Some of your edits in the current branch conflict with edits in the merged branch.\n\n"
+ "Solve conflicts or revert the merge operation to have only your current branch edits.",
QtGui.QMessageBox.Ok)
finally:
self.repoChanged.emit()
def syncRepo(self, item):
dlg = SyncDialog(item.repo.repo(), item.repo.title)
dlg.exec_()
if dlg.conflicts:
self.statusWidget.updateLabelText()
if dlg.pulled:
updateTrackedLayers(item.repo.repo())
self.versionsTree.updateCurrentBranchItem()
self.statusWidget.updateLabelText()
elif dlg.pushed:
self.statusWidget.updateLabelText()
self.updateCurrentRepoDescription()
def mergeBranch(self, branch):
try:
self.repo.merge(branch)
updateTrackedLayers(self.repo)
self.updateCurrentBranchItem()
except GeoGigConflictException:
QtGui.QMessageBox.warning(
self, 'Merge Conflicts',
"Some of your edits in the current branch conflict with edits in the merged branch.\n\n"
+
"Solve conflicts or revert the merge operation to have only your current branch edits.",
QtGui.QMessageBox.Ok)
finally:
self.repoChanged.emit()
def switchToBranch(self, branch):
self.repo.checkout(branch)
updateTrackedLayers(self.repo)
self.head = self.updateForCurrentBranch()
self.headChanged.emit()
self.repoChanged.emit()
def switchToBranch(self, branch):
self.repo.checkout(branch)
updateTrackedLayers(self.repo)
self.head = self.updateForCurrentBranch()
self.headChanged.emit()
self.repoChanged.emit()
