VCS API Reference¶
vcs
¶
VCS CLI wrapper — zero dependencies, stdlib only, Python 3.10+.
Part of zerodep: https://github.com/Oaklight/zerodep Copyright (c) 2026 Peng Ding. MIT License.
Provides a uniform Python interface to version-control systems (Git,
Mercurial, Jujutsu) by shelling out to their CLI binaries. Each backend
implements the :class:VCSBackend protocol so callers can write
VCS-agnostic tooling.
Quick start::
from vcs import detect
repo = detect(".")
if repo is not None:
print(repo.name, repo.current_branch())
for fs in repo.status():
print(fs.status, fs.path)
Requires Python 3.10+.
VCSError
¶
BinaryNotFoundError
¶
Bases: VCSError
Raised when the VCS binary cannot be located.
Attributes:
| Name | Type | Description |
|---|---|---|
binary_name |
Name of the binary that was not found. |
Source code in vcs/vcs.py
CommandError
¶
Bases: VCSError
Raised when a VCS command exits with an unexpected return code.
Attributes:
| Name | Type | Description |
|---|---|---|
command |
The full command list that was executed. |
|
returncode |
Process exit code. |
|
stderr |
Captured standard-error output. |
|
timeout |
Timeout value in seconds if this was a timeout, else |
Source code in vcs/vcs.py
NotARepoError
¶
Bases: VCSError
Raised when the given path is not inside a repository.
Attributes:
| Name | Type | Description |
|---|---|---|
path |
Filesystem path that was tested. |
Source code in vcs/vcs.py
FileStatus
dataclass
¶
Status of a single file in the working tree.
Attributes:
| Name | Type | Description |
|---|---|---|
path |
str
|
Relative path of the file. |
status |
str
|
Single-character status code (e.g. |
original_path |
str | None
|
For renames/copies, the path before the operation. |
Source code in vcs/vcs.py
Commit
dataclass
¶
Metadata for a single commit.
Attributes:
| Name | Type | Description |
|---|---|---|
hash |
str
|
Full commit hash. |
short_hash |
str
|
Abbreviated commit hash. |
author |
str
|
Author name. |
date |
str
|
Commit date in ISO 8601 format. |
message |
str
|
First line of the commit message. |
Source code in vcs/vcs.py
BlameLine
dataclass
¶
Annotation for a single source line.
Attributes:
| Name | Type | Description |
|---|---|---|
commit |
str
|
Commit hash that last changed this line. |
author |
str
|
Author of the commit. |
date |
str
|
Commit date. |
line_no |
int
|
1-based line number. |
content |
str
|
Actual text content of the line. |
Source code in vcs/vcs.py
WorkspaceInfo
dataclass
¶
Information about a workspace (Git worktree / Jujutsu workspace).
Attributes:
| Name | Type | Description |
|---|---|---|
path |
str
|
Absolute path to the workspace directory. |
head |
str
|
HEAD commit hash. |
branch |
str | None
|
Branch name (Git) or bookmark (Jujutsu), |
is_main |
bool
|
Whether this is the main/default workspace. |
Source code in vcs/vcs.py
VCSBackend
¶
Bases: Protocol
Protocol that every VCS backend must satisfy.
Source code in vcs/vcs.py
373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 | |
name
property
¶
Short name of the VCS (e.g. "git").
is_repo(path)
¶
diff(*paths, staged=False)
¶
Return a unified diff of uncommitted changes.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
*paths
|
str
|
Restrict diff to these paths. |
()
|
staged
|
bool
|
If |
False
|
diff_files(path_a, path_b)
¶
Return a diff between two arbitrary files.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path_a
|
str
|
First file path. |
required |
path_b
|
str
|
Second file path. |
required |
apply(patch)
¶
Apply a unified diff patch to the working tree.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
patch
|
str
|
Patch text (unified diff format). |
required |
status()
¶
log(n=10)
¶
blame(path)
¶
Return per-line annotation for a file.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Path to the file (relative to repo root). |
required |
current_branch()
¶
merge_file(base, ours, theirs)
¶
Three-way merge of file contents.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
base
|
str
|
Common-ancestor file content. |
required |
ours
|
str
|
Content from the first branch. |
required |
theirs
|
str
|
Content from the second branch. |
required |
Returns:
| Type | Description |
|---|---|
str
|
Merged file content (may contain conflict markers). |
Source code in vcs/vcs.py
workspace_add(path, *, branch=None, rev=None)
¶
Create a new workspace at path.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Directory for the new workspace. |
required |
branch
|
str | None
|
Branch to create (Git) or bookmark (Jujutsu). |
None
|
rev
|
str | None
|
Starting revision/commit. |
None
|
Returns:
| Type | Description |
|---|---|
str
|
Absolute path to the created workspace. |
Source code in vcs/vcs.py
workspace_remove(path, *, force=False)
¶
Remove a workspace.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Path to the workspace directory. |
required |
force
|
bool
|
Force removal even with uncommitted changes. |
False
|
workspace_list()
¶
branches()
¶
create_branch(name, *, rev=None)
¶
Create a new branch or bookmark.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
name
|
str
|
Branch/bookmark name. |
required |
rev
|
str | None
|
Starting point (defaults to current HEAD). |
None
|
switch(target)
¶
Switch to a branch or revision.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
target
|
str
|
Branch name or revision identifier. |
required |
commit(message, *, paths=None)
¶
Create a commit/change.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
message
|
str
|
Commit message. |
required |
paths
|
list[str] | None
|
Files to stage and commit (Git-specific). |
None
|
Returns:
| Type | Description |
|---|---|
str
|
Commit hash of the new commit. |
rev_parse(rev)
¶
Resolve a revision string to a full commit hash.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
rev
|
str
|
Revision string (branch name, tag, |
required |
Returns:
| Type | Description |
|---|---|
str
|
Full commit hash. |
Git
¶
Git CLI backend.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
repo_path
|
str
|
Path to the repository (defaults to |
'.'
|
binary
|
str | None
|
Explicit path to the |
None
|
encoding
|
str
|
Text encoding for command I/O. |
'utf-8'
|
timeout
|
float
|
Default subprocess timeout in seconds. |
30.0
|
Source code in vcs/vcs.py
537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 | |
name
property
¶
Return "git".
is_repo(path)
¶
Check whether path is inside a git repository.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Directory to test. |
required |
Returns:
| Type | Description |
|---|---|
bool
|
|
Source code in vcs/vcs.py
diff(*paths, staged=False)
¶
Return a unified diff of uncommitted changes.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
*paths
|
str
|
Restrict diff to these paths. |
()
|
staged
|
bool
|
If |
False
|
Returns:
| Type | Description |
|---|---|
str
|
Diff text (may be empty). |
Source code in vcs/vcs.py
diff_files(path_a, path_b)
¶
Return a diff between two arbitrary files.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path_a
|
str
|
First file path. |
required |
path_b
|
str
|
Second file path. |
required |
Returns:
| Type | Description |
|---|---|
str
|
Diff text. |
Source code in vcs/vcs.py
apply(patch)
¶
Apply a unified diff patch via git apply.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
patch
|
str
|
Patch text. |
required |
status()
¶
Return the list of changed files via git status --porcelain.
Returns:
| Type | Description |
|---|---|
list[FileStatus]
|
List of :class: |
Source code in vcs/vcs.py
log(n=10)
¶
Return the last n commits.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
n
|
int
|
Maximum number of commits. |
10
|
Returns:
| Type | Description |
|---|---|
list[Commit]
|
List of :class: |
Source code in vcs/vcs.py
blame(path)
¶
Return per-line blame annotation via git blame --porcelain.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
File path relative to the repository root. |
required |
Returns:
| Type | Description |
|---|---|
list[BlameLine]
|
List of :class: |
Source code in vcs/vcs.py
current_branch()
¶
Return the current branch name.
Falls back to the short HEAD hash when in detached-HEAD state.
Returns:
| Type | Description |
|---|---|
str
|
Branch name or abbreviated commit hash. |
Source code in vcs/vcs.py
merge_file(base, ours, theirs)
¶
Three-way merge of file contents via git merge-file.
Writes the three versions to temporary files, runs
git merge-file -p, and returns the merged output. Conflict
markers are included when the merge is non-clean.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
base
|
str
|
Common-ancestor file content. |
required |
ours
|
str
|
Content from the first branch. |
required |
theirs
|
str
|
Content from the second branch. |
required |
Returns:
| Type | Description |
|---|---|
str
|
Merged file content (may contain conflict markers). |
Source code in vcs/vcs.py
workspace_add(path, *, branch=None, rev=None)
¶
Create a new workspace via git worktree add.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Directory for the new workspace. |
required |
branch
|
str | None
|
If given, create this branch in the new workspace. |
None
|
rev
|
str | None
|
Starting commit-ish. |
None
|
Returns:
| Type | Description |
|---|---|
str
|
Absolute path to the created workspace. |
Source code in vcs/vcs.py
workspace_remove(path, *, force=False)
¶
Remove a workspace via git worktree remove.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Path to the workspace directory. |
required |
force
|
bool
|
Force removal even with uncommitted changes. |
False
|
Source code in vcs/vcs.py
workspace_list()
¶
List all workspaces via git worktree list --porcelain.
Returns:
| Type | Description |
|---|---|
list[WorkspaceInfo]
|
List of :class: |
Source code in vcs/vcs.py
branches()
¶
List all branches via git branch.
Returns:
| Type | Description |
|---|---|
list[str]
|
List of branch name strings. |
create_branch(name, *, rev=None)
¶
Create a new branch via git branch.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
name
|
str
|
Branch name. |
required |
rev
|
str | None
|
Starting commit-ish (defaults to HEAD). |
None
|
Source code in vcs/vcs.py
switch(target)
¶
Switch to a branch or revision via git switch.
Falls back to git switch --detach for non-branch revisions.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
target
|
str
|
Branch name or revision identifier. |
required |
Source code in vcs/vcs.py
commit(message, *, paths=None)
¶
Create a commit via git commit.
If paths is given, stages those files first. Otherwise commits whatever is already staged.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
message
|
str
|
Commit message. |
required |
paths
|
list[str] | None
|
Files to stage before committing. |
None
|
Returns:
| Type | Description |
|---|---|
str
|
Full commit hash of the new commit. |
Source code in vcs/vcs.py
rev_parse(rev)
¶
Resolve a revision string via git rev-parse.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
rev
|
str
|
Revision string. |
required |
Returns:
| Type | Description |
|---|---|
str
|
Full commit hash. |
Mercurial
¶
Mercurial (hg) CLI backend.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
repo_path
|
str
|
Path to the repository (defaults to |
'.'
|
binary
|
str | None
|
Explicit path to the |
None
|
encoding
|
str
|
Text encoding for command I/O. |
'utf-8'
|
timeout
|
float
|
Default subprocess timeout in seconds. |
30.0
|
merge_func
|
Callable[[str, str, str], Any] | None | _Unset
|
Three-way merge callable |
_UNSET
|
Source code in vcs/vcs.py
983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 | |
name
property
¶
Return "hg".
is_repo(path)
¶
Check whether path is inside a Mercurial repository.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Directory to test. |
required |
Returns:
| Type | Description |
|---|---|
bool
|
|
Source code in vcs/vcs.py
diff(*paths, staged=False)
¶
Return a unified diff of uncommitted changes.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
*paths
|
str
|
Restrict diff to these paths. |
()
|
staged
|
bool
|
Ignored — Mercurial has no staging area. |
False
|
Returns:
| Type | Description |
|---|---|
str
|
Diff text. |
Source code in vcs/vcs.py
diff_files(path_a, path_b)
¶
Not supported by Mercurial CLI.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
apply(patch)
¶
Apply a patch via hg import --no-commit.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
patch
|
str
|
Patch text. |
required |
status()
¶
Return the list of changed files via hg status.
Returns:
| Type | Description |
|---|---|
list[FileStatus]
|
List of :class: |
Source code in vcs/vcs.py
log(n=10)
¶
Return the last n commits.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
n
|
int
|
Maximum number of commits. |
10
|
Returns:
| Type | Description |
|---|---|
list[Commit]
|
List of :class: |
Source code in vcs/vcs.py
blame(path)
¶
Return per-line blame via hg annotate.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
File path relative to the repository root. |
required |
Returns:
| Type | Description |
|---|---|
list[BlameLine]
|
List of :class: |
Source code in vcs/vcs.py
current_branch()
¶
Return the current Mercurial branch name.
Returns:
| Type | Description |
|---|---|
str
|
Branch name string. |
merge_file(base, ours, theirs)
¶
Three-way merge using the sibling diff module.
Uses an injected merge_func if provided at construction time,
otherwise falls back to sibling diff.merge3 auto-discovery.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
base
|
str
|
Common-ancestor file content. |
required |
ours
|
str
|
Content from the first branch. |
required |
theirs
|
str
|
Content from the second branch. |
required |
Returns:
| Type | Description |
|---|---|
str
|
Merged file content (may contain conflict markers). |
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
If the sibling |
Source code in vcs/vcs.py
workspace_add(path, *, branch=None, rev=None)
¶
Not supported by Mercurial.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
Source code in vcs/vcs.py
workspace_remove(path, *, force=False)
¶
Not supported by Mercurial.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
workspace_list()
¶
Not supported by Mercurial.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
branches()
¶
Not supported — Mercurial branches have different semantics.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
create_branch(name, *, rev=None)
¶
Not supported — Mercurial branches have different semantics.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
Source code in vcs/vcs.py
switch(target)
¶
Not supported by Mercurial.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
commit(message, *, paths=None)
¶
Not supported by Mercurial.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
rev_parse(rev)
¶
Not supported by Mercurial.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
Jujutsu
¶
Jujutsu (jj) CLI backend.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
repo_path
|
str
|
Path to the repository (defaults to |
'.'
|
binary
|
str | None
|
Explicit path to the |
None
|
encoding
|
str
|
Text encoding for command I/O. |
'utf-8'
|
timeout
|
float
|
Default subprocess timeout in seconds. |
30.0
|
merge_func
|
Callable[[str, str, str], Any] | None | _Unset
|
Three-way merge callable |
_UNSET
|
Source code in vcs/vcs.py
1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 | |
name
property
¶
Return "jj".
is_repo(path)
¶
Check whether path is inside a Jujutsu repository.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Directory to test. |
required |
Returns:
| Type | Description |
|---|---|
bool
|
|
Source code in vcs/vcs.py
diff(*paths, staged=False)
¶
Return a diff of uncommitted changes.
Jujutsu has no staging area, so staged is ignored.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
*paths
|
str
|
Restrict diff to these paths. |
()
|
staged
|
bool
|
Ignored. |
False
|
Returns:
| Type | Description |
|---|---|
str
|
Diff text. |
Source code in vcs/vcs.py
diff_files(path_a, path_b)
¶
Not supported by Jujutsu CLI.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
apply(patch)
¶
Not supported by Jujutsu CLI.
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
Always. |
status()
¶
Return the list of changed files via jj status.
Returns:
| Type | Description |
|---|---|
list[FileStatus]
|
List of :class: |
Source code in vcs/vcs.py
log(n=10)
¶
Return the last n commits.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
n
|
int
|
Maximum number of commits. |
10
|
Returns:
| Type | Description |
|---|---|
list[Commit]
|
List of :class: |
Source code in vcs/vcs.py
blame(path)
¶
Return per-line annotation via jj file annotate.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
File path relative to the repository root. |
required |
Returns:
| Type | Description |
|---|---|
list[BlameLine]
|
List of :class: |
Source code in vcs/vcs.py
current_branch()
¶
Return the current bookmark or change ID.
Returns:
| Type | Description |
|---|---|
str
|
First bookmark pointing to |
Source code in vcs/vcs.py
merge_file(base, ours, theirs)
¶
Three-way merge using the sibling diff module.
Uses an injected merge_func if provided at construction time,
otherwise falls back to sibling diff.merge3 auto-discovery.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
base
|
str
|
Common-ancestor file content. |
required |
ours
|
str
|
Content from the first branch. |
required |
theirs
|
str
|
Content from the second branch. |
required |
Returns:
| Type | Description |
|---|---|
str
|
Merged file content (may contain conflict markers). |
Raises:
| Type | Description |
|---|---|
NotImplementedError
|
If the sibling |
Source code in vcs/vcs.py
workspace_add(path, *, branch=None, rev=None)
¶
Create a new workspace via jj workspace add.
The workspace name defaults to the basename of path (Jujutsu convention). If branch is given, a bookmark is created in the new workspace pointing to its working-copy change.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Directory for the new workspace. |
required |
branch
|
str | None
|
If given, create a bookmark in the new workspace. |
None
|
rev
|
str | None
|
Starting revision. |
None
|
Returns:
| Type | Description |
|---|---|
str
|
Absolute path to the created workspace. |
Source code in vcs/vcs.py
workspace_remove(path, *, force=False)
¶
Remove a workspace via jj workspace forget.
Derives the workspace name from the directory basename (Jujutsu default naming convention), then removes the directory.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Path to the workspace directory. |
required |
force
|
bool
|
Unused — |
False
|
Source code in vcs/vcs.py
workspace_list()
¶
List all workspaces via jj workspace list.
Only the default workspace has a known path (repo_path);
other workspace paths are not exposed by jj workspace list.
Returns:
| Type | Description |
|---|---|
list[WorkspaceInfo]
|
List of :class: |
Source code in vcs/vcs.py
branches()
¶
List all bookmarks via jj bookmark list.
Returns:
| Type | Description |
|---|---|
list[str]
|
List of bookmark name strings. |
Source code in vcs/vcs.py
create_branch(name, *, rev=None)
¶
Create a bookmark via jj bookmark create.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
name
|
str
|
Bookmark name. |
required |
rev
|
str | None
|
Target revision (defaults to |
None
|
Source code in vcs/vcs.py
switch(target)
¶
Switch working copy via jj new.
Creates a new change on top of target, analogous to how
git switch positions the working copy for new commits.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
target
|
str
|
Bookmark name or revision identifier. |
required |
Source code in vcs/vcs.py
commit(message, *, paths=None)
¶
Finalize the current change via jj commit.
The paths argument is ignored — Jujutsu auto-tracks all working-copy changes.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
message
|
str
|
Change description. |
required |
paths
|
list[str] | None
|
Ignored. |
None
|
Returns:
| Type | Description |
|---|---|
str
|
Full commit hash of the finalized change. |
Source code in vcs/vcs.py
rev_parse(rev)
¶
Resolve a revision string to a full commit hash.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
rev
|
str
|
Revision string (bookmark, change ID, etc.). |
required |
Returns:
| Type | Description |
|---|---|
str
|
Full commit hash. |
Source code in vcs/vcs.py
detect(path='.', *, merge_func=_UNSET)
¶
Auto-detect the VCS backend for the given path.
Walks upward from path to the filesystem root looking for
.git/, .hg/, or .jj/ directories. Returns the first
backend whose marker directory is found and whose binary is
available on the system, or None if no VCS is detected.
Parameters:
| Name | Type | Description | Default |
|---|---|---|---|
path
|
str
|
Starting directory (defaults to |
'.'
|
merge_func
|
Callable[[str, str, str], Any] | None | _Unset
|
Forwarded to |
_UNSET
|
Returns:
| Type | Description |
|---|---|
VCSBackend | None
|
An instantiated backend, or |