Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 1990
- 7fee3661c4f9
- parent 1906
- 8487f9c2533b
- child 2222
- 105f425944a2
equal
deleted
inserted
replaced
| 1987:c7b98f0180ab | 1990:7fee3661c4f9 |
|---|---|
| 2576 repodir = os.path.dirname(repodir) | 2576 repodir = os.path.dirname(repodir) |
| 2577 if os.path.splitdrive(repodir)[1] == os.sep: | 2577 if os.path.splitdrive(repodir)[1] == os.sep: |
| 2578 return False | 2578 return False |
| 2579 | 2579 |
| 2580 res = False | 2580 res = False |
| 2581 dlg = HgGraftDialog() | 2581 dlg = HgGraftDialog(self) |
| 2582 if dlg.exec_() == QDialog.Accepted: | 2582 if dlg.exec_() == QDialog.Accepted: |
| 2583 revs, (userData, currentUser, userName), \ | 2583 revs, (userData, currentUser, userName), \ |
| 2584 (dateData, currentDate, dateStr) = dlg.getData() | 2584 (dateData, currentDate, dateStr), log, dryrun = dlg.getData() |
| 2585 | 2585 |
| 2586 args = [] | 2586 args = [] |
| 2587 args.append("graft") | 2587 args.append("graft") |
| 2588 args.append("--verbose") | 2588 args.append("--verbose") |
| 2589 if userData: | 2589 if userData: |
| 2596 if currentDate: | 2596 if currentDate: |
| 2597 args.append("--currentdate") | 2597 args.append("--currentdate") |
| 2598 else: | 2598 else: |
| 2599 args.append("--date") | 2599 args.append("--date") |
| 2600 args.append(dateStr) | 2600 args.append(dateStr) |
| 2601 if log: | |
| 2602 args.append("--log") | |
| 2603 if dryrun: | |
| 2604 args.append("--dry-run") | |
| 2601 args.extend(revs) | 2605 args.extend(revs) |
| 2602 | 2606 |
| 2603 dia = HgDialog(self.trUtf8('Copy Changesets'), self) | 2607 dia = HgDialog(self.trUtf8('Copy Changesets'), self) |
| 2604 res = dia.startProcess(args, repodir) | 2608 res = dia.startProcess(args, repodir) |
| 2605 if res: | 2609 if res: |
| 2849 Public method to check, if an extension is active. | 2853 Public method to check, if an extension is active. |
| 2850 | 2854 |
| 2851 @param extensionName name of the extension to check for (string) | 2855 @param extensionName name of the extension to check for (string) |
| 2852 @return flag indicating an active extension (boolean) | 2856 @return flag indicating an active extension (boolean) |
| 2853 """ | 2857 """ |
| 2854 return extensionName.strip() in self.__activeExtensions | 2858 extensionName = extensionName.strip() |
| 2859 isActive = extensionName in self.__activeExtensions | |
| 2860 if isActive and extensionName == "transplant" and self.version >= (2, 3): | |
| 2861 # transplant extension is deprecated as of Mercurial 2.3.0 | |
| 2862 isActive = False | |
| 2863 | |
| 2864 return isActive | |
| 2855 | 2865 |
| 2856 def getExtensionObject(self, extensionName): | 2866 def getExtensionObject(self, extensionName): |
| 2857 """ | 2867 """ |
| 2858 Public method to get a reference to an extension object. | 2868 Public method to get a reference to an extension object. |
| 2859 | 2869 |
