Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3306
- 0a4e5082cbc6
- parent 3305
- cf4f22a19dc6
- child 3308
- 955abb40a903
equal
deleted
inserted
replaced
| 3305:cf4f22a19dc6 | 3306:0a4e5082cbc6 |
|---|---|
| 734 @param target new name of the file/directory (string) | 734 @param target new name of the file/directory (string) |
| 735 @param noDialog flag indicating quiet operations | 735 @param noDialog flag indicating quiet operations |
| 736 @return flag indicating successfull operation (boolean) | 736 @return flag indicating successfull operation (boolean) |
| 737 """ | 737 """ |
| 738 isDir = os.path.isdir(name) | 738 isDir = os.path.isdir(name) |
| 739 # TODO: get rid of this | |
| 740 force = False | |
| 741 | 739 |
| 742 res = False | 740 res = False |
| 743 if noDialog: | 741 if noDialog: |
| 744 if target is None: | 742 if target is None: |
| 745 return False | 743 return False |
| 746 force = True | 744 force = True |
| 747 accepted = True | 745 accepted = True |
| 748 else: | 746 else: |
| 749 from .HgCopyDialog import HgCopyDialog | 747 from .HgCopyDialog import HgCopyDialog |
| 750 dlg = HgCopyDialog(name, None, True, force) | 748 dlg = HgCopyDialog(name, None, True) |
| 751 accepted = dlg.exec_() == QDialog.Accepted | 749 accepted = dlg.exec_() == QDialog.Accepted |
| 752 if accepted: | 750 if accepted: |
| 753 target, force = dlg.getData() | 751 target, force = dlg.getData() |
| 754 | 752 |
| 755 if accepted: | 753 if accepted: |
| 1019 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1017 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1020 repodir = os.path.dirname(repodir) | 1018 repodir = os.path.dirname(repodir) |
| 1021 if os.path.splitdrive(repodir)[1] == os.sep: | 1019 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1022 return | 1020 return |
| 1023 | 1021 |
| 1024 # TODO: get rid of this | |
| 1025 force = False | |
| 1026 | |
| 1027 if self.isExtensionActive("bookmarks"): | 1022 if self.isExtensionActive("bookmarks"): |
| 1028 bookmarksList = \ | 1023 bookmarksList = \ |
| 1029 self.getExtensionObject("bookmarks")\ | 1024 self.getExtensionObject("bookmarks")\ |
| 1030 .hgGetBookmarksList(repodir) | 1025 .hgGetBookmarksList(repodir) |
| 1031 else: | 1026 else: |
| 1032 bookmarksList = None | 1027 bookmarksList = None |
| 1033 from .HgMergeDialog import HgMergeDialog | 1028 from .HgMergeDialog import HgMergeDialog |
| 1034 dlg = HgMergeDialog(force, self.hgGetTagsList(repodir), | 1029 dlg = HgMergeDialog(self.hgGetTagsList(repodir), |
| 1035 self.hgGetBranchesList(repodir), | 1030 self.hgGetBranchesList(repodir), |
| 1036 bookmarksList) | 1031 bookmarksList) |
| 1037 if dlg.exec_() == QDialog.Accepted: | 1032 if dlg.exec_() == QDialog.Accepted: |
| 1038 rev, force = dlg.getParameters() | 1033 rev, force = dlg.getParameters() |
| 1039 else: | 1034 else: |
