aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-cl-patch: fix --is-ancestor flag

Browse Source 
TBR=tandrii@chromium.org

Bug: 723787
Change-Id: Ie5017747f2070116774cd12ba0dd2ea531b2d0aa
Reviewed-on: https://chromium-review.googlesource.com/529547
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
changes/47/529547/3
Aaron Gable 9 years ago committed by Commit Bot
parent 2c376aa21b
commit bacbdb9a55
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
git_cl.py
Unescape Escape View File

@ -2796,10 +2796,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
clean, _ = RunGitWithCode(
['merge-base', '--ancestor', 'HEAD', 'origin/master'])
['merge-base', '--is-ancestor', 'HEAD', 'origin/master'])
if clean != 0:
clean, _ = RunGitWithCode(
['merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'])
['merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'])
if clean != 0:
confirm_or_exit(
'It looks like you\'re on a branch with some local commits.\n'

16
tests/git_cl_test.py
Unescape Escape View File

@ -2128,7 +2128,7 @@ class TestGitCl(TestCase):
self.calls += [
((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
'refs/changes/56/123456/7'],), ''),
((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
((['git', 'config', 'branch.master.gerritissue', '123456'],),
''),
@ -2147,7 +2147,7 @@ class TestGitCl(TestCase):
self.calls += [
((['git', 'fetch', 'https://host.googlesource.com/my/repo',
'refs/changes/56/123456/7'],), ''),
((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
((['git', 'config', 'branch.master.gerritissue', '123456'],),
''),
@ -2168,7 +2168,7 @@ class TestGitCl(TestCase):
self.calls += [
((['git', 'fetch', 'https://else.googlesource.com/my/repo',
'refs/changes/56/123456/1'],), ''),
((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
((['git', 'symbolic-ref', 'HEAD'],), 'master'),
((['git', 'config', 'branch.master.gerritissue', '123456'],),
@ -2191,7 +2191,7 @@ class TestGitCl(TestCase):
self.calls += [
((['git', 'fetch', 'https://else.googlesource.com/my/repo',
'refs/changes/56/123456/1'],), ''),
((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''),
((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
((['git', 'symbolic-ref', 'HEAD'],), 'master'),
((['git', 'config', 'branch.master.gerritissue', '123456'],),
@ -2212,9 +2212,9 @@ class TestGitCl(TestCase):
self.calls += [
((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
'refs/changes/56/123456/7'],), ''),
((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],),
CERR1),
((['git', 'merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'],),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'],),
CERR1),
(('ask_for_data',
'It looks like you\'re on a branch with some local commits.\n'
@ -2232,9 +2232,9 @@ class TestGitCl(TestCase):
self.calls += [
((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
'refs/changes/56/123456/7'],), ''),
((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],),
CERR1),
((['git', 'merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'],),
((['git', 'merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'],),
CERR1),
(('ask_for_data',
'It looks like you\'re on a branch with some local commits.\n'

Write Preview
Loading…
Cancel
Save