This seems fixable. We just need to update the MercurialClient code to have an 
apply_patch function that does the right thing.

Do you know off-hand if ‘hg patch’ will accept a git diff and apply it without 
requiring a -p parameter? If so, we just need to invoke that.

Christian

-- 
Christian Hammond - christ...@beanbaginc.com
Review Board - http://www.reviewboard.org
Beanbag, Inc. - http://www.beanbaginc.com

On June 18, 2014 at 7:12:19 PM, Bruce Cran (bruce.c...@gmail.com) wrote:

Sorry, it's not actually git but mercurial I'm having trouble with.

After running 'rbt post' I run 'rbt patch <reviewid>' and get the error:

Patch is being applied from request 41123 with diff revision  1.
Failed to execute command: ['patch', '-i', '/tmp/tmps2NVdI']
can't find file to patch at input line 4
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r 7802e325d133 -r 967f7807ca97 jenkins/pyfile.py
|--- a/jenkins/pyfile.py       Wed Jun 18 16:35:16 2014 -0600
|+++ b/jenkins/pyfile.py       Wed Jun 18 20:01:56 2014 -0600
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored

--
Bruce

On Wed, Jun 18, 2014 at 6:47 PM, David Trowbridge <trowb...@gmail.com> wrote:

Bruce,

I use 'rbt patch' with git all the time without specifying --px. What in 
particular are you seeing?

-David


On Wed, Jun 18, 2014 at 7:58 AM, Bruce Cran <bruce.c...@gmail.com> wrote:
I've been trying to use the 'rbt patch' command, and it seems that 
_get_p_number() is only for subversion repositories. 

Since diffs are commonly created with a prefix, and git defaults to adding a/ 
and b/, should we automatically try, or retry, using 'patch -p1' without the 
user needing to specify '--px 1'?
--
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/d/optout.

-- 
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/d/optout.

Reply via email to