Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 243
- a1d982e68edf
- parent 241
- aaa856499ed5
- child 244
- 30be2b4a9721
equal
deleted
inserted
replaced
| 242:77047898c023 | 243:a1d982e68edf |
|---|---|
| 364 output = \ | 364 output = \ |
| 365 str(process.readAllStandardOutput(), | 365 str(process.readAllStandardOutput(), |
| 366 Preferences.getSystem("IOEncoding"), | 366 Preferences.getSystem("IOEncoding"), |
| 367 'replace') | 367 'replace') |
| 368 self.__projectRevision = output.strip() | 368 self.__projectRevision = output.strip() |
| 369 if self.__projectRevision.endswith("+"): | |
| 370 self.__projectRevision = self.__projectRevision[:-1] | |
| 369 else: | 371 else: |
| 370 if not finished: | 372 if not finished: |
| 371 errMsg = self.trUtf8("The hg process did not finish within 30s.") | 373 errMsg = self.trUtf8("The hg process did not finish within 30s.") |
| 372 else: | 374 else: |
| 373 errMsg = self.trUtf8("Could not start the hg executable.") | 375 errMsg = self.trUtf8("Could not start the hg executable.") |
| 553 self.activateWindow() | 555 self.activateWindow() |
| 554 self.raise_() | 556 self.raise_() |
| 555 | 557 |
| 556 self.logTree.clear() | 558 self.logTree.clear() |
| 557 self.__started = True | 559 self.__started = True |
| 560 self.__identifyProject() | |
| 558 self.__getLogEntries() | 561 self.__getLogEntries() |
| 559 | 562 |
| 560 def __procFinished(self, exitCode, exitStatus): | 563 def __procFinished(self, exitCode, exitStatus): |
| 561 """ | 564 """ |
| 562 Private slot connected to the finished signal. | 565 Private slot connected to the finished signal. |
| 588 | 591 |
| 589 def __processBuffer(self): | 592 def __processBuffer(self): |
| 590 """ | 593 """ |
| 591 Private method to process the buffered output of the hg log command. | 594 Private method to process the buffered output of the hg log command. |
| 592 """ | 595 """ |
| 593 self.__identifyProject() | |
| 594 | |
| 595 noEntries = 0 | 596 noEntries = 0 |
| 596 log = {"message" : []} | 597 log = {"message" : []} |
| 597 changedPaths = [] | 598 changedPaths = [] |
| 598 initialText = True | 599 initialText = True |
| 599 fileCopies = {} | 600 fileCopies = {} |
