Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
- changeset 2405
- d4b5f3bd4720
- parent 2302
- f29e9405c851
- child 2525
- 8b507a9a2d40
- child 3008
- 7848489bcb92
equal
deleted
inserted
replaced
| 2404:cba0ff902c2b | 2405:d4b5f3bd4720 |
|---|---|
| 11 | 11 |
| 12 from PyQt4.QtGui import QDialog | 12 from PyQt4.QtGui import QDialog |
| 13 | 13 |
| 14 from ..HgExtension import HgExtension | 14 from ..HgExtension import HgExtension |
| 15 from ..HgDialog import HgDialog | 15 from ..HgDialog import HgDialog |
| 16 | |
| 17 from .TransplantDialog import TransplantDialog | |
| 18 | 16 |
| 19 | 17 |
| 20 class Transplant(HgExtension): | 18 class Transplant(HgExtension): |
| 21 """ | 19 """ |
| 22 Class implementing the transplant extension interface. | 20 Class implementing the transplant extension interface. |
| 41 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 39 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 42 repodir = os.path.dirname(repodir) | 40 repodir = os.path.dirname(repodir) |
| 43 if os.path.splitdrive(repodir)[1] == os.sep: | 41 if os.path.splitdrive(repodir)[1] == os.sep: |
| 44 return False | 42 return False |
| 45 | 43 |
| 44 from .TransplantDialog import TransplantDialog | |
| 46 res = False | 45 res = False |
| 47 dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) | 46 dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) |
| 48 if dlg.exec_() == QDialog.Accepted: | 47 if dlg.exec_() == QDialog.Accepted: |
| 49 revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = dlg.getData() | 48 revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = dlg.getData() |
| 50 | 49 |
