Merge lp:~craighewetson-deactivatedaccount/bzr-explorer/missing into lp:~bzr-explorer-dev/bzr-explorer/trunk.old

Proposed by Craig Hewetson
Status: Rejected
Rejected by: Ian Clatworthy
Proposed branch: lp:~craighewetson-deactivatedaccount/bzr-explorer/missing
Merge into: lp:~bzr-explorer-dev/bzr-explorer/trunk.old
Diff against target: 130 lines
4 files modified
lib/app_suite.py (+1/-0)
lib/explorer.py (+7/-0)
lib/ui_explorer.py (+11/-0)
ui/explorer.ui (+19/-0)
To merge this branch: bzr merge lp:~craighewetson-deactivatedaccount/bzr-explorer/missing
Reviewer Review Type Date Requested Status
Ian Clatworthy Needs Information
Review via email: mp+12441@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) wrote :

Added a missing action, just basically calls "qlog (%root)s :parent".
Maybe in the future a missing menu can be available to allow the user to select the remote branch rather than always using :parent as default.

Also this action will probably not work if the parent no longer exists.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

This is an interesting idea. I seem to recall having a conversation about this (and agreeing on some variation?) but I can't recall the details. Is this still your preferred approach?

Here's something to consider/discuss. What about adding a 'log' icon to the "Missing Revisions" tab in the repo view that provides this functionality if and when there are missing revisions? We could do something similar on "Local Changes" as well? Just a thought.

review: Needs Information
Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) wrote :

We discussed having a pop-up dialog allowing the user to select the branch
to "compare" with (bzr qlog . :parent, or bzr qlog . :push etc)

But I haven't had time to create a popup dialog and probably won't have time
either, but your suggestion to add a log action to the missing tab makes
alot of sense.
Will this missing tab also be available from the user's workspace? Because
this is probably where it will make the most sense to use it from.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Could you try configuring a tool in your toolbox for this now?

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

I believe this is now obsolete (given support for custom tools) so I'll mark it as rejected.

Unmerged revisions

288. By Craig Hewetson <email address hidden>

