Add option --local allowing for merging changes into a local working copy....

Add option --local allowing for merging changes into a local working copy.

BUG=none
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=39603

[jochen (gone - plz use gerrit), 2010-02-19 11:37:14]

checkout e.g. 249 to src/ and run drover --merge 39367 --local src

please review

[M-A Ruel, 2010-02-19 14:03:18]

http://codereview.chromium.org/651022/diff/1/2
File drover.py (right):

http://codereview.chromium.org/651022/diff/1/2#newcode28
drover.py:28: --merge <revision> --local <path-to-checkout>
I think that --local should be a flag to treat the current directory as a local
checkout.

In fact, shouldn't this always be detected automatically?

e.g. when os.getcwd() is in a svn checkout, act as --local and bail out if there
is any modified files, otherwise do as before (sparse checkout)

http://codereview.chromium.org/651022/diff/1/2#newcode478
drover.py:478: if captureGcl("changes"):
I prefer to run svn status and look for modified files, ignoring '?' and 'X'
files.

[jochen (gone - plz use gerrit), 2010-02-19 16:42:59]

http://codereview.chromium.org/651022/diff/1/2
File drover.py (right):

http://codereview.chromium.org/651022/diff/1/2#newcode28
drover.py:28: --merge <revision> --local <path-to-checkout>
On 2010/02/19 14:03:20, Marc-Antoine Ruel wrote:
> I think that --local should be a flag to treat the current directory as a
local
> checkout.
> 
> In fact, shouldn't this always be detected automatically?
> 
> e.g. when os.getcwd() is in a svn checkout, act as --local and bail out if
there
> is any modified files, otherwise do as before (sparse checkout)

For the "normal" sparse checkout, you need to give the --branch option.
Ofcourse, I could make drover --merge 123 without --branch assume --local. but I
think it's better to make this explicit.

Anyway, I modified --local s.t. it doesn't take a path but assume cwd is the
checkout root.

http://codereview.chromium.org/651022/diff/1/2#newcode478
drover.py:478: if captureGcl("changes"):
On 2010/02/19 14:03:20, Marc-Antoine Ruel wrote:
> I prefer to run svn status and look for modified files, ignoring '?' and 'X'
> files.

Done.

[jochen (gone - plz use gerrit), 2010-02-22 08:29:36]

ping

On 2010/02/19 16:42:59, jochen wrote:
> http://codereview.chromium.org/651022/diff/1/2
> File drover.py (right):
> 
> http://codereview.chromium.org/651022/diff/1/2#newcode28
> drover.py:28: --merge <revision> --local <path-to-checkout>
> On 2010/02/19 14:03:20, Marc-Antoine Ruel wrote:
> > I think that --local should be a flag to treat the current directory as a
> local
> > checkout.
> > 
> > In fact, shouldn't this always be detected automatically?
> > 
> > e.g. when os.getcwd() is in a svn checkout, act as --local and bail out if
> there
> > is any modified files, otherwise do as before (sparse checkout)
> 
> For the "normal" sparse checkout, you need to give the --branch option.
> Ofcourse, I could make drover --merge 123 without --branch assume --local. but
I
> think it's better to make this explicit.
> 
> Anyway, I modified --local s.t. it doesn't take a path but assume cwd is the
> checkout root.
> 
> http://codereview.chromium.org/651022/diff/1/2#newcode478
> drover.py:478: if captureGcl("changes"):
> On 2010/02/19 14:03:20, Marc-Antoine Ruel wrote:
> > I prefer to run svn status and look for modified files, ignoring '?' and 'X'
> > files.
> 
> Done.

[M-A Ruel, 2010-02-22 16:17:57]

lgtm with a small nit

http://codereview.chromium.org/651022/diff/6/1004
File drover.py (right):

http://codereview.chromium.org/651022/diff/6/1004#newcode142
drover.py:142: if (not info.has_key("Repository Root") or
if info.get("Repository Root", None) != repo_root: