Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 5514
- 1aa13333eb9f
- parent 5512
- f148796813d4
- child 5548
- 95b188f96d3d
equal
deleted
inserted
replaced
| 5513:2ccfb5077dd6 | 5514:1aa13333eb9f |
|---|---|
| 2641 HgLogBrowserDialog(self, mode="incoming") | 2641 HgLogBrowserDialog(self, mode="incoming") |
| 2642 self.logBrowserIncoming.show() | 2642 self.logBrowserIncoming.show() |
| 2643 self.logBrowserIncoming.raise_() | 2643 self.logBrowserIncoming.raise_() |
| 2644 self.logBrowserIncoming.start(name, bundle=file) | 2644 self.logBrowserIncoming.start(name, bundle=file) |
| 2645 | 2645 |
| 2646 def hgUnbundle(self, name): | 2646 def hgUnbundle(self, name, files=None): |
| 2647 """ | 2647 """ |
| 2648 Public method to apply changegroup files. | 2648 Public method to apply changegroup files. |
| 2649 | 2649 |
| 2650 @param name directory name (string) | 2650 @param name directory name |
| 2651 @type str | |
| 2652 @param files list of bundle files to be applied | |
| 2653 @type list of str | |
| 2651 @return flag indicating, that the update contained an add | 2654 @return flag indicating, that the update contained an add |
| 2652 or delete (boolean) | 2655 or delete |
| 2656 @rtype bool | |
| 2653 """ | 2657 """ |
| 2654 dname, fname = self.splitPath(name) | 2658 dname, fname = self.splitPath(name) |
| 2655 | 2659 |
| 2656 # find the root of the repo | 2660 # find the root of the repo |
| 2657 repodir = dname | 2661 repodir = dname |
| 2659 repodir = os.path.dirname(repodir) | 2663 repodir = os.path.dirname(repodir) |
| 2660 if os.path.splitdrive(repodir)[1] == os.sep: | 2664 if os.path.splitdrive(repodir)[1] == os.sep: |
| 2661 return | 2665 return |
| 2662 | 2666 |
| 2663 res = False | 2667 res = False |
| 2664 files = E5FileDialog.getOpenFileNames( | 2668 if not files: |
| 2665 None, | 2669 files = E5FileDialog.getOpenFileNames( |
| 2666 self.tr("Apply changegroups"), | 2670 None, |
| 2667 self.__lastChangeGroupPath or repodir, | 2671 self.tr("Apply changegroups"), |
| 2668 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 2672 self.__lastChangeGroupPath or repodir, |
| 2673 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)")) | |
| 2674 | |
| 2669 if files: | 2675 if files: |
| 2670 self.__lastChangeGroupPath = os.path.dirname(files[0]) | 2676 self.__lastChangeGroupPath = os.path.dirname(files[0]) |
| 2671 | 2677 |
| 2672 update = E5MessageBox.yesNo( | 2678 update = E5MessageBox.yesNo( |
| 2673 self.__ui, | 2679 self.__ui, |
| 2685 res = dia.startProcess(args, repodir) | 2691 res = dia.startProcess(args, repodir) |
| 2686 if res: | 2692 if res: |
| 2687 dia.exec_() | 2693 dia.exec_() |
| 2688 res = dia.hasAddOrDelete() | 2694 res = dia.hasAddOrDelete() |
| 2689 self.checkVCSStatus() | 2695 self.checkVCSStatus() |
| 2696 | |
| 2690 return res | 2697 return res |
| 2691 | 2698 |
| 2692 def hgBisect(self, name, subcommand): | 2699 def hgBisect(self, name, subcommand): |
| 2693 """ | 2700 """ |
| 2694 Public method to perform bisect commands. | 2701 Public method to perform bisect commands. |