Show Missing action on a branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/app_suite.py'
2--- lib/app_suite.py 2009-09-11 13:28:53 +0000
3+++ lib/app_suite.py 2009-09-25 21:45:21 +0000
4@@ -177,6 +177,7 @@
5 "export": "bzr qexport --ui-mode",
6 "info": "bzr qinfo",
7 "list": "bzr qbrowse",
8+ "missing": "bzr qlog %(root)s :parent",
9 "log": "bzr qlog %(selected)s",
10 "merge": "bzr qmerge --ui-mode",
11 "push": "bzr qpush --ui-mode",
12
13=== modified file 'lib/explorer.py'
14--- lib/explorer.py 2009-09-21 07:41:50 +0000
15+++ lib/explorer.py 2009-09-25 21:45:21 +0000
16@@ -287,6 +287,7 @@
17 (self.ui.action_Send, self.do_bzr_send),
18 (self.ui.action_Export, self.do_bzr_export),
19 (self.ui.action_List, self.do_bzr_list),
20+ (self.ui.action_Missing, self.do_bzr_missing),
21 (self.ui.action_Log, self.do_bzr_log),
22 (self.ui.action_Annotate, self.do_bzr_annotate),
23 (self.ui.action_Information, self.do_bzr_info),
24@@ -392,6 +393,7 @@
25 self.ui.action_Export: ['branch', 'bound-branch', 'checkout'],
26 # Bazaar/Explore ...
27 self.ui.action_List: ['branch', 'bound-branch', 'checkout'],
28+ self.ui.action_Missing: ['branch', 'bound-branch', 'checkout'],
29 self.ui.action_Log: ['branch', 'bound-branch', 'checkout'],
30 self.ui.action_Annotate: ['branch', 'bound-branch', 'checkout'],
31 self.ui.action_Information: ['branch', 'bound-branch', 'checkout', 'repository'],
32@@ -446,6 +448,7 @@
33 self.ui.action_Export: "export",
34 # Bazaar/Explore ...
35 self.ui.action_List: "list",
36+ self.ui.action_Missing: "missing",
37 self.ui.action_Log: "log",
38 self.ui.action_Annotate: "annotate",
39 self.ui.action_Information: "info",
40@@ -1198,6 +1201,7 @@
41 self.ui.action_Push,
42 self.ui.action_Send,
43 None,
44+ self.ui.action_Missing,
45 self.ui.action_Log,
46 self.ui.action_Work,
47 ] + tail_actions
48@@ -1369,6 +1373,9 @@
49 def do_bzr_list(self):
50 self.run_bzr_gui("list")
51
52+ def do_bzr_missing(self):
53+ self.run_bzr_gui("missing")
54+
55 def do_bzr_log(self):
56 self.run_bzr_gui("log")
57
58
59=== modified file 'lib/ui_explorer.py'
60--- lib/ui_explorer.py 2009-09-15 12:18:50 +0000
61+++ lib/ui_explorer.py 2009-09-25 21:45:21 +0000
62@@ -165,6 +165,12 @@
63 icon17.addPixmap(QtGui.QPixmap(":/tango/16x16/actions/edit-find.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
64 self.action_List.setIcon(icon17)
65 self.action_List.setObjectName("action_List")
66+ self.action_Missing = QtGui.QAction(MainWindow)
67+ icon18 = QtGui.QIcon()
68+ icon18.addPixmap(QtGui.QPixmap(":/tango/16x16/actions/appointment-new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
69+ self.action_Missing = QtGui.QAction(MainWindow)
70+ self.action_Missing.setIcon(icon18)
71+ self.action_Missing.setObjectName("action_Missing")
72 self.action_Log = QtGui.QAction(MainWindow)
73 icon18 = QtGui.QIcon()
74 icon18.addPixmap(QtGui.QPixmap(":/tango/16x16/actions/appointment-new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
75@@ -416,6 +422,7 @@
76 self.menu_Collaborate.addAction(self.action_Tag)
77 self.menu_Collaborate.addAction(self.action_Export)
78 self.menu_Explore.addAction(self.action_Log)
79+ self.menu_Explore.addAction(self.action_Missing)
80 self.menu_Explore.addAction(self.action_List)
81 self.menu_Explore.addSeparator()
82 self.menu_Explore.addAction(self.action_Information)
83@@ -575,6 +582,10 @@
84 self.action_List.setIconText(gettext("Browse"))
85 self.action_List.setToolTip(gettext("Browse Items"))
86 self.action_List.setStatusTip(gettext("Browse files, directories, etc. in a branch"))
87+ self.action_Missing.setText(gettext("&Missing Revision"))
88+ self.action_Missing.setIconText(gettext("Missing"))
89+ self.action_Missing.setToolTip(gettext("Show Missing Revision"))
90+ self.action_Missing.setStatusTip(gettext("Browse missing revisions between this branch its parent"))
91 self.action_Log.setText(gettext("&Log History"))
92 self.action_Log.setIconText(gettext("Log"))
93 self.action_Log.setToolTip(gettext("Log History"))
94
95=== modified file 'ui/explorer.ui'
96--- ui/explorer.ui 2009-09-15 12:18:50 +0000
97+++ ui/explorer.ui 2009-09-25 21:45:21 +0000
98@@ -112,6 +112,7 @@
99 <normaloff>:/tango/16x16/actions/system-search.png</normaloff>:/tango/16x16/actions/system-search.png</iconset>
100 </property>
101 <addaction name="action_Log"/>
102+ <addaction name="action_Missing"/>
103 <addaction name="action_List"/>
104 <addaction name="separator"/>
105 <addaction name="action_Information"/>
106@@ -548,6 +549,24 @@
107 <string>Browse files, directories, etc. in a branch</string>
108 </property>
109 </action>
110+ <action name="action_Missing">
111+ <property name="icon">
112+ <iconset resource="../data/explorer.qrc">
113+ <normaloff>:/tango/16x16/actions/appointment-new.png</normaloff>:/tango/16x16/actions/appointment-new.png</iconset>
114+ </property>
115+ <property name="text">
116+ <string>&amp;Missing Revision</string>
117+ </property>
118+ <property name="iconText">
119+ <string>Missing</string>
120+ </property>
121+ <property name="toolTip">
122+ <string>Show Missing Revisions</string>
123+ </property>
124+ <property name="statusTip">
125+ <string>Browse missing revisions between this branch its parent</string>
126+ </property>
127+ </action>
128 <action name="action_Log">
129 <property name="icon">
130 <iconset resource="../data/explorer.qrc">

Subscribers

People subscribed via source and target branches