Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 3621
- 15f23ed3f216
- parent 3598
- 37fdb72a2388
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3620:2c8d96d47cda | 3621:15f23ed3f216 |
|---|---|
| 104 self.statusCache = {} | 104 self.statusCache = {} |
| 105 | 105 |
| 106 self.__commitData = {} | 106 self.__commitData = {} |
| 107 self.__commitDialog = None | 107 self.__commitDialog = None |
| 108 | 108 |
| 109 self.__wcng = True # assume new generation working copy | 109 self.__wcng = True |
| 110 # metadata format | 110 # assume new generation working copy metadata format |
| 111 | 111 |
| 112 def getPlugin(self): | 112 def getPlugin(self): |
| 113 """ | 113 """ |
| 114 Public method to get a reference to the plugin object. | 114 Public method to get a reference to the plugin object. |
| 115 | 115 |
| 691 while not os.path.isdir( | 691 while not os.path.isdir( |
| 692 os.path.join(repodir, self.adminDir)): | 692 os.path.join(repodir, self.adminDir)): |
| 693 repodir = os.path.dirname(repodir) | 693 repodir = os.path.dirname(repodir) |
| 694 if os.path.splitdrive(repodir)[1] == os.sep: | 694 if os.path.splitdrive(repodir)[1] == os.sep: |
| 695 return # oops, project is not version controlled | 695 return # oops, project is not version controlled |
| 696 while os.path.normcase(d) != \ | 696 while (os.path.normcase(d) != |
| 697 os.path.normcase(repodir) and \ | 697 os.path.normcase(repodir)) and \ |
| 698 (d not in tree2 + tree) and \ | 698 (d not in tree2 + tree) and \ |
| 699 (os.path.normcase(d) not in self.statusCache or | 699 (os.path.normcase(d) not in self.statusCache or |
| 700 self.statusCache[os.path.normcase(d)] == | 700 self.statusCache[os.path.normcase(d)] == |
| 701 self.canBeAdded): | 701 self.canBeAdded): |
| 702 tree2.append(d) | 702 tree2.append(d) |
| 771 while not os.path.isdir( | 771 while not os.path.isdir( |
| 772 os.path.join(repodir, self.adminDir)): | 772 os.path.join(repodir, self.adminDir)): |
| 773 repodir = os.path.dirname(repodir) | 773 repodir = os.path.dirname(repodir) |
| 774 if os.path.splitdrive(repodir)[1] == os.sep: | 774 if os.path.splitdrive(repodir)[1] == os.sep: |
| 775 return # oops, project is not version controlled | 775 return # oops, project is not version controlled |
| 776 while os.path.normcase(d) != \ | 776 while (os.path.normcase(d) != |
| 777 os.path.normcase(repodir) and \ | 777 os.path.normcase(repodir)) and \ |
| 778 (d not in tree) and \ | 778 (d not in tree) and \ |
| 779 (os.path.normcase(d) not in self.statusCache or | 779 (os.path.normcase(d) not in self.statusCache or |
| 780 self.statusCache[os.path.normcase(d)] == | 780 self.statusCache[os.path.normcase(d)] == |
| 781 self.canBeAdded): | 781 self.canBeAdded): |
| 782 tree.append(d) | 782 tree.append(d) |
| 796 repodir = dname | 796 repodir = dname |
| 797 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 797 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 798 repodir = os.path.dirname(repodir) | 798 repodir = os.path.dirname(repodir) |
| 799 if os.path.splitdrive(repodir)[1] == os.sep: | 799 if os.path.splitdrive(repodir)[1] == os.sep: |
| 800 return # oops, project is not version controlled | 800 return # oops, project is not version controlled |
| 801 while os.path.normcase(dname) != \ | 801 while (os.path.normcase(dname) != |
| 802 os.path.normcase(repodir) and \ | 802 os.path.normcase(repodir)) and \ |
| 803 (os.path.normcase(dname) not in self.statusCache or | 803 (os.path.normcase(dname) not in self.statusCache or |
| 804 self.statusCache[os.path.normcase(dname)] == | 804 self.statusCache[os.path.normcase(dname)] == |
| 805 self.canBeAdded): | 805 self.canBeAdded): |
| 806 # add directories recursively, if they aren't in the | 806 # add directories recursively, if they aren't in the |
| 807 # repository already | 807 # repository already |
