Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- 5_1_x
- changeset 1320
- e94577f27c3e
- parent 1285
- 544520790fdd
- child 1510
- e75ecf2bd9dd
equal
deleted
inserted
replaced
| 1317:aa16b0456e8f | 1320:e94577f27c3e |
|---|---|
| 366 | 366 |
| 367 # find the root of the repo | 367 # find the root of the repo |
| 368 repodir = dname | 368 repodir = dname |
| 369 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 369 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 370 repodir = os.path.dirname(repodir) | 370 repodir = os.path.dirname(repodir) |
| 371 if repodir == os.sep: | 371 if os.path.splitdrive(repodir)[1] == os.sep: |
| 372 return | 372 return |
| 373 | 373 |
| 374 if isinstance(name, list): | 374 if isinstance(name, list): |
| 375 self.addArguments(args, fnames) | 375 self.addArguments(args, fnames) |
| 376 else: | 376 else: |
| 419 | 419 |
| 420 # find the root of the repo | 420 # find the root of the repo |
| 421 repodir = dname | 421 repodir = dname |
| 422 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 422 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 423 repodir = os.path.dirname(repodir) | 423 repodir = os.path.dirname(repodir) |
| 424 if repodir == os.sep: | 424 if os.path.splitdrive(repodir)[1] == os.sep: |
| 425 return False | 425 return False |
| 426 | 426 |
| 427 if noDialog: | 427 if noDialog: |
| 428 self.startSynchronizedProcess(QProcess(), "hg", args, repodir) | 428 self.startSynchronizedProcess(QProcess(), "hg", args, repodir) |
| 429 res = False | 429 res = False |
| 463 | 463 |
| 464 # find the root of the repo | 464 # find the root of the repo |
| 465 repodir = dname | 465 repodir = dname |
| 466 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 466 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 467 repodir = os.path.dirname(repodir) | 467 repodir = os.path.dirname(repodir) |
| 468 if repodir == os.sep: | 468 if os.path.splitdrive(repodir)[1] == os.sep: |
| 469 return | 469 return |
| 470 | 470 |
| 471 if isinstance(name, list): | 471 if isinstance(name, list): |
| 472 self.addArguments(args, name) | 472 self.addArguments(args, name) |
| 473 else: | 473 else: |
| 528 | 528 |
| 529 # find the root of the repo | 529 # find the root of the repo |
| 530 repodir = dname | 530 repodir = dname |
| 531 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 531 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 532 repodir = os.path.dirname(repodir) | 532 repodir = os.path.dirname(repodir) |
| 533 if repodir == os.sep: | 533 if os.path.splitdrive(repodir)[1] == os.sep: |
| 534 return False | 534 return False |
| 535 | 535 |
| 536 if noDialog: | 536 if noDialog: |
| 537 res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir) | 537 res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir) |
| 538 else: | 538 else: |
| 586 dname, fname = self.splitPath(name) | 586 dname, fname = self.splitPath(name) |
| 587 # find the root of the repo | 587 # find the root of the repo |
| 588 repodir = dname | 588 repodir = dname |
| 589 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 589 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 590 repodir = os.path.dirname(repodir) | 590 repodir = os.path.dirname(repodir) |
| 591 if repodir == os.sep: | 591 if os.path.splitdrive(repodir)[1] == os.sep: |
| 592 return False | 592 return False |
| 593 | 593 |
| 594 if noDialog: | 594 if noDialog: |
| 595 res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir) | 595 res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir) |
| 596 else: | 596 else: |
| 674 | 674 |
| 675 # find the root of the repo | 675 # find the root of the repo |
| 676 repodir = str(dname) | 676 repodir = str(dname) |
| 677 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 677 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 678 repodir = os.path.dirname(repodir) | 678 repodir = os.path.dirname(repodir) |
| 679 if repodir == os.sep: | 679 if os.path.splitdrive(repodir)[1] == os.sep: |
| 680 return | 680 return |
| 681 | 681 |
| 682 dlg = HgTagDialog(self.tagsList) | 682 dlg = HgTagDialog(self.tagsList) |
| 683 if dlg.exec_() == QDialog.Accepted: | 683 if dlg.exec_() == QDialog.Accepted: |
| 684 tag, tagOp = dlg.getParameters() | 684 tag, tagOp = dlg.getParameters() |
| 727 | 727 |
| 728 # find the root of the repo | 728 # find the root of the repo |
| 729 repodir = dname | 729 repodir = dname |
| 730 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 730 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 731 repodir = os.path.dirname(repodir) | 731 repodir = os.path.dirname(repodir) |
| 732 if repodir == os.sep: | 732 if os.path.splitdrive(repodir)[1] == os.sep: |
| 733 return | 733 return |
| 734 | 734 |
| 735 dia = HgDialog(self.trUtf8('Reverting changes')) | 735 dia = HgDialog(self.trUtf8('Reverting changes')) |
| 736 res = dia.startProcess(args, repodir) | 736 res = dia.startProcess(args, repodir) |
| 737 if res: | 737 if res: |
| 759 | 759 |
| 760 # find the root of the repo | 760 # find the root of the repo |
| 761 repodir = dname | 761 repodir = dname |
| 762 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 762 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 763 repodir = os.path.dirname(repodir) | 763 repodir = os.path.dirname(repodir) |
| 764 if repodir == os.sep: | 764 if os.path.splitdrive(repodir)[1] == os.sep: |
| 765 return | 765 return |
| 766 | 766 |
| 767 args = [] | 767 args = [] |
| 768 args.append('merge') | 768 args.append('merge') |
| 769 self.addArguments(args, opts) | 769 self.addArguments(args, opts) |
| 810 | 810 |
| 811 # find the root of the repo | 811 # find the root of the repo |
| 812 repodir = dname | 812 repodir = dname |
| 813 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 813 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 814 repodir = os.path.dirname(repodir) | 814 repodir = os.path.dirname(repodir) |
| 815 if repodir == os.sep: | 815 if os.path.splitdrive(repodir)[1] == os.sep: |
| 816 return 0 | 816 return 0 |
| 817 | 817 |
| 818 ioEncoding = Preferences.getSystem("IOEncoding") | 818 ioEncoding = Preferences.getSystem("IOEncoding") |
| 819 process = QProcess() | 819 process = QProcess() |
| 820 args = [] | 820 args = [] |
| 871 if not found: | 871 if not found: |
| 872 # find the root of the repo | 872 # find the root of the repo |
| 873 repodir = dname | 873 repodir = dname |
| 874 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 874 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 875 repodir = os.path.dirname(repodir) | 875 repodir = os.path.dirname(repodir) |
| 876 if repodir == os.sep: | 876 if os.path.splitdrive(repodir)[1] == os.sep: |
| 877 return names | 877 return names |
| 878 | 878 |
| 879 ioEncoding = Preferences.getSystem("IOEncoding") | 879 ioEncoding = Preferences.getSystem("IOEncoding") |
| 880 process = QProcess() | 880 process = QProcess() |
| 881 args = [] | 881 args = [] |
| 971 | 971 |
| 972 # find the root of the repo | 972 # find the root of the repo |
| 973 repodir = name | 973 repodir = name |
| 974 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 974 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 975 repodir = os.path.dirname(repodir) | 975 repodir = os.path.dirname(repodir) |
| 976 if repodir == os.sep: | 976 if os.path.splitdrive(repodir)[1] == os.sep: |
| 977 return | 977 return |
| 978 | 978 |
| 979 dia = HgDialog(self.trUtf8('Mercurial command')) | 979 dia = HgDialog(self.trUtf8('Mercurial command')) |
| 980 res = dia.startProcess(args, repodir) | 980 res = dia.startProcess(args, repodir) |
| 981 if res: | 981 if res: |
| 1144 dname, fname = self.splitPath(name) | 1144 dname, fname = self.splitPath(name) |
| 1145 # find the root of the repo | 1145 # find the root of the repo |
| 1146 repodir = dname | 1146 repodir = dname |
| 1147 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1147 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1148 repodir = os.path.dirname(repodir) | 1148 repodir = os.path.dirname(repodir) |
| 1149 if repodir == os.sep: | 1149 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1150 return False | 1150 return False |
| 1151 | 1151 |
| 1152 dia = HgDialog(self.trUtf8('Copying {0}') | 1152 dia = HgDialog(self.trUtf8('Copying {0}') |
| 1153 .format(name)) | 1153 .format(name)) |
| 1154 res = dia.startProcess(args, repodir) | 1154 res = dia.startProcess(args, repodir) |
| 1312 | 1312 |
| 1313 # find the root of the repo | 1313 # find the root of the repo |
| 1314 repodir = self.splitPath(name)[0] | 1314 repodir = self.splitPath(name)[0] |
| 1315 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1315 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1316 repodir = os.path.dirname(repodir) | 1316 repodir = os.path.dirname(repodir) |
| 1317 if repodir == os.sep: | 1317 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1318 return | 1318 return |
| 1319 | 1319 |
| 1320 dia = HgDialog(self.trUtf8('Pulling from a remote Mercurial repository')) | 1320 dia = HgDialog(self.trUtf8('Pulling from a remote Mercurial repository')) |
| 1321 res = dia.startProcess(args, repodir) | 1321 res = dia.startProcess(args, repodir) |
| 1322 if res: | 1322 if res: |
| 1341 | 1341 |
| 1342 # find the root of the repo | 1342 # find the root of the repo |
| 1343 repodir = self.splitPath(name)[0] | 1343 repodir = self.splitPath(name)[0] |
| 1344 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1344 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1345 repodir = os.path.dirname(repodir) | 1345 repodir = os.path.dirname(repodir) |
| 1346 if repodir == os.sep: | 1346 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1347 return | 1347 return |
| 1348 | 1348 |
| 1349 dia = HgDialog(self.trUtf8('Pushing to a remote Mercurial repository')) | 1349 dia = HgDialog(self.trUtf8('Pushing to a remote Mercurial repository')) |
| 1350 res = dia.startProcess(args, repodir) | 1350 res = dia.startProcess(args, repodir) |
| 1351 if res: | 1351 if res: |
| 1367 | 1367 |
| 1368 # find the root of the repo | 1368 # find the root of the repo |
| 1369 repodir = self.splitPath(ppath)[0] | 1369 repodir = self.splitPath(ppath)[0] |
| 1370 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1370 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1371 repodir = os.path.dirname(repodir) | 1371 repodir = os.path.dirname(repodir) |
| 1372 if repodir == os.sep: | 1372 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1373 return | 1373 return |
| 1374 | 1374 |
| 1375 process = QProcess() | 1375 process = QProcess() |
| 1376 args = [] | 1376 args = [] |
| 1377 args.append(mode) | 1377 args.append(mode) |
| 1450 | 1450 |
| 1451 # find the root of the repo | 1451 # find the root of the repo |
| 1452 repodir = dname | 1452 repodir = dname |
| 1453 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1453 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1454 repodir = os.path.dirname(repodir) | 1454 repodir = os.path.dirname(repodir) |
| 1455 if repodir == os.sep: | 1455 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1456 return False | 1456 return False |
| 1457 | 1457 |
| 1458 dia = HgDialog( | 1458 dia = HgDialog( |
| 1459 self.trUtf8('Resolving files/directories')) | 1459 self.trUtf8('Resolving files/directories')) |
| 1460 res = dia.startProcess(args, repodir) | 1460 res = dia.startProcess(args, repodir) |
| 1472 | 1472 |
| 1473 # find the root of the repo | 1473 # find the root of the repo |
| 1474 repodir = str(dname) | 1474 repodir = str(dname) |
| 1475 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1475 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1476 repodir = os.path.dirname(repodir) | 1476 repodir = os.path.dirname(repodir) |
| 1477 if repodir == os.sep: | 1477 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1478 return | 1478 return |
| 1479 | 1479 |
| 1480 name, ok = QInputDialog.getItem( | 1480 name, ok = QInputDialog.getItem( |
| 1481 None, | 1481 None, |
| 1482 self.trUtf8("Create Branch"), | 1482 self.trUtf8("Create Branch"), |
| 1503 | 1503 |
| 1504 # find the root of the repo | 1504 # find the root of the repo |
| 1505 repodir = str(dname) | 1505 repodir = str(dname) |
| 1506 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1506 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1507 repodir = os.path.dirname(repodir) | 1507 repodir = os.path.dirname(repodir) |
| 1508 if repodir == os.sep: | 1508 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1509 return | 1509 return |
| 1510 | 1510 |
| 1511 args = [] | 1511 args = [] |
| 1512 args.append("branch") | 1512 args.append("branch") |
| 1513 | 1513 |
| 1526 | 1526 |
| 1527 # find the root of the repo | 1527 # find the root of the repo |
| 1528 repodir = str(dname) | 1528 repodir = str(dname) |
| 1529 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1529 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1530 repodir = os.path.dirname(repodir) | 1530 repodir = os.path.dirname(repodir) |
| 1531 if repodir == os.sep: | 1531 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1532 return | 1532 return |
| 1533 | 1533 |
| 1534 cfgFile = os.path.join(repodir, self.adminDir, "hgrc") | 1534 cfgFile = os.path.join(repodir, self.adminDir, "hgrc") |
| 1535 if not os.path.exists(cfgFile): | 1535 if not os.path.exists(cfgFile): |
| 1536 try: | 1536 try: |
| 1551 | 1551 |
| 1552 # find the root of the repo | 1552 # find the root of the repo |
| 1553 repodir = str(dname) | 1553 repodir = str(dname) |
| 1554 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1554 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1555 repodir = os.path.dirname(repodir) | 1555 repodir = os.path.dirname(repodir) |
| 1556 if repodir == os.sep: | 1556 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1557 return | 1557 return |
| 1558 | 1558 |
| 1559 args = [] | 1559 args = [] |
| 1560 args.append('verify') | 1560 args.append('verify') |
| 1561 | 1561 |
| 1574 | 1574 |
| 1575 # find the root of the repo | 1575 # find the root of the repo |
| 1576 repodir = str(dname) | 1576 repodir = str(dname) |
| 1577 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1577 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1578 repodir = os.path.dirname(repodir) | 1578 repodir = os.path.dirname(repodir) |
| 1579 if repodir == os.sep: | 1579 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1580 return | 1580 return |
| 1581 | 1581 |
| 1582 args = [] | 1582 args = [] |
| 1583 args.append('showconfig') | 1583 args.append('showconfig') |
| 1584 args.append("--untrusted") | 1584 args.append("--untrusted") |
| 1598 | 1598 |
| 1599 # find the root of the repo | 1599 # find the root of the repo |
| 1600 repodir = str(dname) | 1600 repodir = str(dname) |
| 1601 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1601 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1602 repodir = os.path.dirname(repodir) | 1602 repodir = os.path.dirname(repodir) |
| 1603 if repodir == os.sep: | 1603 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1604 return | 1604 return |
| 1605 | 1605 |
| 1606 args = [] | 1606 args = [] |
| 1607 args.append('paths') | 1607 args.append('paths') |
| 1608 | 1608 |
| 1621 | 1621 |
| 1622 # find the root of the repo | 1622 # find the root of the repo |
| 1623 repodir = str(dname) | 1623 repodir = str(dname) |
| 1624 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1624 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1625 repodir = os.path.dirname(repodir) | 1625 repodir = os.path.dirname(repodir) |
| 1626 if repodir == os.sep: | 1626 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1627 return | 1627 return |
| 1628 | 1628 |
| 1629 args = [] | 1629 args = [] |
| 1630 args.append('recover') | 1630 args.append('recover') |
| 1631 | 1631 |
| 1644 | 1644 |
| 1645 # find the root of the repo | 1645 # find the root of the repo |
| 1646 repodir = str(dname) | 1646 repodir = str(dname) |
| 1647 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1647 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1648 repodir = os.path.dirname(repodir) | 1648 repodir = os.path.dirname(repodir) |
| 1649 if repodir == os.sep: | 1649 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1650 return | 1650 return |
| 1651 | 1651 |
| 1652 args = [] | 1652 args = [] |
| 1653 args.append('identify') | 1653 args.append('identify') |
| 1654 | 1654 |
| 1718 | 1718 |
| 1719 # find the root of the repo | 1719 # find the root of the repo |
| 1720 repodir = str(dname) | 1720 repodir = str(dname) |
| 1721 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1721 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1722 repodir = os.path.dirname(repodir) | 1722 repodir = os.path.dirname(repodir) |
| 1723 if repodir == os.sep: | 1723 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1724 return | 1724 return |
| 1725 | 1725 |
| 1726 dlg = HgBundleDialog(self.tagsList, self.branchesList) | 1726 dlg = HgBundleDialog(self.tagsList, self.branchesList) |
| 1727 if dlg.exec_() == QDialog.Accepted: | 1727 if dlg.exec_() == QDialog.Accepted: |
| 1728 rev, compression, all = dlg.getParameters() | 1728 rev, compression, all = dlg.getParameters() |
| 1782 | 1782 |
| 1783 # find the root of the repo | 1783 # find the root of the repo |
| 1784 repodir = str(dname) | 1784 repodir = str(dname) |
| 1785 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1785 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1786 repodir = os.path.dirname(repodir) | 1786 repodir = os.path.dirname(repodir) |
| 1787 if repodir == os.sep: | 1787 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1788 return | 1788 return |
| 1789 | 1789 |
| 1790 file = E5FileDialog.getOpenFileName( | 1790 file = E5FileDialog.getOpenFileName( |
| 1791 None, | 1791 None, |
| 1792 self.trUtf8("Preview changegroup"), | 1792 self.trUtf8("Preview changegroup"), |
| 1813 | 1813 |
| 1814 # find the root of the repo | 1814 # find the root of the repo |
| 1815 repodir = str(dname) | 1815 repodir = str(dname) |
| 1816 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1816 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1817 repodir = os.path.dirname(repodir) | 1817 repodir = os.path.dirname(repodir) |
| 1818 if repodir == os.sep: | 1818 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1819 return | 1819 return |
| 1820 | 1820 |
| 1821 file = E5FileDialog.getOpenFileName( | 1821 file = E5FileDialog.getOpenFileName( |
| 1822 None, | 1822 None, |
| 1823 self.trUtf8("Preview changegroup"), | 1823 self.trUtf8("Preview changegroup"), |
| 1845 | 1845 |
| 1846 # find the root of the repo | 1846 # find the root of the repo |
| 1847 repodir = str(dname) | 1847 repodir = str(dname) |
| 1848 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1848 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1849 repodir = os.path.dirname(repodir) | 1849 repodir = os.path.dirname(repodir) |
| 1850 if repodir == os.sep: | 1850 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1851 return | 1851 return |
| 1852 | 1852 |
| 1853 res = False | 1853 res = False |
| 1854 files = E5FileDialog.getOpenFileNames( | 1854 files = E5FileDialog.getOpenFileNames( |
| 1855 None, | 1855 None, |
| 1893 | 1893 |
| 1894 # find the root of the repo | 1894 # find the root of the repo |
| 1895 repodir = str(dname) | 1895 repodir = str(dname) |
| 1896 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1896 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1897 repodir = os.path.dirname(repodir) | 1897 repodir = os.path.dirname(repodir) |
| 1898 if repodir == os.sep: | 1898 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1899 return | 1899 return |
| 1900 | 1900 |
| 1901 rev = "" | 1901 rev = "" |
| 1902 if subcommand in ("good", "bad"): | 1902 if subcommand in ("good", "bad"): |
| 1903 dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList, | 1903 dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList, |
| 1940 | 1940 |
| 1941 # find the root of the repo | 1941 # find the root of the repo |
| 1942 repodir = dname | 1942 repodir = dname |
| 1943 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1943 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1944 repodir = os.path.dirname(repodir) | 1944 repodir = os.path.dirname(repodir) |
| 1945 if repodir == os.sep: | 1945 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1946 return | 1946 return |
| 1947 | 1947 |
| 1948 dia = HgDialog( | 1948 dia = HgDialog( |
| 1949 self.trUtf8('Removing files from the Mercurial repository only')) | 1949 self.trUtf8('Removing files from the Mercurial repository only')) |
| 1950 res = dia.startProcess(args, repodir) | 1950 res = dia.startProcess(args, repodir) |
| 1965 | 1965 |
| 1966 # find the root of the repo | 1966 # find the root of the repo |
| 1967 repodir = str(dname) | 1967 repodir = str(dname) |
| 1968 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1968 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1969 repodir = os.path.dirname(repodir) | 1969 repodir = os.path.dirname(repodir) |
| 1970 if repodir == os.sep: | 1970 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1971 return | 1971 return |
| 1972 | 1972 |
| 1973 dlg = HgBackoutDialog(self.tagsList, self.branchesList) | 1973 dlg = HgBackoutDialog(self.tagsList, self.branchesList) |
| 1974 if dlg.exec_() == QDialog.Accepted: | 1974 if dlg.exec_() == QDialog.Accepted: |
| 1975 rev, merge, date, user, message = dlg.getParameters() | 1975 rev, merge, date, user, message = dlg.getParameters() |
| 2009 | 2009 |
| 2010 # find the root of the repo | 2010 # find the root of the repo |
| 2011 repodir = str(dname) | 2011 repodir = str(dname) |
| 2012 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 2012 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 2013 repodir = os.path.dirname(repodir) | 2013 repodir = os.path.dirname(repodir) |
| 2014 if repodir == os.sep: | 2014 if os.path.splitdrive(repodir)[1] == os.sep: |
| 2015 return | 2015 return |
| 2016 | 2016 |
| 2017 self.serveDlg = HgServeDialog(self, repodir) | 2017 self.serveDlg = HgServeDialog(self, repodir) |
| 2018 self.serveDlg.show() | 2018 self.serveDlg.show() |
| 2019 | 2019 |
