diffmanifests 3.2.3__py2.py3-none-any.whl → 3.3.0__py2.py3-none-any.whl

diffmanifests/cmd/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '3.2.3'
+VERSION = '3.3.0'

diffmanifests/proto/proto.py

@@ -49,6 +49,7 @@ class Commit:
     COMMITTER = 'committer'
     DATE = 'date'
     DIFF = 'diff'
+    HASHTAGS = 'hashtags'
     MESSAGE = 'message'
     REPO = 'repo'
     TOPIC = 'topic'

diffmanifests/querier/querier.py

@@ -28,10 +28,10 @@ class Querier(object):
         def _query(commit):
             buf = self.gerrit.query('commit:' + commit, 0)
             if buf is None or len(buf) != 1:
-                return '', ''
-            return self.gerrit.url().replace('/a', '/') + str(buf[0]['_number']), buf[0].get('topic', '')
+                return '', '', []
+            return self.gerrit.url().replace('/a', '/') + str(buf[0]['_number']), buf[0].get('topic', ''), buf[0].get('hashtags', [])
 
-        change, topic = _query(commit['commit'])
+        change, topic, hashtags = _query(commit['commit'])
         return [{
             Commit.AUTHOR: '%s <%s>' % (commit['author']['name'], commit['author']['email']),
             Commit.BRANCH: branch,
@@ -40,6 +40,7 @@ class Querier(object):
             Commit.COMMITTER: '%s <%s>' % (commit['committer']['name'], commit['committer']['email']),
             Commit.DATE: commit['author']['time'],
             Commit.DIFF: label.upper(),
+            Commit.HASHTAGS: hashtags,
             Commit.MESSAGE: commit['message'].strip(),
             Commit.REPO: repo,
             Commit.TOPIC: topic,
@@ -52,6 +53,7 @@ class Querier(object):
                 if '\u4e00' <= item <= '\u9fff':
                     return True
             return False
+
         buf1 = " ".join(commit1['committer']['time'].split(" ")[1:])
         if _helper(buf1) is True:
             buf1 = datetime.datetime.strptime(buf1, '%m月 %d %H:%M:%S %Y %z')
@@ -76,7 +78,7 @@ class Querier(object):
             completed = False
             next = commits.get('next', None) if backward else commits.get('previous', None)
             for item in commits['log']:
-                if item['commit'] == commit1[Repo.COMMIT]:
+                if item['commit'] == commit1[Repo.COMMIT] or item['commit'].startswith(commit1[Repo.COMMIT]):
                     completed = True
                     break
                 if (backward and self._ahead(item, commit)) \

diffmanifests-3.3.0.dist-info/METADATA

@@ -0,0 +1,175 @@
+Metadata-Version: 2.4
+Name: diffmanifests
+Version: 3.3.0
+Summary: Diff Manifests via Gitiles API
+Home-page: https://github.com/craftslab/diffmanifests
+Download-URL: https://github.com/craftslab/diffmanifests/archive/v3.3.0.tar.gz
+Author: Jia Jia
+Author-email: angersax@sina.com
+License: Apache-2.0
+Keywords: diff,manifests,gitiles,api
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: requests
+Requires-Dist: xmltodict
+Provides-Extra: dev
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: coveralls; extra == "dev"
+Requires-Dist: openpyxl; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: setuptools; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
+
+# diffmanifests
+
+[![PyPI](https://img.shields.io/pypi/v/diffmanifests.svg?color=brightgreen)](https://pypi.org/project/diffmanifests/)
+[![Coverage Status](https://coveralls.io/repos/github/craftslab/diffmanifests/badge.svg?branch=master)](https://coveralls.io/github/craftslab/diffmanifests?branch=master)
+[![License](https://img.shields.io/github/license/craftslab/diffmanifests.svg?color=brightgreen)](https://github.com/craftslab/diffmanifests/blob/master/LICENSE)
+
+
+
+*diffmanifests* is a tool used to see deeper differences between manifests via Gerrit & Gitiles API.
+
+
+
+## Requirement
+
+- Python >= 3.7
+
+
+
+## Install
+
+```bash
+pip install diffmanifests
+```
+
+
+
+## Update
+
+```bash
+pip install diffmanifests --upgrade
+```
+
+
+
+## Run
+
+```bash
+diffmanifests --config-file config.json --manifest1-file manifest1.xml --manifest2-file manifest2.xml --output-file output.json
+```
+
+
+
+## Settings
+
+*Diff Manifests* parameters can be set in the directory [config](https://github.com/craftslab/diffmanifests/blob/master/diffmanifests/config).
+
+An example of configuration in [config.json](https://github.com/craftslab/diffmanifests/blob/master/diffmanifests/config/config.json):
+
+```json
+{
+  "gerrit": {
+    "pass": "pass",
+    "url": "http://localhost:80",
+    "user": "user"
+  },
+  "gitiles": {
+    "pass": "pass",
+    "retry": 1,
+    "timeout": -1,
+    "url": "http://localhost:80",
+    "user": "user"
+  }
+}
+```
+
+
+
+## Features
+
+*Diff Manifests* supports the following capabilities:
+
+### 📊 Manifest Comparison
+
+Compare commit 2 with commit 1 in diagram A/B/C to identify changes between manifest versions.
+
+![branch](branch.png)
+
+
+
+### 🏷️ Hashtags Support
+
+The tool includes comprehensive support for querying changes with hashtags from the Gerrit REST API v3.12.1. This feature enhances change tracking and categorization.
+
+**Key Benefits:**
+
+- Automatic hashtag extraction from Gerrit changes
+- Enhanced change categorization and filtering
+- Better integration with Gerrit workflows
+- Graceful fallback for changes without hashtags
+
+**Output Structure:**
+
+Each commit in the output JSON now includes a `hashtags` field containing an array of hashtags:
+
+```json
+{
+  "author": "Developer Name <dev@example.com>",
+  "branch": "master",
+  "change": "https://gerrit.example.com/c/12345",
+  "commit": "abc123def456789...",
+  "committer": "Developer Name <dev@example.com>",
+  "date": "2025-08-20 12:00:00 +0000",
+  "diff": "ADD COMMIT",
+  "hashtags": ["security", "cve", "bugfix"],
+  "message": "Fix security vulnerability CVE-2025-1234",
+  "repo": "platform/frameworks/base",
+  "topic": "security-fix",
+  "url": "https://android.googlesource.com/platform/frameworks/base/+/abc123def456789"
+}
+```
+
+**Examples of hashtag usage:**
+
+- `["feature", "ui", "enhancement"]` - New UI features
+- `["bugfix", "critical"]` - Critical bug fixes
+- `["security", "cve"]` - Security-related changes
+- `[]` - Changes without hashtags (empty array)
+
+**Technical Details:**
+
+- Hashtags are retrieved using the [Gerrit REST API ChangeInfo entity](https://gerrit-documentation.storage.googleapis.com/Documentation/3.12.1/rest-api-changes.html#change-info)
+- Automatic error handling ensures stable operation even when hashtags are unavailable
+- Backward compatibility maintained for existing workflows
+
+
+
+## License
+
+Project License can be found [here](https://github.com/craftslab/diffmanifests/blob/master/LICENSE).
+
+
+
+## Reference
+
+[git-repo/subcmds/diffmanifests](https://gerrit.googlesource.com/git-repo/+/master/subcmds/diffmanifests.py)

{diffmanifests-3.2.3.dist-info → diffmanifests-3.3.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ diffmanifests/main.py,sha256=SI14T_8yTuzC1KOQL-QpXwPKlALr1DyI1KBM1vIhFtI,2179
 diffmanifests/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diffmanifests/cmd/argument.py,sha256=vP7Wlczk1KFGtubNrLRrp3B6imuOexkeAzb8AzbzOGM,1736
 diffmanifests/cmd/banner.py,sha256=kpqxOlU4_wJxOswV_iX6eevNppSbn08O-aII-AjEAFQ,297
-diffmanifests/cmd/version.py,sha256=iyCML-3XM1tH7T5W3OC15fi6qECM7PVyOtR4g_7ZQjc,43
+diffmanifests/cmd/version.py,sha256=BYu5-Osvb9q6KdQL_2JrUPd9ClswN93eZWyHi9MtGSE,43
 diffmanifests/config/config.json,sha256=xYVNdl-xZAs_VzvB_vzgQF3zaMZq9Zam1ncCXOPxKfM,299
 diffmanifests/differ/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diffmanifests/differ/differ.py,sha256=nIfwogtTMeTlofoaiX-wYRKHYx4m3T7LwKbRlMZqpdc,3436
@@ -16,12 +16,12 @@ diffmanifests/logger/logger.py,sha256=uxofaUpOd2IzEoVImNMztDzqk_F939b7FcePJ6_Vbz
 diffmanifests/printer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diffmanifests/printer/printer.py,sha256=Fbqy6wqxiIgOPnVESzXHDFTslTZpfrvESdpPLxWe-kM,3467
 diffmanifests/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diffmanifests/proto/proto.py,sha256=QqdUlDvUpqvKtSonPocBzoEiDE4a7ZhtcEW-4NHoiFE,1275
+diffmanifests/proto/proto.py,sha256=sQ808ExLEA_u7eQkYrKkeFkAn3jPEgujz69S52FiyfQ,1301
 diffmanifests/querier/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diffmanifests/querier/querier.py,sha256=SVAXIhadoi8u5HSUuDB5SIc07e8mBqD00L6COEbHVnw,7161
-diffmanifests-3.2.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-diffmanifests-3.2.3.dist-info/METADATA,sha256=YRp8XG0AA0D0f7XpB83XCDnFkJESRgfj-4bbpMLvYms,2553
-diffmanifests-3.2.3.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-diffmanifests-3.2.3.dist-info/entry_points.txt,sha256=l9pmGB0o1VRTFRza8MFEI6_PcOpBJV1BCbdunD7I4kY,58
-diffmanifests-3.2.3.dist-info/top_level.txt,sha256=EHlzZzRVketGFo3Qhjb1pGSfn2FjXZOLmjuTsCqIHlA,14
-diffmanifests-3.2.3.dist-info/RECORD,,
+diffmanifests/querier/querier.py,sha256=QZmdO2Yr68kM2IDA8fgBvfyaC-k53ugXbxDGLXZWye4,7294
+diffmanifests-3.3.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+diffmanifests-3.3.0.dist-info/METADATA,sha256=Tksb0hWczev6hTOEMq5JFKJiM7t76FtOcgbeTwURd_c,4718
+diffmanifests-3.3.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+diffmanifests-3.3.0.dist-info/entry_points.txt,sha256=l9pmGB0o1VRTFRza8MFEI6_PcOpBJV1BCbdunD7I4kY,58
+diffmanifests-3.3.0.dist-info/top_level.txt,sha256=EHlzZzRVketGFo3Qhjb1pGSfn2FjXZOLmjuTsCqIHlA,14
+diffmanifests-3.3.0.dist-info/RECORD,,

{diffmanifests-3.2.3.dist-info → diffmanifests-3.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

diffmanifests-3.2.3.dist-info/METADATA

@@ -1,109 +0,0 @@
-Metadata-Version: 2.1
-Name: diffmanifests
-Version: 3.2.3
-Summary: Diff Manifests via Gitiles API
-Home-page: https://github.com/craftslab/diffmanifests
-Download-URL: https://github.com/craftslab/diffmanifests/archive/v3.2.3.tar.gz
-Author: Jia Jia
-Author-email: angersax@sina.com
-License: Apache-2.0
-Keywords: diff,manifests,gitiles,api
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: colorama
-Requires-Dist: coverage
-Requires-Dist: coveralls
-Requires-Dist: openpyxl
-Requires-Dist: pytest
-Requires-Dist: requests
-Requires-Dist: setuptools
-Requires-Dist: twine
-Requires-Dist: wheel
-Requires-Dist: xmltodict
-
-# diffmanifests
-
-[![PyPI](https://img.shields.io/pypi/v/diffmanifests.svg?color=brightgreen)](https://pypi.org/project/diffmanifests/)
-[![Coverage Status](https://coveralls.io/repos/github/craftslab/diffmanifests/badge.svg?branch=master)](https://coveralls.io/github/craftslab/diffmanifests?branch=master)
-[![License](https://img.shields.io/github/license/craftslab/diffmanifests.svg?color=brightgreen)](https://github.com/craftslab/diffmanifests/blob/master/LICENSE)
-
-
-
-*diffmanifests* is a tool used to see deeper differences between manifests via Gerrit & Gitiles API.
-
-
-## Requirement
-
-- Python >= 3.7
-
-
-
-## Install
-
-```bash
-pip install diffmanifests
-```
-
-
-
-## Update
-
-```bash
-pip install diffmanifests --upgrade
-```
-
-
-
-## Run
-
-```bash
-diffmanifests --config-file config.json --manifest1-file manifest1.xml --manifest2-file manifest2.xml --output-file output.json
-```
-
-
-
-## Settings
-
-*Diff Manifests* parameters can be set in the directory [config](https://github.com/craftslab/diffmanifests/blob/master/diffmanifests/config).
-
-An example of configuration in [config.json](https://github.com/craftslab/diffmanifests/blob/master/diffmanifests/config/config.json):
-
-```json
-{
-  "gerrit": {
-    "pass": "pass",
-    "url": "http://localhost:80",
-    "user": "user"
-  },
-  "gitiles": {
-    "pass": "pass",
-    "retry": 1,
-    "timeout": -1,
-    "url": "http://localhost:80",
-    "user": "user"
-  }
-}
-```
-
-
-
-## Feature
-
-*Diff Manifests* supports to compare commit 2 with commit 1 in diagram A/B/C.
-
-![branch](branch.png)
-
-
-
-## License
-
-Project License can be found [here](https://github.com/craftslab/diffmanifests/blob/master/LICENSE).
-
-
-
-## Reference
-
-[git-repo/subcmds/diffmanifests](https://gerrit.googlesource.com/git-repo/+/master/subcmds/diffmanifests.py)