summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2016-08-02 14:45:47 +0100
committerThibault Saunier <tsaunier@gnome.org>2016-08-09 14:37:28 -0400
commit4b1334a665bf13ab9d31b5d51db66949bd4d55d3 (patch)
tree672c9b6d1395ddd0229d2fdd0fea06c0c36888fb
parent38c6376cc8b4ea0f329799a70ba62375a137f774 (diff)
git-phab: Expand error message if repository cannot be found
It’s more likely due to the git remote URI being outdated than anything else. Reviewed-by: Thibault Saunier <tsaunier@gnome.org> Differential Revision: https://phabricator.freedesktop.org/D1238
-rwxr-xr-xgit-phab5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-phab b/git-phab
index aa668ce..684cc92 100755
--- a/git-phab
+++ b/git-phab
@@ -567,7 +567,6 @@ Paste API Token from that page and press <enter>: """ % self.phabricator_uri)
567 assert(len(reply) == 1) 567 assert(len(reply) == 1)
568 self.phab_repo = reply[0] 568 self.phab_repo = reply[0]
569 else: 569 else:
570
571 for phab_repo in self.phabricator.repository.query(): 570 for phab_repo in self.phabricator.repository.query():
572 if self.phab_repo: 571 if self.phab_repo:
573 break 572 break
@@ -579,7 +578,9 @@ Paste API Token from that page and press <enter>: """ % self.phabricator_uri)
579 578
580 if not self.phab_repo: 579 if not self.phab_repo:
581 self.die("Could not determine Phabricator repository\n" 580 self.die("Could not determine Phabricator repository\n"
582 "You should set 'repository.callsign' in '.arcconfig'") 581 "You should check your git remote URIs match those "
582 "in Phabricator, or set 'repository.callsign' in "
583 "'.arcconfig'")
583 584
584 if self.phab_repo.get("staging"): 585 if self.phab_repo.get("staging"):
585 self.staging_url = self.phab_repo.get("staging").get("uri") 586 self.staging_url = self.phab_repo.get("staging").get("uri")