Sure, git diff --ignore-submodules 506bda1ee6cc5d2c508d817fef82ead1e8812654 1d4b77f782974a30a978196f99ccd3f586894297 > rr
On Friday, December 16, 2016 at 7:02:19 PM UTC-6, David Trowbridge wrote: > > Can you share the command you used to generate the diff file? > > Is the diff generated from the same clone that the Review Board server is > connected to or a different one? > > -David > On Fri, Dec 16, 2016 at 4:58 PM Mark Wiederholt <[email protected] > <javascript:>> wrote: > >> Yes, I was talking about the files in the clone. I changed the >> permission on them and just updating the local .git objects with no luck >> same result. I am not sure about the objects in the remote area (which is >> where the >> reviewboard repository path is pointing to. >> >> >> >> >> On Friday, December 16, 2016 at 6:44:31 PM UTC-6, David Trowbridge wrote: >> >>> By read permissions, are you talking about the file permissions in the >>> clone, or the permissions on the objects themselves within the .git >>> directory? Review Board will need read access to everything in .git but it >>> doesn't care about the permissions in the working directory. >>> >>> -David >>> >> On Fri, Dec 16, 2016 at 4:28 PM Mark Wiederholt <[email protected]> >>> wrote: >>> >>>> >>>> >>>> On Friday, December 16, 2016 at 6:02:00 PM UTC-6, David Trowbridge >>>> wrote: >>>> >>>>> A few other questions: >>>>> >>>>> I'm guessing the repository in the Review Board admin is pointing to a >>>>> local clone (.git directory). Is that clone guaranteed to have the latest >>>>> committed revisions (either by being the upstream repository itself or >>>>> kept >>>>> in sync via a cron job)? If it's a clone, how often does it fetch from >>>>> the >>>>> upstream? >>>>> >>>>> Second, is your diff based on an upstream revision or are there >>>>> commits between the upstream revision and the diff you made? >>>>> >>>>> -David >>>>> >>>> On Fri, Dec 16, 2016 at 3:56 PM Mark Wiederholt <[email protected]> >>>>> wrote: >>>>> >>>>>> >>>>>> >>>> Correct, It is a local clone. But I just pulled down and fetched. The >>>> commit I changed is a local commit. It is based on a commit in the remote >>>> branch. >>>> >>>> I have generated other diff files on 2 remote commits. Certain files >>>> will work and certain others will not work (manually editing the diff >>>> output file to try each file change from one commit). I know sub projects >>>> commits wont work and take them out of the diff file. >>>> >>>> One of the files it cant see (but I can do a gitk on it and it is in >>>> the repo) did not have read permission for others. I changed it locally >>>> but >>>> did not push it out to the remote branch. Could that have an effect? >>>> >>>> >>>> >>>>> >>>>>> On Friday, December 16, 2016 at 4:20:36 PM UTC-6, David Trowbridge >>>>>> wrote: >>>>>> >>>>>>> It looks like you might be using --diff-filename with a diff you >>>>>>> made yourself? >>>>>>> >>>>>>> If that's the case, you need to add --full-index to your git diff >>>>>>> command. >>>>>>> >>>>>>> -David >>>>>>> >>>>>>> >>>>>>> On Fri, Dec 16, 2016 at 2:13 PM Mark Wiederholt < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>> >>>>>>>> I am having problems posting a reviewboard topic. It comes back >>>>>>>> with the following error. >>>>>>>> >>>>>>>> >>> RBTools 0.7.5 >>>>>>>> >>> Python 2.6.6 (r266:84292, May 22 2015, 08:34:51) >>>>>>>> [GCC 4.4.7 20120313 (Red Hat 4.4.7-15)] >>>>>>>> >>> Running on >>>>>>>> Linux-2.6.32-642.1.1.el6.x86_64-x86_64-with-redhat-6.8-Santiago >>>>>>>> >>> Home = /users/mwiederh >>>>>>>> >>> Current directory = /users/mwiederh/repos/ts-mfed >>>>>>>> >>> Checking for a Subversion repository... >>>>>>>> >>> Running: svn --non-interactive info >>>>>>>> >>> Command exited with rc 1: ['svn', '--non-interactive', u'info'] >>>>>>>> svn: '.' is not a working copy >>>>>>>> --- >>>>>>>> >>> Checking for a Git repository... >>>>>>>> >>> Running: git rev-parse --git-dir >>>>>>>> >>> Running: git config core.bare >>>>>>>> >>> Running: git rev-parse --show-toplevel >>>>>>>> >>> Running: git symbolic-ref -q HEAD >>>>>>>> >>> Running: git config --get branch.next.merge >>>>>>>> >>> Running: git config --get branch.next.remote >>>>>>>> >>> Running: git config --get remote.origin.url >>>>>>>> >>> repository info: Path: gitolite@deveod1:ts-mfed.git, Base path: >>>>>>>> , Supports changesets: False >>>>>>>> >>> Making HTTP GET request to https://infra1.ts21.gov/rb/api/ >>>>>>>> >>> Making HTTP GET request to >>>>>>>> https://infra1.ts21.gov/rb/api/validation/diffs/ >>>>>>>> >>> Cached response for HTTP GET >>>>>>>> https://infra1.ts21.gov/rb/api/validation/diffs/ expired and was >>>>>>>> modified >>>>>>>> >>> Making HTTP POST request to >>>>>>>> https://infra1.ts21.gov/rb/api/validation/diffs/ >>>>>>>> >>> Got API Error 207 (HTTP code 400): The file was not found in >>>>>>>> the repository. >>>>>>>> >>> Error data: {u'stat': u'fail', u'file': >>>>>>>> u'utils/src/ModeCommandProcess.cpp', u'err': {u'msg': u'The file was >>>>>>>> not >>>>>>>> found in the repository.', u'code': 207}, u'revision': u'6f94900'} >>>>>>>> Traceback (most recent call last): >>>>>>>> File "/usr/bin/rbt", line 9, in <module> >>>>>>>> load_entry_point('RBTools==0.7.5', 'console_scripts', 'rbt')() >>>>>>>> File >>>>>>>> "/usr/lib/python2.6/site-packages/RBTools-0.7.5-py2.6.egg/rbtools/commands/main.py", >>>>>>>> >>>>>>>> line 133, in main >>>>>>>> command.run_from_argv([RB_MAIN, command_name] + args) >>>>>>>> File >>>>>>>> "/usr/lib/python2.6/site-packages/RBTools-0.7.5-py2.6.egg/rbtools/commands/__init__.py", >>>>>>>> >>>>>>>> line 622, in run_from_argv >>>>>>>> exit_code = self.main(*args) or 0 >>>>>>>> File >>>>>>>> "/usr/lib/python2.6/site-packages/RBTools-0.7.5-py2.6.egg/rbtools/commands/post.py", >>>>>>>> >>>>>>>> line 754, in main >>>>>>>> (msg_prefix, e)) >>>>>>>> rbtools.commands.CommandError: Error validating diff >>>>>>>> >>>>>>>> utils/src/ModeCommandProcess.cpp: The file was not found in the >>>>>>>> repository. (HTTP 400, API Error 207) >>>>>>>> >>>>>>>> >>>>>>>> On some files it works others it doesnt. I checked the linux file >>>>>>>> and directory permissions all good. >>>>>>>> >>>>>>>> >>>>>>>> Any suggestions? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> >>>>>>>> >>>>>>>> Supercharge your Review Board with Power Pack: >>>>>>>> https://www.reviewboard.org/powerpack/ >>>>>>>> >>>>>>>> >>>>>>>> Want us to host Review Board for you? Check out RBCommons: >>>>>>>> https://rbcommons.com/ >>>>>>>> >>>>>>>> >>>>>>>> Happy user? Let us know! https://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 [email protected]. >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> For more options, visit https://groups.google.com/d/optout. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>> Thanks for the fast reply!! >>>>>> >>>>>> >>>>>> The --full-index option gives me another error every time for any >>>>>> file. >>>>>> >>>>>> >>>>>> >>>>>> git diff --full-index >>>>>> ad7e5c226f41c72087e5798573b28f03b4267df4..0a1c58734926eb5f68df6781c6af54ca61a7f8a4 >>>>>> >>>>>> > rr >>>>>> [USS] [5:54pm] b5speinfra1 [515] [/users/mwiederh/repos/ts-mfed] >>>>>> (next)$ more rr >>>>>> diff --git >>>>>> a/ad7e5c226f41c72087e5798573b28f03b4267df4..0a1c58734926eb5f68df6781c6af54ca61a7f8a4 >>>>>> >>>>>> b/0a1c58734926eb5f68df6781c6af54ca61a7f8a4 >>>>>> index >>>>>> ad7e5c226f41c72087e5798573b28f03b4267df4..0a1c58734926eb5f68df6781c6af54ca61a7f8a4 >>>>>> >>>>>> 100644 >>>>>> --- >>>>>> a/ad7e5c226f41c72087e5798573b28f03b4267df4..0a1c58734926eb5f68df6781c6af54ca61a7f8a4 >>>>>> >>>>>> >>>>>> +++ >>>>>> b/0a1c58734926eb5f68df6781c6af54ca61a7f8a4 >>>>>> >>>>>> >>>>>> @@ -3,6 +3,7 >>>>>> @@ >>>>>> >>>>>> >>>>>> >>>>>> * >>>>>> >>>>>> >>>>>> * Created on: July 17, >>>>>> 2013 >>>>>> >>>>>> >>>>>> * Author: >>>>>> dstrauss >>>>>> >>>>>> >>>>>> + * >>>>>> changeit >>>>>> >>>>>> >>>>>> >>>>>> */ >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> #include >>>>>> "../include/ModeCommandProcess.hh" >>>>>> >>>>>> >>>>>> [USS] [5:54pm] b5speinfra1 [516] [/users/mwiederh/repos/ts-mfed] >>>>>> (next)$ rbt post -dp --guess-fields=yes --diff-filename=rr --branch=next >>>>>> --repository-type git >>>>>> >>>>>> >>> RBTools >>>>>> 0.7.5 >>>>>> >>>>>> >>>>>> >>>>>> >>> Python 2.6.6 (r266:84292, May 22 2015, >>>>>> 08:34:51) >>>>>> >>>>>> >>>>>> [GCC 4.4.7 20120313 (Red Hat >>>>>> 4.4.7-15)] >>>>>> >>>>>> >>>>>> >>> Running on >>>>>> Linux-2.6.32-642.1.1.el6.x86_64-x86_64-with-redhat-6.8-Santiago >>>>>> >>> Home = /users/mwiederh >>>>>> >>> Current directory = /users/mwiederh/repos/ts-mfed >>>>>> >>> Checking for a Git repository... >>>>>> >>> Running: git rev-parse --git-dir >>>>>> >>> Running: git config core.bare >>>>>> >>> Running: git rev-parse --show-toplevel >>>>>> >>> Running: git symbolic-ref -q HEAD >>>>>> >>> Running: git config --get branch.next.merge >>>>>> >>> Running: git config --get branch.next.remote >>>>>> >>> Running: git config --get remote.next.url >>>>>> >>> Command exited with rc 1: ['git', 'config', '--get', >>>>>> u'remote.next.url'] >>>>>> --- >>>>>> >>> Running: git config --get remote.next.url >>>>>> >>> Command exited with rc 1: ['git', 'config', '--get', >>>>>> u'remote.next.url'] >>>>>> --- >>>>>> >>> repository info: Path: /users/mwiederh/repos/ts-mfed/.git, Base >>>>>> path: , Supports changesets: False >>>>>> >>>>>> >>> Making HTTP GET request to https://infra1.ts21.gov/rb/api/ >>>>>> >>> Making HTTP GET request to >>>>>> https://nfra1.ts21.gov/rb/api/validation/diffs/ >>>>>> >>>>>> >>> Cached response for HTTP GET >>>>>> https://infra1.ts21.gov/rb/api/validation/diffs/ expired and was >>>>>> modified >>>>>> >>> Making HTTP POST request to >>>>>> https://infra1.ts21.gov/rb/api/validation/diffs/ >>>>>> >>> Got API Error 224 (HTTP code 400): error: unable to find >>>>>> ad7e5c226f41c72087e5798573b28f03b4267df4 >>>>>> fatal: git cat-file ad7e5c226f41c72087e5798573b28f03b4267df4: bad file >>>>>> >>>>>> >>> Error data: {u'stat': u'fail', u'err': {u'msg': u'error: unable >>>>>> to find ad7e5c226f41c72087e5798573b28f03b4267df4\nfatal: git cat-file >>>>>> ad7e5c226f41c72087e5798573b28f03b4267df4: bad file\n', u'code': 224}} >>>>>> >>>>>> Traceback (most recent call last): >>>>>> File "/usr/bin/rbt", line 9, in <module> >>>>>> load_entry_point('RBTools==0.7.5', 'console_scripts', 'rbt')() >>>>>> File >>>>>> "/usr/lib/python2.6/site-packages/RBTools-0.7.5-py2.6.egg/rbtools/commands/main.py", >>>>>> >>>>>> line 133, in main >>>>>> command.run_from_argv([RB_MAIN, command_name] + args) >>>>>> File >>>>>> "/usr/lib/python2.6/site-packages/RBTools-0.7.5-py2.6.egg/rbtools/commands/__init__.py", >>>>>> >>>>>> line 622, in run_from_argv >>>>>> exit_code = self.main(*args) or 0 >>>>>> File >>>>>> "/usr/lib/python2.6/site-packages/RBTools-0.7.5-py2.6.egg/rbtools/commands/post.py", >>>>>> >>>>>> line 754, in main >>>>>> (msg_prefix, e)) >>>>>> rbtools.commands.CommandError: Error validating diff >>>>>> >>>>>> error: unable to find ad7e5c226f41c72087e5798573b28f03b4267df4 >>>>>> fatal: git cat-file ad7e5c226f41c72087e5798573b28f03b4267df4: bad file >>>>>> (HTTP 400, API Error 224) >>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Supercharge your Review Board with Power Pack: >>>>>> https://www.reviewboard.org/powerpack/ >>>>>> Want us to host Review Board for you? Check out RBCommons: >>>>>> https://rbcommons.com/ >>>>>> Happy user? Let us know! https://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 [email protected]. >>>>>> For more options, visit https://groups.google.com/d/optout. >>>>>> >>>>> -- >>>> Supercharge your Review Board with Power Pack: >>>> https://www.reviewboard.org/powerpack/ >>>> Want us to host Review Board for you? Check out RBCommons: >>>> https://rbcommons.com/ >>>> Happy user? Let us know! https://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 [email protected]. >>>> For more options, visit https://groups.google.com/d/optout. >>>> >>> -- >> Supercharge your Review Board with Power Pack: >> https://www.reviewboard.org/powerpack/ >> Want us to host Review Board for you? Check out RBCommons: >> https://rbcommons.com/ >> Happy user? Let us know! https://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 [email protected] <javascript:>. >> For more options, visit https://groups.google.com/d/optout. >> > -- Supercharge your Review Board with Power Pack: https://www.reviewboard.org/powerpack/ Want us to host Review Board for you? Check out RBCommons: https://rbcommons.com/ Happy user? Let us know! https://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 [email protected]. For more options, visit https://groups.google.com/d/optout.
