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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7320
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.
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/log.py'
2--- breezy/log.py 2019-02-26 09:04:28 +0000
3+++ breezy/log.py 2019-06-07 08:08:02 +0000
4@@ -136,7 +136,6 @@
5
6 def show_log(branch,
7 lf,
8- specific_fileid=None,
9 verbose=False,
10 direction='reverse',
11 start_revision=None,
12@@ -154,9 +153,6 @@
13
14 :param lf: The LogFormatter object showing the output.
15
16- :param specific_fileid: If not None, list only the commits affecting the
17- specified file, rather than all commits.
18-
19 :param verbose: If True show added/changed/deleted/renamed files.
20
21 :param direction: 'reverse' (default) is latest to earliest; 'forward' is
22@@ -177,23 +173,12 @@
23 :param match: Dictionary of search lists to use when matching revision
24 properties.
25 """
26- # Convert old-style parameters to new-style parameters
27- if specific_fileid is not None:
28- file_ids = [specific_fileid]
29- else:
30- file_ids = None
31 if verbose:
32- if file_ids:
33- delta_type = 'partial'
34- else:
35- delta_type = 'full'
36+ delta_type = 'full'
37 else:
38 delta_type = None
39 if show_diff:
40- if file_ids:
41- diff_type = 'partial'
42- else:
43- diff_type = 'full'
44+ diff_type = 'full'
45 else:
46 diff_type = None
47
48@@ -213,10 +198,11 @@
49 raise errors.InvalidRevisionNumber(end_revision.revno)
50
51 # Build the request and execute it
52- rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,
53- start_revision=start_revision, end_revision=end_revision,
54- limit=limit, message_search=search,
55- delta_type=delta_type, diff_type=diff_type)
56+ rqst = make_log_request_dict(
57+ direction=direction,
58+ start_revision=start_revision, end_revision=end_revision,
59+ limit=limit, message_search=search,
60+ delta_type=delta_type, diff_type=diff_type)
61 Logger(branch, rqst).show(lf)
62
63
64@@ -1949,7 +1935,6 @@
65 to_file.write('Added Revisions:\n')
66 show_log(branch,
67 lf,
68- None,
69 verbose=False,
70 direction='forward',
71 start_revision=base_idx + 1,
72@@ -2034,7 +2019,7 @@
73 if new_history != []:
74 output.write('Added Revisions:\n')
75 start_revno = new_revno - len(new_history) + 1
76- show_log(branch, lf, None, verbose=False, direction='forward',
77+ show_log(branch, lf, verbose=False, direction='forward',
78 start_revision=start_revno)
79
80

Subscribers

People subscribed via source and target branches