jj-octo 0.2.1 → 0.2.2

package/dist/jj-octo.js

@@ -18112,7 +18112,7 @@ var layer14 = /* @__PURE__ */ layerMergedContext(/* @__PURE__ */ succeed6(fetch)
 // package.json
 var package_default = {
   name: "jj-octo",
-  version: "0.2.1",
+  version: "0.2.2",
   description: "A jj subcommand for working with GitHub that supports stacking",
   license: "MIT",
   repository: {
@@ -18886,13 +18886,20 @@ var rebaseStack = (root, required) => gen2(function* () {
     yield* error(`left "${name}" and the changes on it where they were: they conflict with the trunk`);
   }
 });
-var sync4 = (required = []) => gen2(function* () {
+var sync4 = (required = [], mergedChanges = []) => gen2(function* () {
   const jj = yield* Jj;
   const before = yield* bookmarksBeforeFetch;
   yield* jj.run(["git", "fetch"]);
+  for (const { bookmark } of mergedChanges) {
+    yield* jj.run(["bookmark", "forget", "--include-remotes", `exact:${bookmark}`]);
+  }
+  if (mergedChanges.length > 0) {
+    const revset = mergedChanges.map(({ changeId }) => `change_id(${changeId})`).join(" | ");
+    yield* jj.run(["abandon", `(${revset}) & mutable()`]);
+  }
   const fetched = yield* bookmarkTargets;
   const notCombined = [];
-  for (const bookmark of before) {
+  for (const bookmark of before.filter(({ name }) => mergedChanges.every((change) => change.bookmark !== name))) {
     if (!(yield* combine4(bookmark, fetched.get(bookmark.name)?.origin))) {
       notCombined.push(bookmark.name);
     }
@@ -18970,7 +18977,7 @@ var merge5 = (revision) => gen2(function* () {
     yield* error("queued to merge; run `jj gh sync` once it has");
   } else {
     yield* error(`merged up to #${pullRequest.number}`);
-    yield* sync4(stackChanges);
+    yield* sync4(stackChanges, changes);
     for (const bookmark of above) {
       if ((yield* commitsAt(bookmarkRevset(bookmark))).length > 0) {
         yield* republish(bookmarkRevset(bookmark));
@@ -18979,7 +18986,7 @@ var merge5 = (revision) => gen2(function* () {
     }
   }
 });
-var mergeCommand = make30("merge", { revision: revisionFlag("The top change to merge") }, ({ revision }) => asUserError(merge5(revision).pipe(provide3(GitHubFromOrigin)))).pipe(withHelp("Merge the pull requests of a change and the ones below it", "Squash-merges them, and prints which before it does. An empty working copy means the change below it. Fails before merging if any of the changes has edits that aren't pushed.", "A pull request in a GitHub stack is merged together with the pull requests below it. Either all of them merge or none does. A pull request outside a stack is merged alone, and only if its base is the trunk.", "Then syncs, as `jj gh sync` does, and pushes what is left of the change's stack again, up to the highest branch already on GitHub. Unlike `jj gh sync`, it rebases that stack even where it conflicts with the trunk, and the conflict is recorded in the change.", "If GitHub queues the merge instead, nothing is synced. Run `jj gh sync` once it has merged."));
+var mergeCommand = make30("merge", { revision: revisionFlag("The top change to merge") }, ({ revision }) => asUserError(merge5(revision).pipe(provide3(GitHubFromOrigin)))).pipe(withHelp("Merge the pull requests of a change and the ones below it", "Squash-merges them, and prints which before it does. An empty working copy means the change below it. Fails before merging if any of the changes has edits that aren't pushed.", "A pull request in a GitHub stack is merged together with the pull requests below it. Either all of them merge or none does. A pull request outside a stack is merged alone, and only if its base is the trunk.", "Then syncs, as `jj gh sync` does, and pushes what is left of the change's stack again, up to the highest branch already on GitHub. Unlike `jj gh sync`, it abandons the merged changes and forgets their bookmarks, rather than relying on each coming out empty on the trunk, which one doesn't where a change merged above it edited the same lines. It also rebases the rest of the stack even where it conflicts with the trunk, and the conflict is recorded in the change.", "If GitHub queues the merge instead, nothing is synced. Run `jj gh sync` once it has merged."));
 
 // src/cli/gh/submit.ts
 var submitCommand = make30("submit", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj-octo",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A jj subcommand for working with GitHub that supports stacking",
   "license": "MIT",
   "repository": {