http://svn.collab.net/viewvc/svn?view=rev&revision=19204
Blair
--- Begin Message ---Author: blair Date: Thu Apr 6 10:59:48 2006 New Revision: 19204 Modified: trunk/contrib/client-side/svnmerge.py Log: Remove the following pychecker warnings from svnmerge.py: svnmerge.py:727: Parameter (url) not used svnmerge.py:736: Local variable (logs) shadows global defined on line 144 svnmerge.py:742: Local variable (logs) shadows global defined on line 144 svnmerge.py:749: Local variable (logs) shadows global defined on line 144 svnmerge.py:750: Local variable (logs) shadows global defined on line 144 svnmerge.py:759: (dir) shadows builtin * contrib/client-side/svnmerge.py (construct_merged_log_message): Rename the 'logs' variable to 'messages'. Instead of passing in opts["head-url"] to get_commit_log(), use the 'url' argument instead. All callers of construct_merged_log_message() were passing opts["head-url"] as the url argument anyway. (get_default_head): Rename the 'dir' variable to 'directory'. Modified: trunk/contrib/client-side/svnmerge.py URL: http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge.py?pathrev=19204&r1=19203&r2=19204 ============================================================================== --- trunk/contrib/client-side/svnmerge.py (original) +++ trunk/contrib/client-side/svnmerge.py Thu Apr 6 10:59:48 2006 @@ -733,21 +733,21 @@ log message that is clearer in describing merges that contain other merges. Trailing newlines are removed from the embedded log messages.""" - logs = [''] + messages = [''] longest_sep = '' for r in revnums.sorted(): - message = get_commit_log(opts["head-url"], r) + message = get_commit_log(url, r) if message: message = rstrip(message, "\n") + "\n" - logs.append(prefix_lines(LOG_LINE_PREFIX, message)) + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) for match in LOG_SEPARATOR_RE.findall(message): sep = match[1] if len(sep) > len(longest_sep): longest_sep = sep longest_sep += LOG_SEPARATOR + "\n" - logs.append('') - return longest_sep.join(logs) + messages.append('') + return longest_sep.join(messages) def get_default_head(branch_dir, branch_props): """Return the default head for branch_dir (given its branch_props). Error @@ -756,13 +756,13 @@ error("no integration info available") props = branch_props.copy() - dir = url_to_rlpath(target_to_url(branch_dir)) + directory = url_to_rlpath(target_to_url(branch_dir)) # To make bidirectional merges easier, find the target's # repository local path so it can be removed from the list of # possible integration sources. - if props.has_key(dir): - del props[dir] + if props.has_key(directory): + del props[directory] if len(props) > 1: error('multiple heads found. ' @@ -1253,8 +1253,7 @@ def __call__(self, *args, **kwargs): return self.func(*args, **kwargs) - def __init__(self, global_opts, common_opts, command_table, - version=None): + def __init__(self, global_opts, common_opts, command_table, version=None): self.progname = NAME self.version = version.replace("%prog", self.progname) self.cwidth = console_width() - 2 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
--- End Message ---
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
