Merge lp:~jelmer/brz/log-unused-arg into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/log-unused-arg
Merge into: lp:brz
Diff against target: 78 lines (+8/-23)
1 file modified
breezy/log.py (+8/-23)
To merge this branch: bzr merge lp:~jelmer/brz/log-unused-arg
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+368505@code.launchpad.net

Commit message

Remove unused argument specific_fileid from show_log.

Description of the change

Remove unused argument specific_fileid from show_log.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/log.py'
--- breezy/log.py 2019-02-26 09:04:28 +0000
+++ breezy/log.py 2019-06-07 08:08:02 +0000
@@ -136,7 +136,6 @@
136136
137def show_log(branch,137def show_log(branch,
138 lf,138 lf,
139 specific_fileid=None,
140 verbose=False,139 verbose=False,
141 direction='reverse',140 direction='reverse',
142 start_revision=None,141 start_revision=None,
@@ -154,9 +153,6 @@
154153
155 :param lf: The LogFormatter object showing the output.154 :param lf: The LogFormatter object showing the output.
156155
157 :param specific_fileid: If not None, list only the commits affecting the
158 specified file, rather than all commits.
159
160 :param verbose: If True show added/changed/deleted/renamed files.156 :param verbose: If True show added/changed/deleted/renamed files.
161157
162 :param direction: 'reverse' (default) is latest to earliest; 'forward' is158 :param direction: 'reverse' (default) is latest to earliest; 'forward' is
@@ -177,23 +173,12 @@
177 :param match: Dictionary of search lists to use when matching revision173 :param match: Dictionary of search lists to use when matching revision
178 properties.174 properties.
179 """175 """
180 # Convert old-style parameters to new-style parameters
181 if specific_fileid is not None:
182 file_ids = [specific_fileid]
183 else:
184 file_ids = None
185 if verbose:176 if verbose:
186 if file_ids:177 delta_type = 'full'
187 delta_type = 'partial'
188 else:
189 delta_type = 'full'
190 else:178 else:
191 delta_type = None179 delta_type = None
192 if show_diff:180 if show_diff:
193 if file_ids:181 diff_type = 'full'
194 diff_type = 'partial'
195 else:
196 diff_type = 'full'
197 else:182 else:
198 diff_type = None183 diff_type = None
199184
@@ -213,10 +198,11 @@
213 raise errors.InvalidRevisionNumber(end_revision.revno)198 raise errors.InvalidRevisionNumber(end_revision.revno)
214199
215 # Build the request and execute it200 # Build the request and execute it
216 rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,201 rqst = make_log_request_dict(
217 start_revision=start_revision, end_revision=end_revision,202 direction=direction,
218 limit=limit, message_search=search,203 start_revision=start_revision, end_revision=end_revision,
219 delta_type=delta_type, diff_type=diff_type)204 limit=limit, message_search=search,
205 delta_type=delta_type, diff_type=diff_type)
220 Logger(branch, rqst).show(lf)206 Logger(branch, rqst).show(lf)
221207
222208
@@ -1949,7 +1935,6 @@
1949 to_file.write('Added Revisions:\n')1935 to_file.write('Added Revisions:\n')
1950 show_log(branch,1936 show_log(branch,
1951 lf,1937 lf,
1952 None,
1953 verbose=False,1938 verbose=False,
1954 direction='forward',1939 direction='forward',
1955 start_revision=base_idx + 1,1940 start_revision=base_idx + 1,
@@ -2034,7 +2019,7 @@
2034 if new_history != []:2019 if new_history != []:
2035 output.write('Added Revisions:\n')2020 output.write('Added Revisions:\n')
2036 start_revno = new_revno - len(new_history) + 12021 start_revno = new_revno - len(new_history) + 1
2037 show_log(branch, lf, None, verbose=False, direction='forward',2022 show_log(branch, lf, verbose=False, direction='forward',
2038 start_revision=start_revno)2023 start_revision=start_revno)
20392024
20402025

Subscribers

People subscribed via source and target branches