# HG changeset patch
# User Ian Moody <moz-ian@perix.co.uk>
# Date 2019-04-20 16:27:24
# Node ID c4d96f4761d372fa19f35fb6d0278d7d9adf8487
# Parent  6dd454e5b12327728368b3fcf05c38b7e9f75b1d

phabricator: read more metadata from local:commits

local:commits metadata can contain branch info, and 'rev' has been superseded
by 'commit', see:
https://github.com/phacility/arcanist/blob/83661809e532c3fe444a8bf7c7d6936e6377691b/src/repository/api/ArcanistMercurialAPI.php#L281

Differential Revision: https://phab.mercurial-scm.org/D6300

diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -911,8 +911,11 @@ def getdiffmeta(diff):
                                           commit[b'authorEmail'])
         if b'time' in commit:
             meta[b'date'] = b'%d 0' % commit[b'time']
-        if b'rev' in commit:
-            meta[b'node'] = commit[b'rev']
+        if b'branch' in commit:
+            meta[b'branch'] = commit[b'branch']
+        node = commit.get(b'commit', commit.get(b'rev'))
+        if node:
+            meta[b'node'] = node
         if len(commit.get(b'parents', ())) >= 1:
             meta[b'parent'] = commit[b'parents'][0]
     return meta or {}