Comment #1 on issue 3248 by [email protected]: rbt: svn client
incorrectly detects "history scheduled with commit", always requires
--svn-show-copies-as-adds=y/n
http://code.google.com/p/reviewboard/issues/detail?id=3248
Patch:
--- a/rbtools/clients/svn.py 2014-02-03 16:23:05.381608100 -0500
+++ b/rbtools/clients/svn.py 2014-02-12 15:07:36.649756000 -0500
@@ -281,7 +281,7 @@
svn_show_copies_as_adds = getattr(
self.options, 'svn_show_copies_as_adds', None)
- if self.history_scheduled_with_commit():
+ if self.history_scheduled_with_commit(cmd):
if svn_show_copies_as_adds is None:
sys.stderr.write("One or more files in your changeset has "
"history scheduled with commit. Please
try "
@@ -298,10 +298,18 @@
return ''.join(diff)
- def history_scheduled_with_commit(self):
+ def history_scheduled_with_commit(self, cmd):
""" Method to find if any file status has '+' in 4th column"""
- for p in execute(["svn", "st"], split_lines=True):
+ svn_st_params = ["svn", "st"]
+ try:
+ changelist_pos = cmd.index('--changelist')
+ svn_st_params.append('--cl')
+ svn_st_params.append(cmd[changelist_pos + 1])
+ except:
+ pass
+
+ for p in execute(svn_st_params, split_lines=True):
if p.startswith('A +'):
return True
return False
--
You received this message because this project is configured to send all
issue notifications to this address.
You may adjust your notification preferences at:
https://code.google.com/hosting/settings
--
You received this message because you are subscribed to the Google Groups
"reviewboard-issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/reviewboard-issues.
For more options, visit https://groups.google.com/groups/opt_out.
