Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
- changeset 7970
- c4ee8a81584c
- parent 7923
- 91e843545d9a
- child 7979
- 54b73174ab61
equal
deleted
inserted
replaced
| 7969:62eff8b34a8d | 7970:c4ee8a81584c |
|---|---|
| 325 self.vcs.addArguments(args, fn) | 325 self.vcs.addArguments(args, fn) |
| 326 else: | 326 else: |
| 327 self.dname, fname = self.vcs.splitPath(fn) | 327 self.dname, fname = self.vcs.splitPath(fn) |
| 328 args.append(fn) | 328 args.append(fn) |
| 329 | 329 |
| 330 # find the root of the repo | |
| 331 repodir = self.dname | |
| 332 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | |
| 333 repodir = os.path.dirname(repodir) | |
| 334 if os.path.splitdrive(repodir)[1] == os.sep: | |
| 335 return | |
| 336 | |
| 337 self.refreshButton.setEnabled(False) | 330 self.refreshButton.setEnabled(False) |
| 338 | 331 |
| 339 out, err = self.__hgClient.runcommand(args) | 332 out, err = self.__hgClient.runcommand(args) |
| 340 if err: | 333 if err: |
| 341 self.__showError(err) | 334 self.__showError(err) |
| 446 | 439 |
| 447 def __showActionsMenu(self): | 440 def __showActionsMenu(self): |
| 448 """ | 441 """ |
| 449 Private slot to prepare the actions button menu before it is shown. | 442 Private slot to prepare the actions button menu before it is shown. |
| 450 """ | 443 """ |
| 451 if self.vcs.canCommitMerge(self.dname): | 444 if self.vcs.canCommitMerge(): |
| 452 self.__commitMergeAct.setEnabled(True) | 445 self.__commitMergeAct.setEnabled(True) |
| 453 self.__abortMergeAct.setEnabled(True) | 446 self.__abortMergeAct.setEnabled(True) |
| 454 | 447 |
| 455 self.__addAct.setEnabled(False) | 448 self.__addAct.setEnabled(False) |
| 456 self.__diffAct.setEnabled(False) | 449 self.__diffAct.setEnabled(False) |
| 774 | 767 |
| 775 def __abortMerge(self): | 768 def __abortMerge(self): |
| 776 """ | 769 """ |
| 777 Private slot used to abort an uncommitted merge. | 770 Private slot used to abort an uncommitted merge. |
| 778 """ | 771 """ |
| 779 self.vcs.hgAbortMerge(self.dname) | 772 self.vcs.hgAbortMerge() |
| 780 self.__committed() | 773 self.__committed() |
| 781 | 774 |
| 782 ########################################################################### | 775 ########################################################################### |
| 783 ## Diff handling methods below | 776 ## Diff handling methods below |
| 784 ########################################################################### | 777 ########################################################################### |
