Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Issue 11839002: Add --allow-dirty option to "git cl upload" (Closed)

Created:
7 years, 11 months ago by Sam Clegg
Modified:
7 years, 9 months ago
Reviewers:
M-A Ruel
CC:
chromium-reviews, Dirk Pranke, cmp+cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Visibility:
Public.

Description

Add --allow-dirty option to "git cl upload" This is useful if you have minor local change that you don't want to commit/upload and also don't want to stash (e.g. if you are in the middle of the long build that relies on the cl and also on some local mods).

Patch Set 1 : #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+5 lines, -1 line) Patch
M git_cl.py View 3 chunks +5 lines, -1 line 2 comments Download

Messages

Total messages: 5 (0 generated)
Sam Clegg
https://codereview.chromium.org/11839002/diff/2001/git_cl.py File git_cl.py (right): https://codereview.chromium.org/11839002/diff/2001/git_cl.py#newcode1242 git_cl.py:1242: help='Allow upload even when there are uncommited changes') I ...
7 years, 11 months ago (2013-01-10 19:48:29 UTC) #1
M-A Ruel
I think it goes against the spirit of the tool and that's much better to ...
7 years, 11 months ago (2013-01-10 22:53:21 UTC) #2
cmp
sbc: Thanks, but let's not land this. We should not support many corner cases in ...
7 years, 11 months ago (2013-01-10 23:14:12 UTC) #3
Sam Clegg
On 2013/01/10 23:14:12, cmp wrote: > sbc: Thanks, but let's not land this. We should ...
7 years, 11 months ago (2013-01-10 23:54:11 UTC) #4
cmp
7 years, 11 months ago (2013-01-10 23:59:14 UTC) #5
On 2013/01/10 23:54:11, Sam Clegg wrote:
> BTW, what do you think about adding HEAD as a final arg to the git
> calls in git cl.  While working on this change I noticed that we 
> are relying on the working tree being clean and then doing
> 'git diff <upstream>' rather than 'git diff <upstream> HEAD'.  When
> the tree is clean of course these produce the same results.  However
> I think the former is always slower (especially on win32) as it has
> to stat all files in the working tree.
> 
> On my windows machine there is a big difference:
> 
> $ time git diff HEAD^1 HEAD > /dev/null
> 
> real    0m0.109s
> user    0m0.031s
> sys     0m0.077s
> $ time git diff HEAD^1 > /dev/null
> 
> real    0m2.012s
> user    0m0.312s
> sys     0m1.669s
> 
> Unless I'm wrong we *never* want to include changes from the working
> tree so it should be marginally more correct too.
> 
> thoughts?

Diffing to HEAD SGTM.  Feel free to upload another review to make that change,
or file a bug and we can take a look at what's required.

Powered by Google App Engine
This is Rietveld 408576698