# HG changeset patch # User russ # Date 1469666417 14400 # Node ID 30832b77a931724ff45a361e96f260985640e611 # Parent e90cf5cad06061cd1691ab804eebfb0a25d3c16a add support for non-default remote with incoming/outgoing diff -r e90cf5cad060 -r 30832b77a931 prompt.py --- a/prompt.py Wed Apr 20 10:15:36 2016 -0500 +++ b/prompt.py Wed Jul 27 20:40:17 2016 -0400 @@ -37,10 +37,24 @@ cache = path.join(repo.root, CACHE_PATH, kind) c_tmp = cache + '.temp' - # This is kind of a hack and I feel a little bit dirty for doing it. - IGNORE = open('NUL:','w') if subprocess.mswindows else open('/dev/null','w') + popenargs = ['hg', kind, '--quiet'] + remote_path = repo.ui.config('prompt', 'remote') + if remote_path is not None: + popenargs.append(remote_path) - subprocess.call(['hg', kind, '--quiet'], stdout=file(c_tmp, 'w'), stderr=IGNORE) + null_path = 'NUL:' if subprocess.mswindows else '/dev/null' + with open(null_path, 'w') as null_fp: + with open(c_tmp, 'w') as stdout_fp: + exit_code = subprocess.call(popenargs, stdout=stdout_fp, stderr=null_fp) + + if exit_code not in (0, 1): # (changesets_found, changesets_not_found) + msg = "hg-prompt error: " + if remote_path: # Failure likely due to bad remote. Is 255 a valid check? + msg += "Can't access remote '%s'\n" % remote_path + else: + msg += "Error attempting 'hg %s'" % kind + print msg + os.rename(c_tmp, cache) return