Commits

Anonymous committed b3f3e92

fixed output of cout when there are incoming changes.
print ``short(cdid)``, not ``cdid`` directory.

Comments (0)

Files changed (1)

     codb = shelve.open(dbpath)
     ui.debug("opened DB in '{0}'\n".format(dbpath))
     # get cached newest id on `dest` server (cdid)
-    dest = ui.expandpath(dest or 'default-push', dest or 'default')
     if dest in codb and not check:
         cdid = codb[dest]
         ui.debug("dest '{0}' is in .hg/cout.db.\n".format(dest))
 def cout(ui, repo, dest=None, check=False, **opts):
     """Cached version of ``hg outgoing``"""
 
+    dest = ui.expandpath(dest or 'default-push', dest or 'default')
     cdid = _get_cached_tip_id(ui, repo, dest, check)
     # check if the newest id on server is the tip on local
     if cdid in repo:
                 ui.write("and there are {0} uncommitted files in "
                          "working directory.\n".format(uncommitted))
     else:
-        ui.write("id='{0}' is not in current local repository.\n"
-                 "you might want to pull the changes.\n".format(cdid))
+        ui.write(
+            "the tip ({0}) on dest ({1}) is not in current "
+            "local repository.\n"
+            "you might want to pull the changes.\n"
+            .format(short(cdid), dest))
 
 
 def postpushhook(ui, repo, dest=None, **kwargs):