Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

sync: pass p4 URL to p4pending dialog

The urls are not yet used, since those perfarce commands do not yet take a
p4 url as an argument (they use default-push or default)

Changeset bd28301ce41e…

Parent 246156bf372e…

by Steve Borho

Changes to 2 files · Browse files at bd28301ce41e Showing diff from parent 246156bf372e Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​p4pending.py Stacked
 
24
25
26
27
 
28
29
 
30
31
32
 
83
84
85
 
86
87
88
 
93
94
95
 
96
97
98
 
24
25
26
 
27
28
29
30
31
32
33
 
84
85
86
87
88
89
90
 
95
96
97
98
99
100
101
@@ -24,9 +24,10 @@
  makeLogVisible = pyqtSignal(bool)   showMessage = pyqtSignal(unicode)   - def __init__(self, repo, pending, parent): + def __init__(self, repo, pending, url, parent):   QDialog.__init__(self, parent)   self.repo = repo + self.url = url   self.pending = pending # dict of changelist -> hash tuple     layout = QVBoxLayout() @@ -83,6 +84,7 @@
    def submit(self):   assert(self.curcl.endswith('(pending)')) + # use self.url   cmdline = ['p4submit', '--verbose', '--repository',   self.repo.root, self.curcl[:-10]]   self.repo.incrementBusyCount() @@ -93,6 +95,7 @@
    def revert(self):   assert(self.curcl.endswith('(pending)')) + # use self.url   cmdline = ['p4revert', '--verbose', '--repository',   self.repo.root, self.curcl[:-10]]   self.repo.incrementBusyCount()
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
586
587
588
 
589
590
591
 
615
616
617
618
 
619
620
621
 
586
587
588
589
590
591
592
 
616
617
618
 
619
620
621
622
@@ -586,6 +586,7 @@
  self.run(cmdline, ('force', 'branch', 'rev'))     def p4pending(self): + p4url = self.currentUrl(False)   def finished(ret, output):   pending = {}   if ret == 0: @@ -615,7 +616,7 @@
  self.showMessage.emit(text)   if pending:   from tortoisehg.hgqt.p4pending import PerforcePending - dlg = PerforcePending(self.repo, pending, self) + dlg = PerforcePending(self.repo, pending, p4url, self)   dlg.showMessage.connect(self.showMessage)   dlg.output.connect(self.output)   dlg.makeLogVisible.connect(self.makeLogVisible)