Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 5322
- c2cabdca0734
- parent 5319
- a512d3951a13
- child 5328
- 9c11e9285a46
equal
deleted
inserted
replaced
| 5321:07b4da7d6833 | 5322:c2cabdca0734 |
|---|---|
| 3586 name = " ".join(li) | 3586 name = " ".join(li) |
| 3587 self.bookmarksList.append(name) | 3587 self.bookmarksList.append(name) |
| 3588 | 3588 |
| 3589 return self.bookmarksList[:] | 3589 return self.bookmarksList[:] |
| 3590 | 3590 |
| 3591 def hgBookmarkDefine(self, name): | 3591 def hgBookmarkDefine(self, name, revision=None, bookmark=None): |
| 3592 """ | 3592 """ |
| 3593 Public method to define a bookmark. | 3593 Public method to define a bookmark. |
| 3594 | 3594 |
| 3595 @param name file/directory name (string) | 3595 @param name file/directory name (string) |
| 3596 @param revision revision to set bookmark for (string) | |
| 3597 @param bookmark name of the bookmark (string) | |
| 3596 """ | 3598 """ |
| 3597 # find the root of the repo | 3599 # find the root of the repo |
| 3598 repodir = self.splitPath(name)[0] | 3600 repodir = self.splitPath(name)[0] |
| 3599 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 3601 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 3600 repodir = os.path.dirname(repodir) | 3602 repodir = os.path.dirname(repodir) |
| 3601 if os.path.splitdrive(repodir)[1] == os.sep: | 3603 if os.path.splitdrive(repodir)[1] == os.sep: |
| 3602 return | 3604 return |
| 3603 | 3605 |
| 3604 from .HgBookmarkDialog import HgBookmarkDialog | 3606 if bool(revision) and bool(bookmark): |
| 3605 dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, | 3607 ok = True |
| 3606 self.hgGetTagsList(repodir), | 3608 else: |
| 3607 self.hgGetBranchesList(repodir), | 3609 from .HgBookmarkDialog import HgBookmarkDialog |
| 3608 self.hgGetBookmarksList(repodir)) | 3610 dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, |
| 3609 if dlg.exec_() == QDialog.Accepted: | 3611 self.hgGetTagsList(repodir), |
| 3610 rev, bookmark = dlg.getData() | 3612 self.hgGetBranchesList(repodir), |
| 3611 | 3613 self.hgGetBookmarksList(repodir)) |
| 3614 if dlg.exec_() == QDialog.Accepted: | |
| 3615 revision, bookmark = dlg.getData() | |
| 3616 ok = True | |
| 3617 else: | |
| 3618 ok = False | |
| 3619 | |
| 3620 if ok: | |
| 3612 args = self.initCommand("bookmarks") | 3621 args = self.initCommand("bookmarks") |
| 3613 if rev: | 3622 if revision: |
| 3614 args.append("--rev") | 3623 args.append("--rev") |
| 3615 args.append(rev) | 3624 args.append(revision) |
| 3616 args.append(bookmark) | 3625 args.append(bookmark) |
| 3617 | 3626 |
| 3618 dia = HgDialog(self.tr('Mercurial Bookmark'), self) | 3627 dia = HgDialog(self.tr('Mercurial Bookmark'), self) |
| 3619 res = dia.startProcess(args, repodir) | 3628 res = dia.startProcess(args, repodir) |
| 3620 if res: | 3629 if res: |
| 3675 dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self) | 3684 dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self) |
| 3676 res = dia.startProcess(args, repodir) | 3685 res = dia.startProcess(args, repodir) |
| 3677 if res: | 3686 if res: |
| 3678 dia.exec_() | 3687 dia.exec_() |
| 3679 | 3688 |
| 3680 def hgBookmarkMove(self, name): | 3689 def hgBookmarkMove(self, name, revision=None, bookmark=None): |
| 3681 """ | 3690 """ |
| 3682 Public method to move a bookmark. | 3691 Public method to move a bookmark. |
| 3683 | 3692 |
| 3684 @param name file/directory name (string) | 3693 @param name file/directory name (string) |
| 3694 @param revision revision to set bookmark for (string) | |
| 3695 @param bookmark name of the bookmark (string) | |
| 3685 """ | 3696 """ |
| 3686 # find the root of the repo | 3697 # find the root of the repo |
| 3687 repodir = self.splitPath(name)[0] | 3698 repodir = self.splitPath(name)[0] |
| 3688 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 3699 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 3689 repodir = os.path.dirname(repodir) | 3700 repodir = os.path.dirname(repodir) |
| 3690 if os.path.splitdrive(repodir)[1] == os.sep: | 3701 if os.path.splitdrive(repodir)[1] == os.sep: |
| 3691 return | 3702 return |
| 3692 | 3703 |
| 3693 from .HgBookmarkDialog import HgBookmarkDialog | 3704 if bool(revision) and bool(bookmark): |
| 3694 dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, | 3705 ok = True |
| 3695 self.hgGetTagsList(repodir), | 3706 else: |
| 3696 self.hgGetBranchesList(repodir), | 3707 from .HgBookmarkDialog import HgBookmarkDialog |
| 3697 self.hgGetBookmarksList(repodir)) | 3708 dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, |
| 3698 if dlg.exec_() == QDialog.Accepted: | 3709 self.hgGetTagsList(repodir), |
| 3699 rev, bookmark = dlg.getData() | 3710 self.hgGetBranchesList(repodir), |
| 3700 | 3711 self.hgGetBookmarksList(repodir)) |
| 3712 if dlg.exec_() == QDialog.Accepted: | |
| 3713 revision, bookmark = dlg.getData() | |
| 3714 ok = True | |
| 3715 else: | |
| 3716 ok = False | |
| 3717 | |
| 3718 if ok: | |
| 3701 args = self.initCommand("bookmarks") | 3719 args = self.initCommand("bookmarks") |
| 3702 args.append("--force") | 3720 args.append("--force") |
| 3703 if rev: | 3721 if revision: |
| 3704 args.append("--rev") | 3722 args.append("--rev") |
| 3705 args.append(rev) | 3723 args.append(revision) |
| 3706 args.append(bookmark) | 3724 args.append(bookmark) |
| 3707 | 3725 |
| 3708 dia = HgDialog(self.tr('Move Mercurial Bookmark'), self) | 3726 dia = HgDialog(self.tr('Move Mercurial Bookmark'), self) |
| 3709 res = dia.startProcess(args, repodir) | 3727 res = dia.startProcess(args, repodir) |
| 3710 if res: | 3728 if res: |
