A variant of the traceback still manifests in github’s master rbtools: $ rbt --version RBTools 0.6 alpha 0 (dev) $ rbt post -r 16600 --debug f27b632..260cdd7 DEBUG:root:Checking for a Subversion repository... DEBUG:root:Running: svn info --non-interactive DEBUG:root:Command exited with rc 1: ['svn', 'info', '--non-interactive'] svn: E155007: '/home/wjavins/git/stuff' is not a working copy --- DEBUG:root:Checking for a Git repository... DEBUG:root:Running: git rev-parse --git-dir DEBUG:root:Running: git config core.bare DEBUG:root:Running: git rev-parse --show-toplevel DEBUG:root:Running: git symbolic-ref -q HEAD DEBUG:root:Command exited with rc 1: ['git', 'symbolic-ref', '-q', 'HEAD'] --- DEBUG:root:Running: git svn info DEBUG:root:Running: git svn rebase -n DEBUG:root:repository info: Path: https://svn.mycorp.com/repo, Base path: /stuff/head, Supports changesets: False DEBUG:root:Running: git config --get reviewboard.url DEBUG:root:Command exited with rc 1: ['git', 'config', '--get', 'reviewboard.url'] --- DEBUG:root:Running: svn propget reviewboard:url https://svn.mycorp.com/repo Password for 'wjavins': DEBUG:root:Making HTTP GET request to http://reviewboard.mycorp.com/api/ DEBUG:root:Making HTTP GET request to http://reviewboard.mycorp.com/api/info/ DEBUG:root:Running: git rev-parse f27b632..260cdd7 DEBUG:root:Running: git branch -r --contains f27b63261022d89a014155ccd7e3523beb49f330 DEBUG:root:Running: git merge-base f27b63261022d89a014155ccd7e3523beb49f330 refs/remotes/git-svn DEBUG:root:Running: git diff --no-color --no-prefix -r -u f27b63261022d89a014155ccd7e3523beb49f330..260cdd79b8965318c57155044105959af30ebc61 DEBUG:root:Running: git svn find-rev f27b63261022d89a014155ccd7e3523beb49f330 Traceback (most recent call last): File "/usr/local/bin//rbt", line 9, in <module> load_entry_point('RBTools==0.6alpha0.dev', 'console_scripts', 'rbt')() File "/usr/local/lib/python2.7/dist-packages/RBTools-0.6alpha0.dev-py2.7.egg/rbtools/commands/main.py", line 127, in main command.run_from_argv([RB_MAIN] + args) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.6alpha0.dev-py2.7.egg/rbtools/commands/__init__.py", line 361, in run_from_argv exit_code = self.main(*args) or 0 File "/usr/local/lib/python2.7/dist-packages/RBTools-0.6alpha0.dev-py2.7.egg/rbtools/commands/post.py", line 679, in main extra_args=extra_args) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.6alpha0.dev-py2.7.egg/rbtools/clients/git.py", line 421, in diff diff_lines = self.make_diff(revisions['base'], revisions['tip'], files) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.6alpha0.dev-py2.7.egg/rbtools/clients/git.py", line 472, in make_diff return self.make_svn_diff(base, diff_lines) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.6alpha0.dev-py2.7.egg/rbtools/clients/git.py", line 486, in make_svn_diff if not rev and self.merge_base: AttributeError: 'GitClient' object has no attribute 'merge_base'
I’ll file a bug for this shortly. Walt From: reviewboard@googlegroups.com [mailto:reviewboard@googlegroups.com] On Behalf Of David Trowbridge Sent: Tuesday, February 25, 2014 12:41 AM To: reviewboard Subject: Re: rbt post + git-svn potential bug: Walt, Can you try with the code in rbtools git (the master branch)?. We've significantly redone the revision code for the upcoming 0.6 release, and it should work much better with git-svn. The syntax for revisions has changed a bit for 0.6. Revisions are now passed as arguments, so your command would be `rbt post B..E` -David On Tue, Feb 25, 2014 at 12:35 AM, Javins, Walt <walt.jav...@isilon.com<mailto:walt.jav...@isilon.com>> wrote: Hello, I was working with git-svn, and trying to post a diff further down the patch stack. E.g A (remotes/git-svn) B D E (HEAD) I want to post the diff containing commits D and E, but excluding A. When working with a pure git workflow, I’ll typically use the --parent or --revision-range flag: rbt post --parent B rbt post --revision-range B..E However, when I try to do so with git-svn, I see the following: $ rbt post -r 16600 --debug --revision-range 'f27b632...260cdd7' DEBUG:root:Checking for a Subversion repository... DEBUG:root:Running: svn info --non-interactive DEBUG:root:Command exited with rc 1: ['svn', 'info', '--non-interactive'] svn: E155007: '/home/wjavins/git/stuff is not a working copy --- DEBUG:root:Checking for a Git repository... DEBUG:root:Running: git rev-parse --git-dir DEBUG:root:Running: git config core.bare DEBUG:root:Running: git rev-parse --show-toplevel DEBUG:root:Running: git symbolic-ref -q HEAD DEBUG:root:Command exited with rc 1: ['git', 'symbolic-ref', '-q', 'HEAD'] --- DEBUG:root:Running: git svn info DEBUG:root:Running: git svn rebase -n DEBUG:root:repository info: Path: https://svn.mycorp.com/repo, Base path: /stuff/head, Supports changesets: False DEBUG:root:Running: git config --get reviewboard.url DEBUG:root:Command exited with rc 1: ['git', 'config', '--get', 'reviewboard.url'] --- DEBUG:root:Running: svn propget reviewboard:url https://svn.mycorp.com/repo Password for 'wjavins': DEBUG:root:Making HTTP GET request to http://reviewboard.mycorp.com/api/ DEBUG:root:Making HTTP GET request to http://reviewboard.mycorp.com/api/info/ DEBUG:root:Running: git rev-parse f27b632...260cdd7 DEBUG:root:Running: git merge-base 260cdd79b8965318c57155044105959af30ebc61 f27b63261022d89a014155ccd7e3523beb49f330 DEBUG:root:Running: git branch -r --contains f27b63261022d89a014155ccd7e3523beb49f330 DEBUG:root:Running: git merge-base f27b63261022d89a014155ccd7e3523beb49f330 refs/remotes/git-svn DEBUG:root:Running: git diff --no-color --no-prefix --no-ext-diff -r -u f27b63261022d89a014155ccd7e3523beb49f330..260cdd79b8965318c57155044105959af30ebc61 DEBUG:root:Running: git svn find-rev f27b63261022d89a014155ccd7e3523beb49f330 Traceback (most recent call last): File "/usr/lib/python2.7/pdb.py", line 1314, in main pdb._runscript(mainpyfile) File "/usr/lib/python2.7/pdb.py", line 1233, in _runscript self.run(statement) File "/usr/lib/python2.7/bdb.py", line 387, in run exec cmd in globals, locals File "<string>", line 1, in <module> File "/usr/local/bin/rbt", line 3, in <module> __requires__ = 'RBTools==0.5.7' File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/commands/main.py", line 127, in main command.run_from_argv([RB_MAIN] + args) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/commands/__init__.py", line 158, in run_from_argv exit_code = self.main(*args) or 0 File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/commands/post.py", line 626, in main files=args) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/utils/diffs.py", line 13, in get_diff repository_info) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/clients/git.py", line 483, in diff_between_revisions return self._diff([revision_range]) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/clients/git.py", line 450, in _diff diff_lines = self.make_diff(revisions['base'], revisions['tip']) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/clients/git.py", line 497, in make_diff return self.make_svn_diff(ancestor, diff_lines) File "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.7-py2.7.egg/rbtools/clients/git.py", line 524, in make_svn_diff if not rev and self.merge_base: AttributeError: 'GitClient' object has no attribute 'merge_base' I’ve searched around, and I can’t find where self.merge_base is set. I think this attr may be a figment of previous logic. Thoughts? Walt -- Get the Review Board Power Pack at http://www.reviewboard.org/powerpack/ --- Sign up for Review Board hosting at RBCommons: https://rbcommons.com/ --- Happy user? Let us know at http://www.reviewboard.org/users/ --- You received this message because you are subscribed to the Google Groups "reviewboard" group. To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard+unsubscr...@googlegroups.com<mailto:reviewboard%2bunsubscr...@googlegroups.com>. For more options, visit https://groups.google.com/groups/opt_out. -- Get the Review Board Power Pack at http://www.reviewboard.org/powerpack/ --- Sign up for Review Board hosting at RBCommons: https://rbcommons.com/ --- Happy user? Let us know at http://www.reviewboard.org/users/ --- You received this message because you are subscribed to the Google Groups "reviewboard" group. To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard+unsubscr...@googlegroups.com<mailto:reviewboard+unsubscr...@googlegroups.com>. For more options, visit https://groups.google.com/groups/opt_out. -- Get the Review Board Power Pack at http://www.reviewboard.org/powerpack/ --- Sign up for Review Board hosting at RBCommons: https://rbcommons.com/ --- Happy user? Let us know at http://www.reviewboard.org/users/ --- You received this message because you are subscribed to the Google Groups "reviewboard" group. To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
