Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
14602017:
Allow branches without upstream. (Closed)
|
Created:
7 years, 7 months ago by groby-ooo-7-16 Modified:
7 years, 7 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:
http://src.chromium.org/chrome/trunk/tools/depot_tools/ Visibility:
Public. |
DescriptionAllow branches without upstream.
Clean up formatting a bit.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=197773
Patch Set 1 #
Total comments: 6
Patch Set 2 : #Messages
Total messages: 8 (0 generated)
PTAL
lgtm with nits https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune File git_utils/git-tree-prune (right): https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune#newc... git_utils/git-tree-prune:33: def __init__(self, name, upstream = None): upstream=None https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune#newc... git_utils/git-tree-prune:55: and not self._upstream is None the style should be: if (self._issue_status != 'pending' and self._upstream and not self.GetDistance()[0] and ... https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune#newc... git_utils/git-tree-prune:62: if self._upstream is None: if not self._upstream since '' is also False
https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune File git_utils/git-tree-prune (right): https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune#newc... git_utils/git-tree-prune:33: def __init__(self, name, upstream = None): On 2013/05/02 00:02:22, Marc-Antoine Ruel wrote: > upstream=None Done. https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune#newc... git_utils/git-tree-prune:55: and not self._upstream is None On 2013/05/02 00:02:22, Marc-Antoine Ruel wrote: > the style should be: > > if (self._issue_status != 'pending' and > self._upstream and > not self.GetDistance()[0] and > ... Done. https://codereview.chromium.org/14602017/diff/1/git_utils/git-tree-prune#newc... git_utils/git-tree-prune:62: if self._upstream is None: On 2013/05/02 00:02:22, Marc-Antoine Ruel wrote: > if not self._upstream > > since '' is also False Done.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/groby@chromium.org/14602017/5001
Presubmit check for 14602017-5001 failed and returned exit status 1. INFO:root:Found 1 file(s). INFO:PRESUBMIT:Skipping pylint: no matching changes. Running presubmit commit checks ... Running /b/commit-queue/workdir/tools/depot_tools/PRESUBMIT.py Running tests/gclient_utils_test.py Running tests/watchlists_unittest.py Running tests/checkout_test.py Running tests/scm_unittest.py Running tests/gcl_unittest.py Running tests/patch_test.py Running tests/fix_encoding_test.py Running tests/presubmit_unittest.py Running tests/trychange_unittest.py Running tests/rietveld_test.py Running tests/owners_unittest.py Running tests/breakpad_unittest.py Running tests/gclient_test.py Running tests/gclient_smoketest.py Running tests/subprocess2_test.py Running tests/git_cl_test.py Running tests/gclient_scm_test.py INFO:root:/usr/bin/python /b/google_appengine/dev_appserver.py . --port 8080 --storage /tmp/rietveld_testWBoOOJ --clear_search_indexes --skip_sdk_update_check Setting up test upstream git repo... Setting up test git repo... TESTING: uploading to bogus server test | 1 + 1 file changed, 1 insertion(+) Using 50% similarity for rename/copy detection. Override with --similarity. Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies Running presubmit upload checks ... Presubmit checks passed. Upload server: http://bogus.example.com:80 (change with -s/--server) Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies Got exception while uploading -- saving description to /home/chrome-bot/.git_cl_description_backup TESTING: description was backed up PASS Setting up test upstream git repo... Setting up test git repo... TESTING: git-cl upload wants a server TESTING: git-cl status has no issue TESTING: upload succeeds (needs a server running on localhost) WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. TESTING: git-cl status now knows the issue % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 77 0 0 100 77 0 1333 --:--:-- --:--:-- --:--:-- 1350 TESTING: Base URL contains branch name TESTING: git-cl push ok Using 50% similarity for rename/copy detection. Override with --similarity. Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies Running presubmit commit checks ... Presubmit checks passed. Description: 'foo-quux\n\nReview URL: http://localhost:8080/5629499534213120' Closing issue (you may be prompted for your codereview password)... TESTING: committed code has proper description TESTING: issue no longer has a branch TESTING: upstream repo has our commit PASS Setting up test SVN repo... Setting up test git-svn repo... The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to Branch feature_branch set up to track local ref refs/remotes/trunk. TESTING: Guessing upstream branch for refs/remotes/trunk The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to Branch feature_branch set up to track local ref refs/remotes/some_branch. TESTING: Guessing upstream branch for refs/remotes/some_branch PASS Setting up test SVN repo... Setting up test git-svn repo... TESTING: upload succeeds WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. TESTING: git-cl dcommits ok Using 50% similarity for rename/copy detection. Override with --similarity. Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies Running presubmit commit checks ... Presubmit checks passed. Description: 'test\n\nBUG=\n\nReview URL: http://localhost:8080/5910974510923776' Closing issue (you may be prompted for your codereview password)... PASS Setting up test SVN repo... Setting up test git-svn repo... TESTING: upload succeeds WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. Switched to branch 'master' Deleted branch abandoned (was 90a9adf). TESTING: git-cl status dropped abandoned branch PASS Setting up test SVN repo... Setting up test remote git-svn-submodule repo... Switched to branch 'master' TESTING: dcommitted code Switched to branch 'git-cl-cherry-pick' Using 50% similarity for rename/copy detection. Override with --similarity. Description: 'dcommit' TESTING: svn got new revision TESTING: svn diff is correct TESTING: git svn fetch gets new svn revision PASS Setting up test upstream git repo... Setting up test git repo... TESTING: upload succeeds (needs a server running on localhost) WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. PASS Setting up test SVN repo... Setting up test git-svn repo... TESTING: git-cl upload hook fails Command "git config rietveld.server" failed. Could not find settings file. You must configure your review setup by running "git cl config". TESTING: git-cl dcommit hook fails Command "git config rietveld.server" failed. Could not find settings file. You must configure your review setup by running "git cl config". PASS Setting up test SVN repo... Setting up test git-svn repo... TESTING: dcommitted code Using 50% similarity for rename/copy detection. Override with --similarity. Description: 'dcommit' TESTING: post-cl-dcommit hook executed PASS Setting up test upstream git repo... Setting up test git repo... TESTING: upload succeeds (needs a server running on localhost) WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. TESTING: description shouldn't contain unrelated commits PASS Setting up test SVN repo... Setting up test git-svn repo... TESTING: upload succeeds (needs a server running on localhost) WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. TESTING: git-cl status now knows the issue TESTING: git cl patch 5981343255101440 PASS Setting up test SVN repo... Setting up test git-svn repo... TESTING: git-cl upload wants a server TESTING: git-cl status has no issue TESTING: upload succeeds (needs a server running on localhost) WARNING: Use -t or --title to set the title of the patchset. In the near future, -m or --message will send a message instead. See http://goo.gl/JGg0Z for details. TESTING: git-cl status now knows the issue % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 77 0 0 100 77 0 1645 --:--:-- --:--:-- --:--:-- 1673 TESTING: git-cl dcommits ok Using 50% similarity for rename/copy detection. Override with --similarity. Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies Running presubmit commit checks ... Presubmit checks passed. Description: 'foo-quux\n\nReview URL: http://localhost:8080/5840605766746112' Closing issue (you may be prompted for your codereview password)... TESTING: dcommitted code has proper description TESTING: issue no longer has a branch TESTING: upstream svn has our commit PASS Checking out rietveld... Running save-description-on-failure.sh Running push-basic.sh Running upstream.sh Running submit-from-new-dir.sh Running abandon.sh Running submodule-merge-test.sh Running upload-local-tracking-branch.sh Running hooks.sh Running post-dcommit-hook-test.sh Running upload-stale.sh Running patch.sh Running basic.sh ** Presubmit ERRORS ** tests/checkout_test.py failed testAll (__main__.RawCheckout) ... ok testException (__main__.RawCheckout) ... ok testMove (__main__.RawCheckout) ... ok testPrepare (__main__.RawCheckout) ... ok testProcess (__main__.RawCheckout) ... ok testAll (__main__.ReadOnlyCheckout) ... ok testException (__main__.ReadOnlyCheckout) ... ok testMove (__main__.ReadOnlyCheckout) ... ok testPrepare (__main__.ReadOnlyCheckout) ... ok testProcess (__main__.ReadOnlyCheckout) ... ok testAll (__main__.SvnCheckout) ... ok testAutoProps (__main__.SvnCheckout) ... ok testException (__main__.SvnCheckout) ... ok testMove (__main__.SvnCheckout) ... FAIL testPrepare (__main__.SvnCheckout) ... ok testProcess (__main__.SvnCheckout) ... ok testSvnProps (__main__.SvnCheckout) ... ok testWithRevPropsSupport (__main__.SvnCheckout) ... ok testWithRevPropsSupportNotCommitBot (__main__.SvnCheckout) ... ok ====================================================================== FAIL: testMove (__main__.SvnCheckout) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/checkout_test.py", line 407, in testMove self.assertEquals(expected, out) AssertionError: 'A + chromeos/views/webui_menu_widget.h\nD chromeos/views/DOMui_menu_widget.h\n' != 'D chromeos/views/DOMui_menu_widget.h\nA + chromeos/views/webui_menu_widget.h\n' ---------------------------------------------------------------------- Ran 19 tests in 7.655s FAILED (failures=1) Presubmit checks took 90.3s to calculate.
Test failure above seems to be an order issue for results returned from SVN. Retrying, just in case it's a random flip.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/groby@chromium.org/14602017/5001
Message was sent while issue was closed.
Change committed as 197773 |
