Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset bcf75adfe332…

Parents 474a14363dee…

Parents f5b19288aba0…

by Steve Borho

Changes to 5 files · Browse files at bcf75adfe332 Showing diff from parent 474a14363dee f5b19288aba0 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​about.py Stacked
 
146
147
148
149
 
150
151
152
 
146
147
148
 
149
150
151
152
@@ -146,7 +146,7 @@
  if platform == p:   upgradeurl = _url.strip()   break - except (IndexError, ImportError): + except (IndexError, ImportError, ValueError):   pass   try:   thgv = version.version()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​postreview.py Stacked
 
36
37
38
 
 
 
 
39
40
41
42
43
44
45
 
 
 
 
 
 
 
 
 
46
47
48
49
50
 
 
 
 
51
52
53
 
 
54
55
 
56
57
58
 
36
37
38
39
40
41
42
43
 
 
 
 
 
 
44
45
46
47
48
49
50
51
52
53
 
 
 
 
54
55
56
57
58
59
60
61
62
63
 
64
65
66
67
@@ -36,23 +36,32 @@
  msg = _("Invalid Settings - Please provide your ReviewBoard username")   else:   rb = extensions.find("reviewboard") + plugin_msg = _("Invalid reviewboard plugin. Please download the " + + "mercurial reviewboard plugin version 3.5 or higher " + + "from the website below.\n\n" + + "http://bitbucket.org/mdelagra/mercurial-reviewboard/")   try: - pwd = self.dialog.password - #if we don't have a password send something here to skip - #the cli getpass in the extension. We will set the password - #later - if not pwd: - pwd = "None" + if float(rb.__version__[:3]) < 3.5: + msg = plugin_msg + else: + pwd = self.dialog.password + #if we don't have a password send something here to skip + #the cli getpass in the extension. We will set the password + #later + if not pwd: + pwd = "None"   - self.reviewboard = rb.make_rbclient(self.dialog.server, - self.dialog.user, - pwd) - self.loadCombos() + self.reviewboard = rb.make_rbclient(self.dialog.server, + self.dialog.user, + pwd) + self.loadCombos()     except rb.ReviewBoardError, e:   msg = e.msg + except AttributeError: + msg = plugin_msg   - self.dialog._error_message = msg + self.dialog.error_message = msg     def loadCombos(self):   #Get the index of a users previously selected repo id
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
760
761
762
 
763
764
765
 
760
761
762
763
764
765
766
@@ -760,6 +760,7 @@
  self.filterbar.loadSettings(s)   self.repotabs_splitter.restoreState(   s.value('repowidget/splitter-'+repoid).toByteArray()) + QTimer.singleShot(0, lambda: self.toolbarVisibilityChanged.emit())     def okToContinue(self):   if not self.commitDemand.forward('canExit', default=True):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
239
240
241
242
243
 
 
244
245
246
 
239
240
241
 
 
242
243
244
245
246
@@ -239,8 +239,8 @@
  if changeid in self.thgmqunappliedpatches:   q = self.mq # must have mq to pass the previous if   return genPatchContext(self, q.join(changeid), rev=changeid) - elif type(changeid) is str and os.path.isabs(changeid) and \ - os.path.isfile(changeid): + elif type(changeid) is str and '\0' not in changeid and \ + os.path.isabs(changeid) and os.path.isfile(changeid):   return genPatchContext(repo, changeid)     changectx = super(thgrepository, self).changectx(changeid)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
318
319
320
321
 
322
323
324
 
325
326
327
 
328
329
330
 
331
332
333
 
318
319
320
 
321
322
323
 
324
325
326
 
327
328
329
 
330
331
332
333
@@ -318,16 +318,16 @@
  self.menuView.addMenu(menu)     newaction(_('Incoming'), self._repofwd('incoming'), icon='hg-incoming', - tooltip=_('Check for incoming changes from default pull target'), + tooltip=_('Check for incoming changes from selected URL'),   enabled='repoopen', toolbar='sync')   newaction(_('Pull'), self._repofwd('pull'), icon='hg-pull', - tooltip=_('Pull incoming changes from default pull target'), + tooltip=_('Pull incoming changes from selected URL'),   enabled='repoopen', toolbar='sync')   newaction(_('Outgoing'), self._repofwd('outgoing'), icon='hg-outgoing', - tooltip=_('Detect outgoing changes to default push target'), + tooltip=_('Detect outgoing changes to selected URL'),   enabled='repoopen', toolbar='sync')   newaction(_('Push'), self._repofwd('push'), icon='hg-push', - tooltip=_('Push outgoing changes to default push target'), + tooltip=_('Push outgoing changes to selected URL'),   enabled='repoopen', toolbar='sync')     self.updateMenu()